From bugzilla-daemon at icedtea.classpath.org Sat Jun 1 18:33:12 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 02 Jun 2013 01:33:12 +0000 Subject: [Bug 1467] New: Java emits Concurrency Exception when PulseAudio is called to emit sound Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1467 Bug ID: 1467 Summary: Java emits Concurrency Exception when PulseAudio is called to emit sound Classification: Unclassified Product: IcedTea Version: unspecified Hardware: x86_64 OS: Linux Status: NEW Severity: major Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: wilbur.killebrew at gmail.com CC: unassigned at icedtea.classpath.org Created attachment 879 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=879&action=edit Java Stacktrace and partial threaddump listing (edited) At times, an exception is issued when a commercial Java application issues a notification sound (bell or chime). The sound emits, but the application halts and must be restarted -- if it is not halted, but allowed to run, it will crash the OS so thoroughly that power must be cycled to restart. It is not clear whether the problem is in the Java program (TDAmeritrade's Thinkorswim -- (ToS)), in PulseAudio or in Java or one of the related Java interfaces. The stacktrace seems to indicate a concurrency handling problem in ToS, but I'm not a Java programmer. I have notified TDAmeritrade of the issue. I am reporting this as an icedtea bug because there are numerous claims that PulseAudio does not play well with Java. It is not inconceivable that there may be a concurrency handling problem within the PulseAudio/Icedtea interface. In this simple application, I shuould think that concurrency handling ought not be an issue the application should have to confront. TDAmeritrade should be congratulated (and supported) for providing this important commercial application for Linux, as virtually all others absolutely require MS Windows. Other than this exception-on-bell/chime issue, Thinkorswim runs faultlessly on Ubuntu 12.04 and Linux Mint (both 13 "Maya" and 14 "Nadia"), the former with openJDK 6, the latter with openJDK 7. It is very disconcerting, however, for the program to halt and have to be restarted when a notification issues a chime -- could make the trading experience a bit hairy. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130602/6e7221b4/attachment.html From bugzilla-daemon at icedtea.classpath.org Sun Jun 2 02:23:46 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 02 Jun 2013 09:23:46 +0000 Subject: [Bug 1026] Apps fail to run because of the nanoxml parser's strict XML validation In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1026 Heiko changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |lil_tux at web.de --- Comment #5 from Heiko --- The problem are the ampersands in the href entity of the jnlp tag (and probably in every other entity as well). Just try the following 1) OK: 2) OK: 3) FAIL: 4) OK: At a quick specification glance, the URL "should" be properly encoded, but it hasn't to. And the client "must" use the URL as is, thus it probably should not try to validate it and especially not try to find XML entities in the URL. Anyway, net.sourceforge.nanoxml.XMLElement.scanString has the following code: } else if (ch == '&') { this.resolveEntity(string); } else { which on URL 3 tries to resolve "&par2" into an xml entity until it finds ';', which it doesn't and thus throws an exception. I'm not familiar with the code enough to come up with a proper solution, but I'd say one should guard XMLElement.resolveEntity from being called for attributes and especially from being called for attribute values. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130602/3e5ab3dc/attachment.html From bugzilla-daemon at icedtea.classpath.org Sun Jun 2 09:27:26 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 02 Jun 2013 16:27:26 +0000 Subject: [Bug 1026] Apps fail to run because of the nanoxml parser's strict XML validation In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1026 --- Comment #6 from Heiko --- Created attachment 880 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=880&action=edit Remove interpretation of entities Remove interpretation of entities starting with '&'. As far as I can tell, the interpretation is only done in a) attribute values and b) in PCDATA. I'd say both should be kept as-is. The patch fixes the issue for me and makes the applet also work properly with URL 3) from my previous comment. For future release I'd go with something more tested than nanoxml. Since applet initialization already is costly, there's no reason for taking the tiniest xml parser, is there? -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130602/0d4de55a/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jun 3 00:40:31 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 03 Jun 2013 07:40:31 +0000 Subject: [Bug 1465] java.io.FileNotFoundException while trying to download a JAR file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1465 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED CC| |jvanek at redhat.com Assignee|dbhole at redhat.com |jvanek at redhat.com --- Comment #6 from JiriVanek --- Hi Thomas! Thanx for investigations - nice monologue :) The changes looks ok, I will test and resend them to distro. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130603/20d4b83f/attachment.html From ptisnovs at icedtea.classpath.org Mon Jun 3 01:11:08 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 03 Jun 2013 08:11:08 +0000 Subject: /hg/gfx-test: Five new tests added into ClippingCircleByRectangl... Message-ID: changeset ed8160c7efb3 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=ed8160c7efb3 author: Pavel Tisnovsky date: Mon Jun 03 10:14:37 2013 +0200 Five new tests added into ClippingCircleByRectangleShape. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java | 95 ++++++++++ 2 files changed, 100 insertions(+), 0 deletions(-) diffs (117 lines): diff -r c43d115f3780 -r ed8160c7efb3 ChangeLog --- a/ChangeLog Fri May 31 14:24:09 2013 +0200 +++ b/ChangeLog Mon Jun 03 10:14:37 2013 +0200 @@ -1,3 +1,8 @@ +2013-06-03 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java: + Five new tests added into ClippingCircleByRectangleShape. + 2013-05-31 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java: diff -r c43d115f3780 -r ed8160c7efb3 src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java --- a/src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java Fri May 31 14:24:09 2013 +0200 +++ b/src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java Mon Jun 03 10:14:37 2013 +0200 @@ -811,6 +811,101 @@ } /** + * Check if circle shape could be clipped by a rectangular shape. Circle is + * rendered using alpha paint with white color at 0% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintWhite000(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 0% + // transparency + drawCircleClippedByRectangleAlphaPaintWhite(image, graphics2d, 0); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a rectangular shape. Circle is + * rendered using alpha paint with white color at 25% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintWhite025(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 25% + // transparency + drawCircleClippedByRectangleAlphaPaintWhite(image, graphics2d, 25); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a rectangular shape. Circle is + * rendered using alpha paint with white color at 50% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintWhite050(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 50% + // transparency + drawCircleClippedByRectangleAlphaPaintWhite(image, graphics2d, 50); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a rectangular shape. Circle is + * rendered using alpha paint with white color at 75% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintWhite075(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 75% + // transparency + drawCircleClippedByRectangleAlphaPaintWhite(image, graphics2d, 75); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a rectangular shape. Circle is + * rendered using alpha paint with white color at 100% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintWhite100(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 100% + // transparency + drawCircleClippedByRectangleAlphaPaintWhite(image, graphics2d, 100); + // test result + return TestResult.PASSED; + } + + /** * Check if circle shape could be clipped by a rectangle shape. Circle is * rendered using horizontal gradient paint. * From bugzilla-daemon at icedtea.classpath.org Mon Jun 3 01:17:31 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 03 Jun 2013 08:17:31 +0000 Subject: [Bug 1026] Apps fail to run because of the nanoxml parser's strict XML validation In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1026 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED CC| |jvanek at redhat.com Assignee|omajid at redhat.com |adomurad at redhat.com --- Comment #7 from JiriVanek --- Adam, will the tagsoup patch help with this? Should not, but how it is possible that we still see xml parsing error in 1.4 when you have removed the parsing? Heiko - in 1.4 the parser was/should be removed from applets processing. However this issue will remain - the url must be entered correctly, and it is what knuddels does not do. Or am I wrong? Maybe we are doing one more unnecessary url coding/decoding, but then soemthing is rotteb below, as java's URI .decode/encode should do this job for us... /me just thinking baout -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130603/cf0c2741/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jun 3 02:17:32 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 03 Jun 2013 09:17:32 +0000 Subject: [Bug 1435] [IcedTea7] OpenJDK 7 returns incorrect TrueType font metrics In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1435 --- Comment #3 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7-forest/jdk?cmd=changeset;node=fdd98e50f1df author: andrew date: Fri May 31 23:03:47 2013 +0100 PR1435: OpenJDK 7 returns incorrect TrueType font metrics -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130603/187716e4/attachment.html From jvanek at redhat.com Mon Jun 3 02:24:55 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 03 Jun 2013 11:24:55 +0200 Subject: [rfc][icedtea-web] Make applet resize message handling asynchronous In-Reply-To: <51A8F70A.8050907@redhat.com> References: <51A8F70A.8050907@redhat.com> Message-ID: <51AC60E7.3070807@redhat.com> On 05/31/2013 09:16 PM, Adam Domurad wrote: > Hi, this is a defensive patch to remove deadlock possibility entirely from the applet resizing message. I think as much as it can be avoided, blocking operations should not occur on the worker threads. We never make more than 2 worker threads for normal messages, so they should spawn a thread for any task that will potentially take a substantial time. > > ChangeLog: > 2013-XX-XX Adam Domurad > > * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: > Handle resizing more robustly by not blocking worker thread > > I am also writing this little page: http://icedtea.classpath.org/wiki/Fixing_IcedTea-Web_Browser_Hanging > Comments welcome. It is linked from the icedtea-web wiki page under 'Common problems'. > > Happy hacking, > -Adam Looks good to me. Just nit which you may/do not need to follow: To create inner ResizeAppletPanel class impelmenting Runnable, so it will: - you will just call new Thread(new resizeAppletPanel(panel)) in main codse - will lead programmer to use the thread if he will need to call resize on some other place - I know you do not like many tinny classes but imho it is more clear O:) According to the page: http://icedtea.classpath.org/wiki/Fixing_IcedTea-Web_Browser_Hanging nice effort! Should be linked for mman page otherwise It does not mention js->appelt->js deadlock. Is this deadlock in subset for this page? J. From bugzilla-daemon at icedtea.classpath.org Mon Jun 3 02:25:53 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 03 Jun 2013 09:25:53 +0000 Subject: [Bug 1433] A fatal error has been detected by the Java Runtime Environment In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1433 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |WONTFIX Severity|blocker |normal --- Comment #4 from Andrew John Hughes --- 1.7.4 is no longer supported. Please update to 1.11.x or 1.12.x and reopen if this can be replicated with one of those releases. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130603/a8ff97d2/attachment.html From ptisnovs at icedtea.classpath.org Mon Jun 3 02:47:14 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 03 Jun 2013 09:47:14 +0000 Subject: /hg/rhino-tests: Updated four tests in ScriptContextClassTest fo... Message-ID: changeset 5d030140c10f in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=5d030140c10f author: Pavel Tisnovsky date: Mon Jun 03 11:50:42 2013 +0200 Updated four tests in ScriptContextClassTest for (Open)JDK8 API: getMethod, getMethods, getDeclaredMethod and getDeclaredMethods. diffstat: ChangeLog | 6 + src/org/RhinoTests/ScriptContextClassTest.java | 122 ++++++++++++++++++++++++- 2 files changed, 124 insertions(+), 4 deletions(-) diffs (180 lines): diff -r 89917103dafe -r 5d030140c10f ChangeLog --- a/ChangeLog Fri May 31 14:26:53 2013 +0200 +++ b/ChangeLog Mon Jun 03 11:50:42 2013 +0200 @@ -1,3 +1,9 @@ +2013-06-03 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptContextClassTest.java: + Updated four tests in ScriptContextClassTest for (Open)JDK8 API: + getMethod, getMethods, getDeclaredMethod and getDeclaredMethods. + 2013-05-31 Pavel Tisnovsky * src/org/RhinoTests/InvocableClassTest.java: diff -r 89917103dafe -r 5d030140c10f src/org/RhinoTests/ScriptContextClassTest.java --- a/src/org/RhinoTests/ScriptContextClassTest.java Fri May 31 14:26:53 2013 +0200 +++ b/src/org/RhinoTests/ScriptContextClassTest.java Mon Jun 03 11:50:42 2013 +0200 @@ -657,6 +657,23 @@ "public abstract void javax.script.ScriptContext.setWriter(java.io.Writer)", }; + final String[] methodsThatShouldExist_jdk8 = { + "public abstract int javax.script.ScriptContext.getAttributesScope(java.lang.String)", + "public abstract java.io.Reader javax.script.ScriptContext.getReader()", + "public abstract java.io.Writer javax.script.ScriptContext.getErrorWriter()", + "public abstract java.io.Writer javax.script.ScriptContext.getWriter()", + "public abstract java.lang.Object javax.script.ScriptContext.getAttribute(java.lang.String)", + "public abstract java.lang.Object javax.script.ScriptContext.getAttribute(java.lang.String,int)", + "public abstract java.lang.Object javax.script.ScriptContext.removeAttribute(java.lang.String,int)", + "public abstract java.util.List javax.script.ScriptContext.getScopes()", + "public abstract javax.script.Bindings javax.script.ScriptContext.getBindings(int)", + "public abstract void javax.script.ScriptContext.setAttribute(java.lang.String,java.lang.Object,int)", + "public abstract void javax.script.ScriptContext.setBindings(javax.script.Bindings,int)", + "public abstract void javax.script.ScriptContext.setErrorWriter(java.io.Writer)", + "public abstract void javax.script.ScriptContext.setReader(java.io.Reader)", + "public abstract void javax.script.ScriptContext.setWriter(java.io.Writer)", + }; + // get all inherited methods Method[] methods = this.scriptContextClass.getMethods(); // and transform the array into a list of method names @@ -664,7 +681,20 @@ for (Method method : methods) { methodsAsString.add(method.toString()); } - String[] methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + + String[] methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } + // check if all required methods really exists for (String methodThatShouldExists : methodsThatShouldExist) { assertTrue(methodsAsString.contains(methodThatShouldExists), @@ -711,6 +741,23 @@ "public abstract void javax.script.ScriptContext.setWriter(java.io.Writer)", }; + final String[] declaredMethodsThatShouldExist_jdk8 = { + "public abstract int javax.script.ScriptContext.getAttributesScope(java.lang.String)", + "public abstract java.io.Reader javax.script.ScriptContext.getReader()", + "public abstract java.io.Writer javax.script.ScriptContext.getErrorWriter()", + "public abstract java.io.Writer javax.script.ScriptContext.getWriter()", + "public abstract java.lang.Object javax.script.ScriptContext.getAttribute(java.lang.String)", + "public abstract java.lang.Object javax.script.ScriptContext.getAttribute(java.lang.String,int)", + "public abstract java.lang.Object javax.script.ScriptContext.removeAttribute(java.lang.String,int)", + "public abstract java.util.List javax.script.ScriptContext.getScopes()", + "public abstract javax.script.Bindings javax.script.ScriptContext.getBindings(int)", + "public abstract void javax.script.ScriptContext.setAttribute(java.lang.String,java.lang.Object,int)", + "public abstract void javax.script.ScriptContext.setBindings(javax.script.Bindings,int)", + "public abstract void javax.script.ScriptContext.setErrorWriter(java.io.Writer)", + "public abstract void javax.script.ScriptContext.setReader(java.io.Reader)", + "public abstract void javax.script.ScriptContext.setWriter(java.io.Writer)", + }; + // get all declared methods Method[] declaredMethods = this.scriptContextClass.getDeclaredMethods(); // and transform the array into a list of method names @@ -718,7 +765,20 @@ for (Method method : declaredMethods) { methodsAsString.add(method.toString()); } - String[] declaredMethodsThatShouldExist = getJavaVersion() < 7 ? declaredMethodsThatShouldExist_jdk6 : declaredMethodsThatShouldExist_jdk7; + + String[] declaredMethodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk6; + break; + case 7: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk7; + break; + case 8: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk8; + break; + } + // check if all required methods really exists for (String methodThatShouldExists : declaredMethodsThatShouldExist) { assertTrue(methodsAsString.contains(methodThatShouldExists), @@ -763,7 +823,34 @@ methodsThatShouldExist_jdk7.put("removeAttribute", new Class[] {java.lang.String.class, int.class}); methodsThatShouldExist_jdk7.put("setAttribute", new Class[] {java.lang.String.class, java.lang.Object.class, int.class}); - Map methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + Map methodsThatShouldExist_jdk8 = new TreeMap(); + methodsThatShouldExist_jdk8.put("setBindings", new Class[] {javax.script.Bindings.class, int.class}); + methodsThatShouldExist_jdk8.put("getBindings", new Class[] {int.class}); + methodsThatShouldExist_jdk8.put("getWriter", new Class[] {}); + methodsThatShouldExist_jdk8.put("setWriter", new Class[] {java.io.Writer.class}); + methodsThatShouldExist_jdk8.put("getReader", new Class[] {}); + methodsThatShouldExist_jdk8.put("setReader", new Class[] {java.io.Reader.class}); + methodsThatShouldExist_jdk8.put("getErrorWriter", new Class[] {}); + methodsThatShouldExist_jdk8.put("setErrorWriter", new Class[] {java.io.Writer.class}); + methodsThatShouldExist_jdk8.put("setAttribute", new Class[] {java.lang.String.class, java.lang.Object.class, int.class}); + methodsThatShouldExist_jdk8.put("getAttribute", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("getAttribute", new Class[] {java.lang.String.class, int.class}); + methodsThatShouldExist_jdk8.put("removeAttribute", new Class[] {java.lang.String.class, int.class}); + methodsThatShouldExist_jdk8.put("getAttributesScope", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("getScopes", new Class[] {}); + + Map methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } // check if all required methods really exist for (Map.Entry methodThatShouldExists : methodsThatShouldExist.entrySet()) { @@ -821,7 +908,34 @@ methodsThatShouldExist_jdk7.put("removeAttribute", new Class[] {java.lang.String.class, int.class}); methodsThatShouldExist_jdk7.put("setAttribute", new Class[] {java.lang.String.class, java.lang.Object.class, int.class}); - Map methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + Map methodsThatShouldExist_jdk8 = new TreeMap(); + methodsThatShouldExist_jdk8.put("setBindings", new Class[] {javax.script.Bindings.class, int.class}); + methodsThatShouldExist_jdk8.put("getBindings", new Class[] {int.class}); + methodsThatShouldExist_jdk8.put("getWriter", new Class[] {}); + methodsThatShouldExist_jdk8.put("setWriter", new Class[] {java.io.Writer.class}); + methodsThatShouldExist_jdk8.put("getReader", new Class[] {}); + methodsThatShouldExist_jdk8.put("setReader", new Class[] {java.io.Reader.class}); + methodsThatShouldExist_jdk8.put("getErrorWriter", new Class[] {}); + methodsThatShouldExist_jdk8.put("setErrorWriter", new Class[] {java.io.Writer.class}); + methodsThatShouldExist_jdk8.put("setAttribute", new Class[] {java.lang.String.class, java.lang.Object.class, int.class}); + methodsThatShouldExist_jdk8.put("getAttribute", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("getAttribute", new Class[] {java.lang.String.class, int.class}); + methodsThatShouldExist_jdk8.put("removeAttribute", new Class[] {java.lang.String.class, int.class}); + methodsThatShouldExist_jdk8.put("getAttributesScope", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("getScopes", new Class[] {}); + + Map methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } // check if all required methods really exist for (Map.Entry methodThatShouldExists : methodsThatShouldExist.entrySet()) { From bugzilla-daemon at icedtea.classpath.org Mon Jun 3 02:52:18 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 03 Jun 2013 09:52:18 +0000 Subject: [Bug 1467] Java emits Concurrency Exception when PulseAudio is called to emit sound In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1467 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Component|IcedTea |PulseAudio Assignee|gnu.andrew at redhat.com |omajid at redhat.com Severity|major |normal -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130603/e340d42b/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jun 3 02:57:48 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 03 Jun 2013 09:57:48 +0000 Subject: [Bug 1156] Fatal: Read Error: Could not read or parse the JNLP file. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1156 Bug 1156 depends on bug 909, which changed state. Bug 909 Summary: The Java applet at http://de.gosupermodel.com/games/wardrobegame.jsp fails. http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=909 What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130603/922fb4df/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jun 3 02:57:45 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 03 Jun 2013 09:57:45 +0000 Subject: [Bug 909] The Java applet at http://de.gosupermodel.com/games/wardrobegame.jsp fails. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=909 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |REOPENED CC| |jvanek at redhat.com Resolution|FIXED |--- --- Comment #6 from JiriVanek --- Although load, it do not accept most of user interactions. It requests awt queue permissions, which is not allowed in IcedTEa-Web. Should be? Exception in thread "AWT-EventQueue-1" java.security.AccessControlException: access denied (java.awt.AWTPermission accessEventQueue) at java.security.AccessControlContext.checkPermission(AccessControlContext.java:393) at java.security.AccessController.checkPermission(AccessController.java:553) at java.lang.SecurityManager.checkPermission(SecurityManager.java:549) at net.sourceforge.jnlp.runtime.JNLPSecurityManager.checkPermission(JNLPSecurityManager.java:284) at java.lang.SecurityManager.checkAwtEventQueueAccess(SecurityManager.java:1415) at net.sourceforge.jnlp.runtime.JNLPSecurityManager.checkAwtEventQueueAccess(JNLPSecurityManager.java:460) at java.awt.Toolkit.getSystemEventQueue(Toolkit.java:1683) at Ve.a(ProWag:546) at UY.run(ProWag:67) at java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:226) at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:647) at java.awt.EventQueue.access$000(EventQueue.java:96) at java.awt.EventQueue$1.run(EventQueue.java:608) at java.awt.EventQueue$1.run(EventQueue.java:606) at java.security.AccessController.doPrivileged(Native Method) at java.security.AccessControlContext$1.doIntersectionPrivilege(AccessControlContext.java:105) at java.awt.EventQueue.dispatchEvent(EventQueue.java:617) at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:275) at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:200) at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:190) at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:185) at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:177) at java.awt.EventDispatchThread.run(EventDispatchThread.java:138) -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130603/7377c8ff/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jun 3 03:39:27 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 03 Jun 2013 10:39:27 +0000 Subject: [Bug 1465] java.io.FileNotFoundException while trying to download a JAR file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1465 --- Comment #7 from JiriVanek --- My bad... The reason why we started with all this monstrosities around url, were situations that we got both encoded and decoded urls. To this your patch is vulnerable. To be honest, I'm for revoking of Saad's patch, and maybe return old solution with some improvements.... Or maybe rewrite whole this mechanism :-/ -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130603/6a7974f2/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jun 3 03:46:59 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 03 Jun 2013 10:46:59 +0000 Subject: [Bug 1465] java.io.FileNotFoundException while trying to download a JAR file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1465 --- Comment #8 from JiriVanek --- Please, see http://icedtea.classpath.org/hg/icedtea-web/file/2566a700bd86/tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java testNormalizeUrl testNormalizeUrlAndStripParams testDecodeUrlQuietly testNormalizeUrlQuietly testDecodeUrlAsFile Have been broken by your patch. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130603/d191fb22/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jun 3 03:55:57 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 03 Jun 2013 10:55:57 +0000 Subject: [Bug 1026] Apps fail to run because of the nanoxml parser's strict XML validation In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1026 --- Comment #8 from Heiko --- Just to be clear, jnlp-7-mrel-spec states: "URLs in a JNLP file should always be properly encoded (also known as "escaped" form in RFC 2396 Section 2.4.2), e.g., a space should be represented as %20 in a HTTP URL. A JNLP Client must use the URL exactly as specified in the JNLP file when making a request to the Web server" and " request ::= href [ "?" arguments ] arguments ::= key "=" value ( "&" key "=" value ) * " "Should" does not mean "must". And the client must not alter the URL, which in <=icetea-web-1.3 is done by the kind-of broken nanoxml code. The patch I use stops nanoxml from changing '&' to '&', where nanoxml kind-of runs amok since it tries to do the replacement everywhere, even in URLs, descriptions and PCDATA. Is there an easy way to test out icedtea-web-1.4? Im currently on: dev-java/icedtea-7.2.3.9 dev-java/icedtea-web-1.3.1-r7 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130603/3f9ecc32/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jun 3 04:29:16 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 03 Jun 2013 11:29:16 +0000 Subject: [Bug 1026] Apps fail to run because of the nanoxml parser's strict XML validation In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1026 --- Comment #9 from Heiko --- Ohw, just realized, that there is a 1.4 release since beginning of May. Sorry for that. Anyway, I just tried it and still have the very same error IcedTea-Web Plugin version: 1.4 Exception was: net.sourceforge.jnlp.ParseException: Invalid XML document syntax. at net.sourceforge.jnlp.Parser.getRootNode(Parser.java:1312) [..] Caused by: net.sourceforge.nanoxml.XMLParseException: XML Parse Exception during parsing of a jnlp element at line 20: Unexpected end of data reached at net.sourceforge.nanoxml.XMLElement.unexpectedEndOfData(XMLElement.java:1094) at net.sourceforge.nanoxml.XMLElement.readChar(XMLElement.java:877) at net.sourceforge.nanoxml.XMLElement.resolveEntity(XMLElement.java:1013) at net.sourceforge.nanoxml.XMLElement.scanString(XMLElement.java:658) at net.sourceforge.nanoxml.XMLElement.scanElement(XMLElement.java:915) at net.sourceforge.nanoxml.XMLElement.parseFromReader(XMLElement.java:512) at net.sourceforge.nanoxml.XMLElement.parseFromReader(XMLElement.java:464) at net.sourceforge.jnlp.Parser.getRootNode(Parser.java:1308) ... 7 more Caused by: net.sourceforge.nanoxml.XMLParseException: XML Parse Exception during parsing of a jnlp element at line 20: Unexpected end of data reached -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130603/0136f108/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jun 3 04:56:48 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 03 Jun 2013 11:56:48 +0000 Subject: [Bug 1465] java.io.FileNotFoundException while trying to download a JAR file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1465 --- Comment #9 from JiriVanek --- Created attachment 881 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=881&action=edit less invasive patch Hi Thomas! What do you think about this patch? Well nothing nice but imho the best what we can do in this case... If it will works for you and/or are ok with it, I will sent to formal review. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130603/91b7d0e0/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jun 3 06:00:33 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 03 Jun 2013 13:00:33 +0000 Subject: [Bug 1026] Apps fail to run because of the nanoxml parser's strict XML validation In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1026 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Version|unspecified |1.4 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130603/1c4b596d/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jun 3 06:32:07 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 03 Jun 2013 13:32:07 +0000 Subject: [Bug 1026] Apps fail to run because of the nanoxml parser's strict XML validation In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1026 --- Comment #10 from JiriVanek --- > > The patch I use stops nanoxml from changing '&' to '&', where nanoxml > kind-of runs amok since it tries to do the replacement everywhere, even in > URLs, descriptions and PCDATA. > We should probably get rid og XMLElement's Hashtable entities; compeltely. The url is sanitized correctly later. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130603/4021c31f/attachment.html From jvanek at redhat.com Mon Jun 3 07:32:48 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 03 Jun 2013 16:32:48 +0200 Subject: [rfc][icedtea-web] Make applet resize message handling asynchronous In-Reply-To: <51AC9C1A.9060909@redhat.com> References: <51A8F70A.8050907@redhat.com> <51AC60E7.3070807@redhat.com> <51AC9C1A.9060909@redhat.com> Message-ID: <51ACA910.3020708@redhat.com> On 06/03/2013 03:37 PM, Adam Domurad wrote: > On 06/03/2013 05:24 AM, Jiri Vanek wrote: >> On 05/31/2013 09:16 PM, Adam Domurad wrote: >>> Hi, this is a defensive patch to remove deadlock possibility entirely >>> from the applet resizing message. I think as much as it can be >>> avoided, blocking operations should not occur on the worker threads. >>> We never make more than 2 worker threads for normal messages, so they >>> should spawn a thread for any task that will potentially take a >>> substantial time. >>> >>> ChangeLog: >>> 2013-XX-XX Adam Domurad >>> >>> * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: >>> Handle resizing more robustly by not blocking worker thread >>> >>> I am also writing this little page: >>> http://icedtea.classpath.org/wiki/Fixing_IcedTea-Web_Browser_Hanging >>> Comments welcome. It is linked from the icedtea-web wiki page under >>> 'Common problems'. >>> >>> Happy hacking, >>> -Adam >> >> Looks good to me. Just nit which you may/do not need to follow: >> >> To create inner ResizeAppletPanel class impelmenting Runnable, so it will: >> - you will just call new Thread(new resizeAppletPanel(panel)) in main >> codse >> - will lead programmer to use the thread if he will need to call >> resize on some other place >> - I know you do not like many tinny classes but imho it is more clear O:) > > I don't think this is very reusable. All the other cases where you would resize are after the applet has initialized. I rather leave it as is. ok, thanx! > >> >> >> According to the page: >> http://icedtea.classpath.org/wiki/Fixing_IcedTea-Web_Browser_Hanging >> nice effort! Should be linked for mman page otherwise > > It is > >> It does not mention js->appelt->js deadlock. Is this deadlock in subset >> for this page? > > You can add it :-) ok:) From adomurad at icedtea.classpath.org Mon Jun 3 07:52:18 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Mon, 03 Jun 2013 14:52:18 +0000 Subject: /hg/icedtea-web: 2 new changesets Message-ID: changeset 8e6aa48abeba in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=8e6aa48abeba author: Adam Domurad date: Mon Jun 03 10:34:36 2013 -0400 Extract NativeLibraryStorage class from JNLPClassLoader changeset d6f6c5524acc in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=d6f6c5524acc author: Adam Domurad date: Mon Jun 03 10:51:47 2013 -0400 Add NativeLibraryStorageTEst diffstat: ChangeLog | 19 + netx/net/sourceforge/jnlp/cache/NativeLibraryStorage.java | 162 +++++++++ netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 139 +------- netx/net/sourceforge/jnlp/util/StreamUtils.java | 22 +- tests/netx/unit/net/sourceforge/jnlp/cache/NativeLibraryStorageTest.java | 172 ++++++++++ tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java | 120 +----- tests/test-extensions/net/sourceforge/jnlp/util/FileTestUtils.java | 129 +++++++ 7 files changed, 546 insertions(+), 217 deletions(-) diffs (truncated from 927 to 500 lines): diff -r 2566a700bd86 -r d6f6c5524acc ChangeLog --- a/ChangeLog Wed May 29 15:43:21 2013 -0400 +++ b/ChangeLog Mon Jun 03 10:51:47 2013 -0400 @@ -1,3 +1,22 @@ +2013-06-03 Adam Domurad + + * netx/net/sourceforge/jnlp/util/StreamUtils.java + (copyStream): New, copies input stream to output stream + * tests/netx/unit/net/sourceforge/jnlp/cache/NativeLibraryStorageTest.java: + New, tests lookup of native libraries from folders and jars. + * tests/test-extensions/net/sourceforge/jnlp/util/FileTestUtils.java: + New, contains utilities for testing open file descriptors, creating temporary + directories, and creating jars. + * tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java: + Replace jar creation methods with ones from FileTestUtils. + +2013-06-03 Adam Domurad + + * netx/net/sourceforge/jnlp/cache/NativeLibraryStorage.java: New, + stores and searches for native library files that are loaded from jars. + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Move code + that handled native jar caching to NativeLibraryStorage. + 2013-05-29 Adam Domurad * tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java: diff -r 2566a700bd86 -r d6f6c5524acc netx/net/sourceforge/jnlp/cache/NativeLibraryStorage.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/netx/net/sourceforge/jnlp/cache/NativeLibraryStorage.java Mon Jun 03 10:51:47 2013 -0400 @@ -0,0 +1,162 @@ +package net.sourceforge.jnlp.cache; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.List; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; + +import net.sourceforge.jnlp.runtime.JNLPRuntime; +import net.sourceforge.jnlp.util.FileUtils; + +/** + * Handles loading and access of native code loading through a JNLP application or applet. + * Stores native code in a temporary folder. + * Be sure to call cleanupTemporayFolder when finished with the object. + */ +public class NativeLibraryStorage { + private ResourceTracker tracker; + private List nativeSearchDirectories = new ArrayList(); + + /* Temporary directory to store native jar entries, added to our search path */ + private File jarEntryDirectory = null; + + public NativeLibraryStorage(ResourceTracker tracker) { + this.tracker = tracker; + } + + /** + * Clean up our temporary folder if we created one. + */ + public void cleanupTemporaryFolder() { + if (jarEntryDirectory != null) { + if (JNLPRuntime.isDebug()) { + System.out.println("Cleaning up native directory" + jarEntryDirectory.getAbsolutePath()); + } + try { + FileUtils.recursiveDelete(jarEntryDirectory, + new File(System.getProperty("java.io.tmpdir"))); + jarEntryDirectory = null; + } catch (IOException e) { + /* + * failed to delete a file in tmpdir, no big deal (as well the VM + * might be shutting down at this point so no much we can do) + */ + } + } + } + + /** + * Adds the {@link File} to the search path of this {@link NativeLibraryStorage} + * when trying to find a native library + */ + public void addSearchDirectory(File directory) { + nativeSearchDirectories.add(directory); + } + + public List getSearchDirectories() { + return nativeSearchDirectories; + } + + /** + * Looks in the search directories for 'fileName', + * returning a path to the found file if it exists. + * Returns null otherwise. + */ + public File findLibrary(String fileName) { + for (File dir : getSearchDirectories()) { + File target = new File(dir, fileName); + if (target.exists()) + return target; + } + return null; + } + + public static final String[] NATIVE_LIBRARY_EXTENSIONS = { ".so", ".dylib", ".jnilib", ".framework", ".dll" }; + + /** + * Search for and enable any native code contained in a JAR by copying the + * native files into the filesystem. Called in the security context of the + * classloader. + */ + public void addSearchJar(URL jarLocation) { + if (JNLPRuntime.isDebug()) + System.out.println("Activate native: " + jarLocation); + + File localFile = tracker.getCacheFile(jarLocation); + if (localFile == null) + return; + + try { + JarFile jarFile = new JarFile(localFile, false); + Enumeration entries = jarFile.entries(); + + while (entries.hasMoreElements()) { + JarEntry e = entries.nextElement(); + + if (e.isDirectory()) { + continue; + } + + String name = new File(e.getName()).getName(); + boolean isLibrary = false; + + for (String suffix : NATIVE_LIBRARY_EXTENSIONS) { + if (name.endsWith(suffix)) { + isLibrary = true; + break; + } + } + if (!isLibrary) { + continue; + } + + ensureNativeStoreDirectory(); + + File outFile = new File(jarEntryDirectory, name); + if (!outFile.isFile()) { + FileUtils.createRestrictedFile(outFile, true); + } + CacheUtil.streamCopy(jarFile.getInputStream(e), + new FileOutputStream(outFile)); + } + + jarFile.close(); + } catch (IOException ex) { + if (JNLPRuntime.isDebug()) + ex.printStackTrace(); + } + } + + void ensureNativeStoreDirectory() { + if (jarEntryDirectory == null) { + jarEntryDirectory = createNativeStoreDirectory(); + addSearchDirectory(jarEntryDirectory); + } + } + + /** + * Create a random base directory to store native code files in. + */ + private static File createNativeStoreDirectory() { + final int rand = (int)((Math.random()*2 - 1) * Integer.MAX_VALUE); + File nativeDir = new File(System.getProperty("java.io.tmpdir") + + File.separator + "netx-native-" + + (rand & 0xFFFF)); + File parent = nativeDir.getParentFile(); + if (!parent.isDirectory() && !parent.mkdirs()) { + return null; + } + + try { + FileUtils.createRestrictedDirectory(nativeDir); + return nativeDir; + } catch (IOException e) { + return null; + } + } +} diff -r 2566a700bd86 -r d6f6c5524acc netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed May 29 15:43:21 2013 -0400 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Mon Jun 03 10:51:47 2013 -0400 @@ -82,6 +82,7 @@ import net.sourceforge.jnlp.Version; import net.sourceforge.jnlp.cache.CacheUtil; import net.sourceforge.jnlp.cache.IllegalResourceDescriptorException; +import net.sourceforge.jnlp.cache.NativeLibraryStorage; import net.sourceforge.jnlp.cache.ResourceTracker; import net.sourceforge.jnlp.cache.UpdatePolicy; import net.sourceforge.jnlp.security.AppVerifier; @@ -127,11 +128,8 @@ * initialization of applets that share a unique key*/ private static Map uniqueKeyToLock = new HashMap(); - /** the directory for native code */ - private File nativeDir = null; // if set, some native code exists - - /** a list of directories that contain native libraries */ - private List nativeDirectories = Collections.synchronizedList(new LinkedList()); + /** Provides a search path & temporary storage for native code */ + private NativeLibraryStorage nativeLibraryStorage; /** security context */ private AccessControlContext acc = AccessController.getContext(); @@ -231,6 +229,8 @@ this.updatePolicy = policy; this.resources = file.getResources(); + this.nativeLibraryStorage = new NativeLibraryStorage(tracker); + this.mainClass = mainName; AppVerifier verifier; @@ -270,21 +270,7 @@ * there is one). Other classloaders (parent, peers) will all * cleanup things they created */ - if (nativeDir != null) { - if (JNLPRuntime.isDebug()) { - System.out.println("Cleaning up native directory" + nativeDir.getAbsolutePath()); - } - try { - FileUtils.recursiveDelete(nativeDir, - new File(System.getProperty("java.io.tmpdir"))); - } catch (IOException e) { - /* - * failed to delete a file in tmpdir, no big deal (not - * to mention that the VM is shutting down at this - * point so no much we can do) - */ - } - } + nativeLibraryStorage.cleanupTemporaryFolder(); } }); } @@ -1349,7 +1335,7 @@ } // some programs place a native library in any jar - activateNative(jar); + nativeLibraryStorage.addSearchJar(jar.getLocation()); } return null; @@ -1360,114 +1346,14 @@ } /** - * Search for and enable any native code contained in a JAR by copying the - * native files into the filesystem. Called in the security context of the - * classloader. - */ - protected void activateNative(JARDesc jar) { - if (JNLPRuntime.isDebug()) - System.out.println("Activate native: " + jar.getLocation()); - - File localFile = tracker.getCacheFile(jar.getLocation()); - if (localFile == null) - return; - - String[] librarySuffixes = { ".so", ".dylib", ".jnilib", ".framework", ".dll" }; - - try { - JarFile jarFile = new JarFile(localFile, false); - Enumeration entries = jarFile.entries(); - - while (entries.hasMoreElements()) { - JarEntry e = entries.nextElement(); - - if (e.isDirectory()) { - continue; - } - - String name = new File(e.getName()).getName(); - boolean isLibrary = false; - - for (String suffix : librarySuffixes) { - if (name.endsWith(suffix)) { - isLibrary = true; - break; - } - } - if (!isLibrary) { - continue; - } - - if (nativeDir == null) - nativeDir = getNativeDir(); - - File outFile = new File(nativeDir, name); - if (!outFile.isFile()) { - FileUtils.createRestrictedFile(outFile, true); - } - CacheUtil.streamCopy(jarFile.getInputStream(e), - new FileOutputStream(outFile)); - - } - jarFile.close(); - } catch (IOException ex) { - if (JNLPRuntime.isDebug()) - ex.printStackTrace(); - } - } - - /** - * Return the base directory to store native code files in. - * This method does not need to return the same directory across - * calls. - */ - protected File getNativeDir() { - final int rand = (int)((Math.random()*2 - 1) * Integer.MAX_VALUE); - nativeDir = new File(System.getProperty("java.io.tmpdir") - + File.separator + "netx-native-" - + (rand & 0xFFFF)); - File parent = nativeDir.getParentFile(); - if (!parent.isDirectory() && !parent.mkdirs()) { - return null; - } - - try { - FileUtils.createRestrictedDirectory(nativeDir); - // add this new native directory to the search path - addNativeDirectory(nativeDir); - return nativeDir; - } catch (IOException e) { - return null; - } - } - - /** - * Adds the {@link File} to the search path of this {@link JNLPClassLoader} - * when trying to find a native library - */ - protected void addNativeDirectory(File nativeDirectory) { - nativeDirectories.add(nativeDirectory); - } - - /** - * Returns a list of all directories in the search path of the current classloader - * when it tires to find a native library. - * @return a list of directories in the search path for native libraries - */ - protected List getNativeDirectories() { - return nativeDirectories; - } - - /** * Return the absolute path to the native library. */ protected String findLibrary(String lib) { String syslib = System.mapLibraryName(lib); + File libFile = nativeLibraryStorage.findLibrary(syslib); - for (File dir : getNativeDirectories()) { - File target = new File(dir, syslib); - if (target.exists()) - return target.toString(); + if (libFile != null) { + return libFile.toString(); } String result = super.findLibrary(lib); @@ -2044,8 +1930,9 @@ addToCodeBaseLoader(extLoader.file.getCodeBase()); // native search paths - for (File nativeDirectory : extLoader.getNativeDirectories()) - addNativeDirectory(nativeDirectory); + for (File nativeDirectory : extLoader.nativeLibraryStorage.getSearchDirectories()) { + nativeLibraryStorage.addSearchDirectory(nativeDirectory); + } // security descriptors for (URL key : extLoader.jarLocationSecurityMap.keySet()) { diff -r 2566a700bd86 -r d6f6c5524acc netx/net/sourceforge/jnlp/util/StreamUtils.java --- a/netx/net/sourceforge/jnlp/util/StreamUtils.java Wed May 29 15:43:21 2013 -0400 +++ b/netx/net/sourceforge/jnlp/util/StreamUtils.java Mon Jun 03 10:51:47 2013 -0400 @@ -42,16 +42,17 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.io.OutputStream; public class StreamUtils { - /*** + /** * Closes a stream, without throwing IOException. * In case of IOException, prints the stack trace to System.err. * * @param stream the stream that will be closed */ - public static void closeSilently (Closeable stream) { + public static void closeSilently(Closeable stream) { if (stream != null) { try { stream.close(); @@ -61,8 +62,23 @@ } } + /** + * Copy an input stream's contents into an output stream. + */ + public static void copyStream(InputStream input, OutputStream output) + throws IOException { + byte[] buffer = new byte[1024]; + while (true) { + int bytesRead = input.read(buffer); + if (bytesRead == -1) { + break; + } + output.write(buffer, 0, bytesRead); + } + } - public static String readStreamAsString(InputStream stream) throws IOException { + public static String readStreamAsString(InputStream stream) + throws IOException { InputStreamReader is = new InputStreamReader(stream); StringBuilder sb = new StringBuilder(); BufferedReader br = new BufferedReader(is); diff -r 2566a700bd86 -r d6f6c5524acc tests/netx/unit/net/sourceforge/jnlp/cache/NativeLibraryStorageTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/cache/NativeLibraryStorageTest.java Mon Jun 03 10:51:47 2013 -0400 @@ -0,0 +1,172 @@ +/* +Copyright (C) 2013 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. + */ + +package net.sourceforge.jnlp.cache; + +import static net.sourceforge.jnlp.util.FileTestUtils.assertNoFileLeak; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import net.sourceforge.jnlp.Version; +import net.sourceforge.jnlp.util.FileTestUtils; + +import org.junit.Test; + +public class NativeLibraryStorageTest { + + /************************************************************************** + * Test helpers * + **************************************************************************/ + From adomurad at redhat.com Mon Jun 3 08:28:46 2013 From: adomurad at redhat.com (Adam Domurad) Date: Mon, 03 Jun 2013 11:28:46 -0400 Subject: [icedtea-web] PluginAppletViewer.java:1625 - Can "cl" be null? In-Reply-To: <1370003542.17521.6.camel@localhost.localdomain> References: <1370003542.17521.6.camel@localhost.localdomain> Message-ID: <51ACB62E.8010509@redhat.com> On 05/31/2013 08:32 AM, Thomas Meyer wrote: > Hi, > > two questions/remarks: > > 1.) while debugging bug 1465 I hit a constellation where "cl" was null? > Is this something that could happen in reality or did I fumble to much > with the debugger? > > --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Jul 09 16:22:05 2012 -0400 > +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri May 31 12:49:17 2013 +0200 > @@ -1625,9 +1625,10 @@ > > appletShutdown(p); > appletPanels.removeElement(p); > - > + > // Mark classloader unusable > - ((JNLPClassLoader) cl).decrementLoaderUseCount(); > + if(cl != null) > + ((JNLPClassLoader) cl).decrementLoaderUseCount(); > > try { > SwingUtilities.invokeAndWait(new Runnable() { > > 2.) While debugging bug 1465 I hit a funny constellation where the > underlying "juniper SSL connection" timed out and so in > net.sourceforge.jnlp.cache.ResourceTracker.downloadResource(Resource) I > did just receive an HTML file with the message, that my current session > timed out. > This HTML file was written to the cache directory, as "JICA-foo.jar". Is > the missing check for "Content-Type" in this method intentional? > > > 1.) Hi Thomas, I cannot think of any case where this could be null. If you have reproducing steps we can look into it, it would indicate something odd happening I think. (Side rant: Nullable-by-default is evil :-( ) 2.) While I cannot speak specifically about this method, generally we do not reject things based on stuff like 'Content-Type' to be as lenient as possible for eg non-compliant servers. Cheers, -Adam From adomurad at redhat.com Mon Jun 3 09:04:54 2013 From: adomurad at redhat.com (Adam Domurad) Date: Mon, 03 Jun 2013 12:04:54 -0400 Subject: [rfc][icedtea-web] Add helper for getting NetxPanel's by unique key Message-ID: <51ACBEA6.6050108@redhat.com> Hi all. This mostly makes sense in the context of a patch that Jiri Vanek is working on. This adds a missing piece needed to operate on all NetxPanel's with a given unique key. To get the NetxPanel's from UnsignedAppletTrustConfirmation.checkUnsignedWithUserIfRequired just do: List appletPanels = PluginAppletViewer.getAppletPanelsWithUniqueKey(file.getUniqueKey()); ChangeLog: 2013-06-03 Adam Domurad * netx/net/sourceforge/jnlp/NetxPanel.java (getUniqueKey): New, returns applet unique key. (getThreadGroup): Use getUniqueKey. (NetxPanel): Use getUniqueKey. * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: (getAppletPanelsWithUniqueKey): New, get all applet panels with a given unique key. Pushing probably depends on how useful it is to Jiri. Happy hacking, -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: netxpanels-from-unique-key.patch Type: text/x-patch Size: 3733 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130603/e6c8aaa3/netxpanels-from-unique-key.patch From adomurad at icedtea.classpath.org Mon Jun 3 09:37:58 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Mon, 03 Jun 2013 16:37:58 +0000 Subject: /hg/icedtea-web: Handle resizing plugin message more robustly by... Message-ID: changeset a486f1493133 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=a486f1493133 author: Adam Domurad date: Mon Jun 03 12:25:50 2013 -0400 Handle resizing plugin message more robustly by not blocking worker thread diffstat: ChangeLog | 5 + plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 85 ++++++++------- 2 files changed, 52 insertions(+), 38 deletions(-) diffs (116 lines): diff -r d6f6c5524acc -r a486f1493133 ChangeLog --- a/ChangeLog Mon Jun 03 10:51:47 2013 -0400 +++ b/ChangeLog Mon Jun 03 12:25:50 2013 -0400 @@ -1,3 +1,8 @@ +2013-06-03 Adam Domurad + + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: + Handle resizing more robustly by not blocking worker thread + 2013-06-03 Adam Domurad * netx/net/sourceforge/jnlp/util/StreamUtils.java diff -r d6f6c5524acc -r a486f1493133 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Jun 03 10:51:47 2013 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Jun 03 12:25:50 2013 -0400 @@ -677,53 +677,62 @@ PluginDebug.debug("Applet panel ", panel, " initialized"); } + /* Resizes an applet panel, waiting for the applet to initialze. + * Should be done asynchronously to avoid the chance of deadlock. */ + private void resizeAppletPanel(final int width, final int height) { + // Wait for panel to come alive + waitForAppletInit(panel); + + SwingUtilities.invokeLater(new Runnable() { + public void run() { + panel.updateSizeInAtts(height, width); + + setSize(width, height); + + // There is a rather odd drawing bug whereby resizing + // the panel makes no difference on initial call + // because the panel thinks that it is already the + // right size. Validation has no effect there either. + // So we work around by setting size to 1, validating, + // and then setting to the right size and validating + // again. This is not very efficient, and there is + // probably a better way -- but resizing happens + // quite infrequently, so for now this is how we do it + + panel.setSize(1, 1); + panel.validate(); + + panel.setSize(width, height); + panel.validate(); + + panel.applet.resize(width, height); + panel.applet.validate(); + } + }); + } + public void handleMessage(int reference, String message) { if (message.startsWith("width")) { - // Wait for panel to come alive - waitForAppletInit(panel); - // 0 => width, 1=> width_value, 2 => height, 3=> height_value String[] dimMsg = message.split(" "); + final int width = Integer.parseInt(dimMsg[1]); final int height = Integer.parseInt(dimMsg[3]); - final int width = Integer.parseInt(dimMsg[1]); - panel.updateSizeInAtts(height, width); + /* Resize the applet asynchronously, to avoid the chance of + * deadlock while waiting for the applet to initialize. + * + * In general, worker threads should spawn new threads for any blocking operations. */ + Thread resizeAppletThread = new Thread("resizeAppletThread") { + @Override + public void run() { + resizeAppletPanel(width, height); + } + }; - try { - SwingUtilities.invokeAndWait(new Runnable() { - public void run() { - - setSize(width, height); - - // There is a rather odd drawing bug whereby resizing - // the panel makes no difference on initial call - // because the panel thinks that it is already the - // right size. Validation has no effect there either. - // So we work around by setting size to 1, validating, - // and then setting to the right size and validating - // again. This is not very efficient, and there is - // probably a better way -- but resizing happens - // quite infrequently, so for now this is how we do it - - panel.setSize(1, 1); - panel.validate(); - - panel.setSize(width, height); - panel.validate(); - - panel.applet.resize(width, height); - panel.applet.validate(); - } - }); - } catch (InterruptedException e) { - // do nothing - e.printStackTrace(); - } catch (InvocationTargetException e) { - // do nothing - e.printStackTrace(); - } + /* Let it eventually complete */ + resizeAppletThread.start(); } else if (message.startsWith("GetJavaObject")) { From aazores at redhat.com Mon Jun 3 10:06:05 2013 From: aazores at redhat.com (Andrew Azores) Date: Mon, 03 Jun 2013 13:06:05 -0400 Subject: [rfc][icedtea-web] Stripping semicolon tags from jar urls Message-ID: <51ACCCFD.9080505@redhat.com> Changelog: * netx/net/sourceforge/jnlp/Parser.java: added call to UrlUtils.stripSemicolon() * netx/net/sourceforge/jnlp/util/UrlUtils.java: added method stripSemicolon() * tests/netx/unit/net/sourceforge/jnlp/ParserBasic.java: added tests for Parser.getUrl() * tests/netx/unit/net/sourceforge/jnlp/basic.jnlp: added case for ParserBasic * tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java: added tests for UrlUtils.stripSemicolon() * tests/reproducers/simple/StripSemicolons/testcases/StripSemicolonsTest.java: added reproducer for UrlUtils.stripSemicolon() * tests/reproducers/simple/StripSemicolons/srcs/StripSemicolons.java: class used in reproducer above * tests/reproducers/simple/StripSemicolons/resources/stripsemicolons.jnlp: jnlp used to reference class above Created unit tests and reproducer for this change, which has also been moved out into UrlUtils. -------------- next part -------------- A non-text attachment was scrubbed... Name: basic.jnlp.patch Type: text/x-patch Size: 568 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130603/e315300c/basic.jnlp.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: Parser.java.patch Type: text/x-patch Size: 1076 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130603/e315300c/Parser.java.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: ParserBasic.java.patch Type: text/x-patch Size: 3799 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130603/e315300c/ParserBasic.java.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: stripsemicolons.jnlp.patch Type: text/x-patch Size: 2502 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130603/e315300c/stripsemicolons.jnlp.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: StripSemicolons.java.patch Type: text/x-patch Size: 2194 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130603/e315300c/StripSemicolons.java.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: StripSemicolonsTest.java.patch Type: text/x-patch Size: 3566 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130603/e315300c/StripSemicolonsTest.java.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: UrlUtils.java.patch Type: text/x-patch Size: 1209 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130603/e315300c/UrlUtils.java.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: UrlUtilsTest.java.patch Type: text/x-patch Size: 2238 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130603/e315300c/UrlUtilsTest.java.patch From jvanek at redhat.com Mon Jun 3 12:39:40 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 03 Jun 2013 21:39:40 +0200 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <51A8B9BC.3040603@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> <51A33BDC.4090002@redhat.com> <51A8B9BC.3040603@redhat.com> Message-ID: <51ACF0FC.7010107@redhat.com> On 05/31/2013 04:54 PM, Andrew Azores wrote: > On 05/27/2013 06:56 AM, Jiri Vanek wrote: >> On 05/24/2013 09:45 PM, Andrew Azores wrote: >>> On 05/22/2013 10:22 AM, Jiri Vanek wrote: >>>> On 05/22/2013 03:25 PM, Andrew Azores wrote: >>>>> Removed applications.html and references to it in "jawas -about" >>>>> >>>>> Changelog: >>>>> >>>>> extra/net/sourceforge/javaws/about/Main.java: Removed applications tab >>>>> extra/net/sourceforge/javaws/about/resources/applications.html: Removed unneeded file >>>> >>>> >>>> Hi! To be honest - I'm for complete removal of this "about". Or at least of much more havy >>>> refactoring >>>> >>>> Also to be honest(2) this is so deeply needed that it deserves an line in >>>> http://icedtea.classpath.org/wiki/IcedTea-Web#IcedTea-Web_1.5 table. >>>> >>>> It should work at least somehow in headless mode, and should be generated from already existing >>>> resources (eg authors, news...) >>>> >>>> So in short - get rid of "extras" jar (and it logic in makefile) and write specialised about >>>> dialogue inisde netx itself:) Feel free to be inspired by existing one, but avoid duplicated >>>> resources. >>>> >>>> if you want to bother with it (+1!) then please assign yourself on >>>> http://icedtea.classpath.org/wiki/IcedTea-Web#IcedTea-Web_1.5, and go on! >>>> >>>> >>>> >>>> Best regards from CZ! >>>> J. >>> >>> Hi Jiri, >>> >>> I'll take a look into creating that dialogue, it should be a good opportunity for me to keep >>> learning more about the code base before delving into more difficult tasks. >>> >> >> here you are http://icedtea.classpath.org/wiki/IcedTea-Web#IcedTea-Web_1.5 :)) >> >> Please try to move in as small steps as possible or split the patch to as many logically-complete parts as possible, otherwise they will be very difficult to review. >> This change should be simple code, but there will be probably huger amount of it. >> You can start with moving the window into embedded one out of extreas. >> Also it would be nice to have as much of it generated from NEWS, AUTHORS, maybe Changelog, COPYING? Reuse the rest? >> just nits... I do not wont to put boundaries to your imagination which must be much more fresh then my is :) >> >> Best regards >> J. >> >> >> > Changelog: > > Makefile.am: removed logic for extras.jar > > netx/net/sourceforge/jnlp/runtime/Boot.java: Added -headless -about mode > > netx/net/sourceforge/jnlp/resources/Messages.properties: Added messages used in -headless -about > > netx/net/sourceforge/jnlp/about/About.java: Changed name from Main, moved out of extras, added logic to generate content from AUTHORS, COPYING, NEWS, ChangeLog > > netx/net/sourceforge/jnlp/resources/about.jnlp: References changed About class > > netx/net/sourceforge/jnlp/about/Constants.java: String constants pulled out of About.java > > netx/net/sourceforge/jnlp/about/HTMLPanel.java: Moved out of extras.jar > > netx/net/sourceforge/jnlp/resources/about.html: Relocated > > netx/net/sourceforge/jnlp/resources/applications.html: Relocated > > netx/net/sourceforge/jnlp/resources/jamIcon.jpg: Relocated > > netx/net/sourceforge/jnlp/resources/notes.html: Relocated and commented out authors lines since there is a new Authors tab > > Lots of changed files but most of them have small changes made to them eg relocation, hopefully this is not too hard to review overall. I'm also not sure what else should be done for -about -headless, I'd definitely like some feedback on what else to put in there. Ugh, general comment - never split patch to such a pieces - when I wrote split to small steps or logically-complex parts, thsi was not in my mind :) Mostly the logically-compelx are refactoring, changes and tests. Not individual filles :) Deeply sorry for confusion. But this round is not vaste of time: Please, post all refactoring as separate changeset: - move of classes and delation of unnecessary files - makefile and code changes according to this change - maybe thsi will affect some exiting tests. Please double ensoure that all unittests and reproducers works In second changes you will add new code and tests - again - except new tests this will affect some exiting tests. Please double ensure that all unittests and reproducers works The codechanges itself: - the about.jnlp file msut be reomoved. It have no place in new schema. - code itself looks good (not deep investigations), but all new methods needs unittests Whats is: > +++/--- b/netx/net/sourceforge/jnlp/resources/notes.html > @@ -18,6 +18,7 @@ > > > > + > > > > > ?? The code should be removed, not commented, and tbh, why so? /me to lazy to read rest of file - if (null != getOption("-about")) - System.out.println(aboutMessage); + if (null != getOption("-about")) { + if (null != getOption("-headless")) { + System.out.println(itwInfoMessage); + System.exit(0); + } else { + System.out.println(aboutMessage); + } + } I'mnot sure if I follow - the haedless message is much more complex then "normal" -it is correct, but I do not see the launching of dialogue It is not launching in else branch? for (InputStream stream : streams) { + try { + File tempfile = File.createTempFile("javaws-about", ".html"); + tempfile.deleteOnExit(); + FileOutputStream fos = new FileOutputStream(tempfile); + + int bytesRead = stream.read(cbuf, 0, cbuf.length); + for (int i = 0; i < bytesRead; i++) { + if (cbuf[i] == '\n') { + fos.write(Constants.HTML.br); Please do not use FileOutputStream as base class Use (buffered)reader/writer build upon FileStream *with specified encoding* (utf-8) in this case Also , TBH... This is the most complicated and actually strangest filesaving :) + public static class HTML { + public static final byte[] lt = {'&', 'l', 't', ';'}; + public static final byte[] gt = {'&', 'g', 't', ';'}; + public static final byte[] amp = {'&', 'a', 'm', 'p', ';'}; + public static final byte[] br = {'<', 'b', 'r', '>'}; + } Nonnnoo :) Please use plain strings like "
" where possible. THis is not mission critical code :) + public static final int buffer_size = 20480; // 20KB NOOOO! DO not reinvite the wheel:) Please use buffered machanism already presented in java. After ^ and ^^ remove, the other "public static final String " in Constants as separate class maybe lsot its purpose, but we will se how it will look in next round. Two *RFC* at the end: - tabs - You have created all the tabs. On one side, it is not bad, on second it is to compelx. Especially the Changelog one. Please try to think about it and reduce the amount of information to usefull limit. Also the news should be limited to latest release or something like that. No borders to imagination! Try to thinkg about it like user, what do you expect to find here? - the generation of content - I'm not sure if generating the files in runtime (and so adding News, License.. adn so on into INSTALL is good idea. On the other hand, I'm not sure if some pre-generation (which I had in my mind initially) is better idea :) Sorry if review is not straightforward, I did my best for such a supplicated one :( Sorry one more times If I wrote my previous email in confusing way :( And thank you very much for doing this, This patch on its best way! J. From adomurad at redhat.com Mon Jun 3 14:09:20 2013 From: adomurad at redhat.com (Adam Domurad) Date: Mon, 03 Jun 2013 17:09:20 -0400 Subject: [rfc][icedtea-web] Remove unneeded IcedTeaRunnable.cc & .h Message-ID: <51AD0600.6000704@redhat.com> So I was getting the plugin compiling in Eclipse when I realized that these files aren't used in the build. Seeing as they aren't referenced anywhere in the source tree, it's a good idea to get rid of them. ChangeLog: 2013-06-03 Adam Domurad Remove unused files. * plugin/icedteanp/IcedTeaRunnable.cc: Removed. * plugin/icedteanp/IcedTeaRunnable.h: Removed. Happy hacking, -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: remove-unneeded-IcedTeaRunnable.patch Type: text/x-patch Size: 5702 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130603/a960a221/remove-unneeded-IcedTeaRunnable.patch From jvanek at redhat.com Mon Jun 3 22:50:06 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 04 Jun 2013 07:50:06 +0200 Subject: [rfc][icedtea-web] Remove unneeded IcedTeaRunnable.cc & .h In-Reply-To: <51AD0600.6000704@redhat.com> References: <51AD0600.6000704@redhat.com> Message-ID: <51AD800E.2000809@redhat.com> On 06/03/2013 11:09 PM, Adam Domurad wrote: > So I was getting the plugin compiling in Eclipse when I realized that these files aren't used in the build. Seeing as they aren't referenced anywhere in the source tree, it's a good idea to get rid of them. > > ChangeLog: > 2013-06-03 Adam Domurad > > Remove unused files. > * plugin/icedteanp/IcedTeaRunnable.cc: Removed. > * plugin/icedteanp/IcedTeaRunnable.h: Removed. > > > Happy hacking, > -Adam yup, clean, clean clean. Thanx! From jvanek at redhat.com Mon Jun 3 23:32:58 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 04 Jun 2013 08:32:58 +0200 Subject: [rfc][icedtea-web] Add helper for getting NetxPanel's by unique key In-Reply-To: <51ACBEA6.6050108@redhat.com> References: <51ACBEA6.6050108@redhat.com> Message-ID: <51AD8A1A.6060108@redhat.com> On 06/03/2013 06:04 PM, Adam Domurad wrote: > Hi all. This mostly makes sense in the context of a patch that Jiri Vanek is working on. This adds a missing piece needed to operate on all NetxPanel's with a given unique key. > > To get the NetxPanel's from UnsignedAppletTrustConfirmation.checkUnsignedWithUserIfRequired just do: > > List appletPanels = PluginAppletViewer.getAppletPanelsWithUniqueKey(file.getUniqueKey()); > > ChangeLog: > 2013-06-03 Adam Domurad > > * netx/net/sourceforge/jnlp/NetxPanel.java > (getUniqueKey): New, returns applet unique key. > (getThreadGroup): Use getUniqueKey. > (NetxPanel): Use getUniqueKey. > * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: > (getAppletPanelsWithUniqueKey): New, get all applet panels with a > given unique key. > > Pushing probably depends on how useful it is to Jiri. > > Happy hacking, > -Adam I think there is an issue that I can not use PluginAppletViever from netx where the splash code is placed. Also isn't the synchronisation redundant? Do you mind If I get inspired by your code encapsulate it in my patch instead of bubbling the NetxPanel? J. From ptisnovs at icedtea.classpath.org Tue Jun 4 00:53:46 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 04 Jun 2013 07:53:46 +0000 Subject: /hg/gfx-test: One helper method and eight new tests added into B... Message-ID: changeset b80631955f1a in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=b80631955f1a author: Pavel Tisnovsky date: Tue Jun 04 09:57:12 2013 +0200 One helper method and eight new tests added into BitBltConvolveOp. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltConvolveOp.java | 129 +++++++++++++++++++++++ 2 files changed, 134 insertions(+), 0 deletions(-) diffs (158 lines): diff -r ed8160c7efb3 -r b80631955f1a ChangeLog --- a/ChangeLog Mon Jun 03 10:14:37 2013 +0200 +++ b/ChangeLog Tue Jun 04 09:57:12 2013 +0200 @@ -1,3 +1,8 @@ +2013-06-04 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltConvolveOp.java: + One helper method and eight new tests added into BitBltConvolveOp. + 2013-06-03 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java: diff -r ed8160c7efb3 -r b80631955f1a src/org/gfxtest/testsuites/BitBltConvolveOp.java --- a/src/org/gfxtest/testsuites/BitBltConvolveOp.java Mon Jun 03 10:14:37 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltConvolveOp.java Tue Jun 04 09:57:12 2013 +0200 @@ -150,6 +150,23 @@ } /** + * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltEmptyBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR, rasterOp); + } + + /** * Test basic BitBlt operation for buffered image containing checker pattern * with type TYPE_3BYTE_BGR * @@ -334,6 +351,118 @@ } /** + * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType4ByteABGRbackgroundNoOpKernel1x1ROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGR(image, graphics2d, noopKernel1x1ROP); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType4ByteABGRbackgroundNoOpKernel3x3ROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGR(image, graphics2d, noopKernel3x3ROP); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType4ByteABGRbackgroundNoOpKernel5x5ROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGR(image, graphics2d, noopKernel5x5ROP); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType4ByteABGRbackgroundSmoothingKernel2x2ROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGR(image, graphics2d, smoothingKernel2x2ROP); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType4ByteABGRbackgroundSmoothingKernel2x23x3ROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGR(image, graphics2d, smoothingKernel3x3ROP); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType4ByteABGRbackgroundSmoothingKernel2x25x5ROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGR(image, graphics2d, smoothingKernel5x5ROP); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType4ByteABGRbackgroundSobelOperatorGxROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGR(image, graphics2d, sobelOperatorGxROP); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType4ByteABGRbackgroundSobelOperatorGyROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGR(image, graphics2d, sobelOperatorGyROP); + } + + /** * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. * * @param image From ptisnovs at icedtea.classpath.org Tue Jun 4 01:22:02 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 04 Jun 2013 08:22:02 +0000 Subject: /hg/rhino-tests: Updated to work correctly in JDK6-JDK8. Message-ID: changeset 704a31613698 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=704a31613698 author: Pavel Tisnovsky date: Tue Jun 04 10:25:30 2013 +0200 Updated to work correctly in JDK6-JDK8. diffstat: ChangeLog | 5 ++ src/org/RhinoTests/ScriptEngineFactoryClassTest.java | 36 ++++++++++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diffs (79 lines): diff -r 5d030140c10f -r 704a31613698 ChangeLog --- a/ChangeLog Mon Jun 03 11:50:42 2013 +0200 +++ b/ChangeLog Tue Jun 04 10:25:30 2013 +0200 @@ -1,3 +1,8 @@ +2013-06-04 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptEngineFactoryClassTest.java: + Updated to work correctly in JDK6-JDK8. + 2013-06-03 Pavel Tisnovsky * src/org/RhinoTests/ScriptContextClassTest.java: diff -r 5d030140c10f -r 704a31613698 src/org/RhinoTests/ScriptEngineFactoryClassTest.java --- a/src/org/RhinoTests/ScriptEngineFactoryClassTest.java Mon Jun 03 11:50:42 2013 +0200 +++ b/src/org/RhinoTests/ScriptEngineFactoryClassTest.java Tue Jun 04 10:25:30 2013 +0200 @@ -919,6 +919,9 @@ final String[] annotationsThatShouldExists_jdk7 = { }; + final String[] annotationsThatShouldExists_jdk8 = { + }; + // get all annotations Annotation[] annotations = this.scriptEngineFactoryClass.getAnnotations(); // and transform the array into a list of annotation names @@ -926,7 +929,20 @@ for (Annotation annotation : annotations) { annotationsAsString.add(annotation.toString()); } - String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + + String[] annotationsThatShouldExists = null; + switch (getJavaVersion()) { + case 6: + annotationsThatShouldExists = annotationsThatShouldExists_jdk6; + break; + case 7: + annotationsThatShouldExists = annotationsThatShouldExists_jdk7; + break; + case 8: + annotationsThatShouldExists = annotationsThatShouldExists_jdk8; + break; + } + // check if all required annotations really exists for (String annotationThatShouldExists : annotationsThatShouldExists) { assertTrue(annotationsAsString.contains(annotationThatShouldExists), @@ -945,6 +961,9 @@ final String[] annotationsThatShouldExists_jdk7 = { }; + final String[] annotationsThatShouldExists_jdk8 = { + }; + // get all annotations Annotation[] annotations = this.scriptEngineFactoryClass.getDeclaredAnnotations(); // and transform the array into a list of annotation names @@ -952,7 +971,20 @@ for (Annotation annotation : annotations) { annotationsAsString.add(annotation.toString()); } - String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + + String[] annotationsThatShouldExists = null; + switch (getJavaVersion()) { + case 6: + annotationsThatShouldExists = annotationsThatShouldExists_jdk6; + break; + case 7: + annotationsThatShouldExists = annotationsThatShouldExists_jdk7; + break; + case 8: + annotationsThatShouldExists = annotationsThatShouldExists_jdk8; + break; + } + // check if all required annotations really exists for (String annotationThatShouldExists : annotationsThatShouldExists) { assertTrue(annotationsAsString.contains(annotationThatShouldExists), From jvanek at redhat.com Tue Jun 4 01:50:02 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 04 Jun 2013 10:50:02 +0200 Subject: [rfc][icedtea-web] Stripping semicolon tags from jar urls In-Reply-To: <51ACCCFD.9080505@redhat.com> References: <51ACCCFD.9080505@redhat.com> Message-ID: <51ADAA3A.8090809@redhat.com> On 06/03/2013 07:06 PM, Andrew Azores wrote: > Changelog: > > * netx/net/sourceforge/jnlp/Parser.java: added call to UrlUtils.stripSemicolon() > * netx/net/sourceforge/jnlp/util/UrlUtils.java: added method stripSemicolon() > > * tests/netx/unit/net/sourceforge/jnlp/ParserBasic.java: added tests for Parser.getUrl() > * tests/netx/unit/net/sourceforge/jnlp/basic.jnlp: added case for ParserBasic > * tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java: added tests for UrlUtils.stripSemicolon() > > * tests/reproducers/simple/StripSemicolons/testcases/StripSemicolonsTest.java: added reproducer for UrlUtils.stripSemicolon() > * tests/reproducers/simple/StripSemicolons/srcs/StripSemicolons.java: class used in reproducer above > * tests/reproducers/simple/StripSemicolons/resources/stripsemicolons.jnlp: jnlp used to reference class above > > > Created unit tests and reproducer for this change, which has also been moved out into UrlUtils. Please split by logical units, not by files. In this case three patches - fix, tests, reproducr(s) (with testcase) J. From bugzilla-daemon at icedtea.classpath.org Tue Jun 4 03:12:47 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 04 Jun 2013 10:12:47 +0000 Subject: [Bug 1468] New: A fatal error when working with eclipse juno Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1468 Bug ID: 1468 Summary: A fatal error when working with eclipse juno Classification: Unclassified Product: IcedTea Version: 2.3.9 Hardware: x86 OS: Linux Status: NEW Severity: major Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: s.kaelberer at googlemail.com CC: unassigned at icedtea.classpath.org Created attachment 882 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=882&action=edit error report file Eclipse crashes after at most 2 minutes working with it. It seems not to be connected with actions I am doing in eclipse. I tried also to use Java 6, (IcedTea6 1.10.4), but see the same crashes. The difference is only that the crashes in IcedTea6 1.10.4 happen not so often (maybe after 10-20 minutes working in eclipse) My distro is OpenSuSE 12.3 Version of eclipse: Eclipse Java EE IDE for Web Developers. Version: Juno Service Release 2 Build id: 20130225-0426 The error I am receiving in the CLI is: # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x76d8b2d3, pid=4971, tid=3076028096 # # JRE version: 7.0_21-b02 # Java VM: OpenJDK Client VM (23.7-b01 mixed mode linux-x86 ) # Problematic frame: # C [libsoup-2.4.so.1+0x5a2d3] soup_session_feature_detach+0x23 # # Failed to write core dump. Core dumps have been disabled. To enable core dumping, try "ulimit -c unlimited" before starting Java again # # An error report file with more information is saved as: # /home/sernat/Entwicklung/Java/eclipse/hs_err_pid4971.log # # If you would like to submit a bug report, please include # instructions on how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # The crash happened outside the Java Virtual Machine in native code. # See problematic frame for where to report the bug. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130604/b48821a3/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Jun 4 04:33:51 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 04 Jun 2013 11:33:51 +0000 Subject: [Bug 1026] Apps fail to run because of the nanoxml parser's strict XML validation In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1026 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|adomurad at redhat.com |jvanek at redhat.com --- Comment #11 from JiriVanek --- Ok. New parser based on taxoup fixed this. I will close as fixed-next release when it will be pushed. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130604/56243a7b/attachment.html From jvanek at redhat.com Tue Jun 4 06:12:03 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 04 Jun 2013 15:12:03 +0200 Subject: [rfc][icedtea-web] minor fix to Messages.propertie CCannotClearCache Message-ID: <51ADE7A3.1000301@redhat.com> Ok for head and 1.4? -------------- next part -------------- A non-text attachment was scrubbed... Name: message.patch Type: text/x-patch Size: 825 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130604/e11cd5ff/message.patch From jvanek at redhat.com Tue Jun 4 06:18:40 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 04 Jun 2013 15:18:40 +0200 Subject: [rfc][icedtea-web] renewed tagsoup Message-ID: <51ADE930.5030206@redhat.com> Again, I'm trying to reincarnate old Omair's tagsoup patch. As this was developed by Omair, then rewritten by Adam, and now by Me, I think it is quite reviwed :) tests are adapted, and few added Ok for head? Some tests included. Also do not forget taht the results of this patch are visible only with tagsoup installed. Without it, or with -xml it behaves as normlay. (note, this will need to go to wiki) By the way the PR1026 is fixed by this, and there can come more I have already made quite deep testing, and some more testing will come, so please do not halt this for tests. Soem reproducers are in row. J. From helpcrypto at gmail.com Tue Jun 4 06:14:42 2013 From: helpcrypto at gmail.com (helpcrypto helpcrypto) Date: Tue, 4 Jun 2013 15:14:42 +0200 Subject: [OT?] Get current firefox profile Message-ID: Hi. Any of you know an easy way of getting firefox current profile from my applet? I found, but Component.classes gives permission denied: http://stackoverflow.com/questions/5695230/how-to-get-the-current-firefox-profile-path-from-within-my-applet Thanks! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130604/28bf386b/attachment.html From jvanek at redhat.com Tue Jun 4 06:21:15 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 04 Jun 2013 15:21:15 +0200 Subject: Fwd: [rfc][icedtea-web] renewed tagsoup Message-ID: <51ADE9CB.2090709@redhat.com> attached missing attachment -------- Original Message -------- Subject: [rfc][icedtea-web] renewed tagsoup Date: Tue, 04 Jun 2013 15:18:40 +0200 From: Jiri Vanek To: IcedTea Distro List Again, I'm trying to reincarnate old Omair's tagsoup patch. As this was developed by Omair, then rewritten by Adam, and now by Me, I think it is quite reviwed :) tests are adapted, and few added Ok for head? Some tests included. Also do not forget taht the results of this patch are visible only with tagsoup installed. Without it, or with -xml it behaves as normlay. (note, this will need to go to wiki) By the way the PR1026 is fixed by this, and there can come more I have already made quite deep testing, and some more testing will come, so please do not halt this for tests. Soem reproducers are in row. J. -------------- next part -------------- A non-text attachment was scrubbed... Name: tagsoup.diff Type: text/x-patch Size: 100662 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130604/e8f50aa0/tagsoup.diff From adomurad at redhat.com Tue Jun 4 06:23:42 2013 From: adomurad at redhat.com (Adam Domurad) Date: Tue, 04 Jun 2013 09:23:42 -0400 Subject: [rfc][icedtea-web] minor fix to Messages.propertie CCannotClearCache In-Reply-To: <51ADE7A3.1000301@redhat.com> References: <51ADE7A3.1000301@redhat.com> Message-ID: <51ADEA5E.6030701@redhat.com> On 06/04/2013 09:12 AM, Jiri Vanek wrote: > Ok for head and 1.4? > > Sure go ahead, but I do think the wording is a little odd. Maybe something like: 'Can not clear the cache at this time. If the problem persists, try closing your browser & JNLP applications.' I do not know if we should be telling people to kill all java applications, really. Up to you though if you want to keep it in. -Adam From aazores at redhat.com Tue Jun 4 06:22:47 2013 From: aazores at redhat.com (Andrew Azores) Date: Tue, 04 Jun 2013 09:22:47 -0400 Subject: [rfc][icedtea-web] Stripping semicolon tags from jar urls In-Reply-To: <51ADAA3A.8090809@redhat.com> References: <51ACCCFD.9080505@redhat.com> <51ADAA3A.8090809@redhat.com> Message-ID: <51ADEA27.1060501@redhat.com> On 06/04/2013 04:50 AM, Jiri Vanek wrote: > On 06/03/2013 07:06 PM, Andrew Azores wrote: >> Changelog: >> >> * netx/net/sourceforge/jnlp/Parser.java: added call to >> UrlUtils.stripSemicolon() >> * netx/net/sourceforge/jnlp/util/UrlUtils.java: added method >> stripSemicolon() >> >> * tests/netx/unit/net/sourceforge/jnlp/ParserBasic.java: added tests >> for Parser.getUrl() >> * tests/netx/unit/net/sourceforge/jnlp/basic.jnlp: added case for >> ParserBasic >> * tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java: added >> tests for UrlUtils.stripSemicolon() >> >> * >> tests/reproducers/simple/StripSemicolons/testcases/StripSemicolonsTest.java: >> added reproducer for UrlUtils.stripSemicolon() >> * tests/reproducers/simple/StripSemicolons/srcs/StripSemicolons.java: >> class used in reproducer above >> * >> tests/reproducers/simple/StripSemicolons/resources/stripsemicolons.jnlp: >> jnlp used to reference class above >> >> >> Created unit tests and reproducer for this change, which has also >> been moved out into UrlUtils. > Please split by logical units, not by files. > In this case three patches - fix, tests, reproducr(s) (with testcase) > > > J. Hopefully this is more manageable :) I definitely need some feedback on the reproducer, I'm not sure exactly what to be doing with it and at the moment it feels like it's just duplicating the unit tests. Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: fix.patch Type: text/x-patch Size: 2285 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130604/b5ea22c5/fix.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: reproducer.patch Type: text/x-patch Size: 8262 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130604/b5ea22c5/reproducer.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: unit_tests.patch Type: text/x-patch Size: 14709 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130604/b5ea22c5/unit_tests.patch From jvanek at redhat.com Tue Jun 4 06:31:23 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 04 Jun 2013 15:31:23 +0200 Subject: [rfc][icedtea-web] fix for PR1465 - java.io.FileNotFoundException while trying to download a JAR file Message-ID: <51ADEC2B.3000202@redhat.com> Although not nice, not even bad. tbh this was known issue, and when sad was pushing his patch we decided to ignore %20 and + similarity under html encoding, and difference under RFC2396. Apearently, wrongly. J. -------------- next part -------------- A non-text attachment was scrubbed... Name: thomasFix_1.patch Type: text/x-patch Size: 3844 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130604/4e6c68e2/thomasFix_1.patch From jvanek at redhat.com Tue Jun 4 06:38:49 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 04 Jun 2013 15:38:49 +0200 Subject: [OT?] Get current firefox profile In-Reply-To: References: Message-ID: <51ADEDE9.1030503@redhat.com> On 06/04/2013 03:14 PM, helpcrypto helpcrypto wrote: > Hi. > > > Any of you know an easy way of getting firefox current profile from my applet? > > I found, but Component.classes gives permission denied: > > http://stackoverflow.com/questions/5695230/how-to-get-the-current-firefox-profile-path-from-within-my-applet > > Thanks! > > I have not tried, but it give sense that applet must be signed to do this. J. From bugzilla-daemon at icedtea.classpath.org Tue Jun 4 07:16:04 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 04 Jun 2013 14:16:04 +0000 Subject: [Bug 909] The Java applet at http://de.gosupermodel.com/games/wardrobegame.jsp fails. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=909 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dbhole at redhat.com Assignee|smohammad at redhat.com |adomurad at redhat.com -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130604/6af0232a/attachment.html From jvanek at redhat.com Tue Jun 4 07:34:40 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 04 Jun 2013 16:34:40 +0200 Subject: [rfc][icedtea-web] Stripping semicolon tags from jar urls In-Reply-To: <51ADEA27.1060501@redhat.com> References: <51ACCCFD.9080505@redhat.com> <51ADAA3A.8090809@redhat.com> <51ADEA27.1060501@redhat.com> Message-ID: <51ADFB00.2040009@redhat.com> General comment - please strip only parts of old coverstion which are already solved or become irrelevant thanx to new code (but strip!-) On 06/04/2013 03:22 PM, Andrew Azores wrote: > On 06/04/2013 04:50 AM, Jiri Vanek wrote: >> On 06/03/2013 07:06 PM, Andrew Azores wrote: >>> Changelog: >>> >>> * netx/net/sourceforge/jnlp/Parser.java: added call to UrlUtils.stripSemicolon() >>> * netx/net/sourceforge/jnlp/util/UrlUtils.java: added method stripSemicolon() >>> >>> * tests/netx/unit/net/sourceforge/jnlp/ParserBasic.java: added tests for Parser.getUrl() >>> * tests/netx/unit/net/sourceforge/jnlp/basic.jnlp: added case for ParserBasic >>> * tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java: added tests for UrlUtils.stripSemicolon() >>> >>> * tests/reproducers/simple/StripSemicolons/testcases/StripSemicolonsTest.java: added reproducer for UrlUtils.stripSemicolon() >>> * tests/reproducers/simple/StripSemicolons/srcs/StripSemicolons.java: class used in reproducer above >>> * tests/reproducers/simple/StripSemicolons/resources/stripsemicolons.jnlp: jnlp used to reference class above >>> >>> >>> Created unit tests and reproducer for this change, which has also been moved out into UrlUtils. >> Please split by logical units, not by files. >> In this case three patches - fix, tests, reproducr(s) (with testcase) >> >> >> J. > Hopefully this is more manageable :) > > I definitely need some feedback on the reproducer, I'm not sure exactly what to be doing with it and at the moment it feels like it's just duplicating the unit tests. Unit tests are testing the code, reproducers are integration tests - they test if the code is realy used when it should be used. An I think you ahve messed it a bit togehter :) But nvm. You have done a little bit redundant work, and individual parts are strangly merged, but the testd do not need to be thrown away. Tahnxz for splitting it, loosk much better! > > Andrew A > > > fix.patch > > > diff --git a/netx/net/sourceforge/jnlp/Parser.java b/netx/net/sourceforge/jnlp/Parser.java > --- a/netx/net/sourceforge/jnlp/Parser.java > +++ b/netx/net/sourceforge/jnlp/Parser.java > @@ -29,6 +29,7 @@ import java.util.*; > import net.sourceforge.jnlp.UpdateDesc.Check; > import net.sourceforge.jnlp.UpdateDesc.Policy; > import net.sourceforge.jnlp.runtime.JNLPRuntime; > +import net.sourceforge.jnlp.util.UrlUtils; > import net.sourceforge.nanoxml.*; > > /** > @@ -1063,9 +1064,12 @@ class Parser { > * @throws ParseException if the JNLP file is invalid > */ > public URL getURL(Node node, String name, URL base) throws ParseException { > - String href = getAttribute(node, name, null); > - if (href == null) > + String href = UrlUtils.stripSemicolon(getAttribute(node, name, null)); > + // Remove appended semicolon "tags" (https://bugzilla.redhat.com/show_bug.cgi?id=905074) > + > + if (href == null) { > return null; // so that code can throw an exception if attribute was required > + } eeee? ahve null chel *after* your new code some purpose? Also why the remove initialisation? I would expect : String href = getAttribute(node, name, null); if (href == null) { return null; // so that code can throw an exception if attribute was required } // Remove appended semicolon "tags" (https://bugzilla.redhat.com/show_bug.cgi?id=905074) String href = UrlUtils.stripSemicolon(href); > > try { > if (base == null) > diff --git a/netx/net/sourceforge/jnlp/util/UrlUtils.java b/netx/net/sourceforge/jnlp/util/UrlUtils.java > --- a/netx/net/sourceforge/jnlp/util/UrlUtils.java > +++ b/netx/net/sourceforge/jnlp/util/UrlUtils.java > @@ -139,4 +139,25 @@ public class UrlUtils { > public static File decodeUrlAsFile(URL url) { > return new File(decodeUrlQuietly(url).getFile()); > } > + > + /* Strip any characters after the file extension iff there is a semicolon after the extension. */ > + public static String stripSemicolon(String url) { > + if (url == null) > + return null; > + > + // If JNLP specifies JAR URL with .JAR extension (as it should), then look for any semicolons > + // after this position. If one is found, remove it and any following characters. > + int fileExtension = url.toUpperCase().lastIndexOf(".JAR"); > + if (fileExtension != -1) { > + int firstSemiColon = url.indexOf(';', fileExtension); > + if (firstSemiColon != -1) { > + url = url.substring(0, firstSemiColon); > + } > + } > + return url; > + } > + > + public static URL stripSemicolon(URL url) throws MalformedURLException { > + return new URL(stripSemicolon(url.toString())); > + } > } Those two methods above looks already ok :) > > As yu have messed unittest and reproducer together, I willt try to mark hat should be what. > reproducer.patch > > > diff --git a/tests/reproducers/simple/StripSemicolons/resources/stripsemicolons.jnlp b/tests/reproducers/simple/StripSemicolons/resources/stripsemicolons.jnlp > new file mode 100644 hmm.. this jnlp should simulate the "corrupted" run, so shouldn't there be semicolon somewhere? > --- /dev/null > +++ b/tests/reproducers/simple/StripSemicolons/resources/stripsemicolons.jnlp > @@ -0,0 +1,53 @@ > + > + > + > + > +stripsemicolons > +IcedTea > + > +stripsemicolons > + > + > + > + Maybe here ?? > + > + > + > + > + > diff --git a/tests/reproducers/simple/StripSemicolons/srcs/StripSemicolons.java b/tests/reproducers/simple/StripSemicolons/srcs/StripSemicolons.java > new file mode 100644 > --- /dev/null > +++ b/tests/reproducers/simple/StripSemicolons/srcs/StripSemicolons.java > @@ -0,0 +1,45 @@ > +import net.sourceforge.jnlp.util.UrlUtils; > + > +/* SimpleTest2.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. > + */ > + > +public class StripSemicolons { > + public static void main(String[] args) { > + System.out.println("running"); > + for (String arg: args) System.out.println(UrlUtils.stripSemicolon(arg)); > + } > +} You mentioned that the ; can be used also in extensions definitions - if sou, then this jnlp is msisng, and if sou, then the code in main should check if extension was downlaoded Also appelts are affected by this issue or not? Please provide and execute also html simulating this issue. > + for (String arg: args) System.out.println(UrlUtils.stripSemicolon(arg)); ^ this is terrible misunderstending of issue. THe reproducer must BE THE ISSUE, not execute the method which was written to help him to run. I will sent Adam to your help otherwise wi weill end up in nevereding emailing deadlock;) > diff --git a/tests/reproducers/simple/StripSemicolons/testcases/StripSemicolonsTest.java b/tests/reproducers/simple/StripSemicolons/testcases/StripSemicolonsTest.java > new file mode 100644 > --- /dev/null > +++ b/tests/reproducers/simple/StripSemicolons/testcases/StripSemicolonsTest.java > @@ -0,0 +1,83 @@ > +/* SimpleTest2Test.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.util.ArrayList; > +import net.sourceforge.jnlp.ServerAccess; > +import net.sourceforge.jnlp.util.UrlUtils; > +import net.sourceforge.jnlp.annotations.KnownToFail; > +import org.junit.Assert; > + > +import org.junit.Test; > + > +public class StripSemicolonsTest { > + Yaaah THIS ???? > + private static ServerAccess server = new ServerAccess(); > + > + private static String[] testCases = { > + "http://localhost/jar.jar;tag", > + "http://localhost/jar;tag.jar", > + "http://local;host/jar;tag.jar;tag1;tag2", > + "http://zhbapssp-spsv01.bwns.ch:8080/spectrum/lib/jsafeJCEFIPS.jar;no_javaws_cheat" > + }; > + private static String[] expectedResults = { > + "http://localhost/jar.jar", > + "http://localhost/jar;tag.jar", > + "http://local;host/jar;tag.jar", > + "http://zhbapssp-spsv01.bwns.ch:8080/spectrum/lib/jsafeJCEFIPS.jar" > + }; ^^^^^^^^^ is unittest - just one method to iterate those two arrays, against your new method. > + > + @Test > + public void testStripSemicolonsLaunch() throws Exception { > + ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/stripsemicolons.jnlp"); > + Assert.assertTrue("stdout should contain " + "running" + " but did not", pr.stdout.contains("running")); Pelase use ContainsRule for this. It is not necessary here, but is good habbit in reproducers. > + } > + > + @Test > + public void testStripSemicolonsTests() throws Exception { > + ArrayList args = new ArrayList(); > + args.add("-nosecurity"); > + for (String test : testCases) { > + args.add("-arg"); > + args.add(test); > + } > + ServerAccess.ProcessResult pr = server.executeJavawsHeadless(args, "/stripsemicolons.jnlp"); > + for (String result : expectedResults) { > + Assert.assertTrue("stdout should contain " + result + " but did not.", pr.stdout.contains(result)); > + } eehhhh.. what is this??? When you mett adam in officxe, ask him :) > + } > + > +} > > > unit_tests.patch > > > diff --git a/tests/netx/unit/net/sourceforge/jnlp/ParserBasic.java b/tests/netx/unit/net/sourceforge/jnlp/ParserBasic.java > --- a/tests/netx/unit/net/sourceforge/jnlp/ParserBasic.java > +++ b/tests/netx/unit/net/sourceforge/jnlp/ParserBasic.java > @@ -37,15 +37,14 @@ exception statement from your version. > > package net.sourceforge.jnlp; > > -import java.io.ByteArrayInputStream; > import java.io.InputStream; > +import java.net.MalformedURLException; > +import java.net.URL; > import java.util.List; > -import net.sourceforge.jnlp.runtime.CodeBaseClassLoaderTest; > + > import net.sourceforge.jnlp.mock.DummyJNLPFile; > > -import org.junit.After; > import org.junit.Assert; > -import org.junit.Before; > import org.junit.BeforeClass; > import org.junit.Test; > > @@ -54,6 +53,7 @@ public class ParserBasic { > > private static Node root; > private static Parser parser; > + private static int numResourceJars = 4; > > @BeforeClass > public static void setUp() throws ParseException { > @@ -222,13 +222,17 @@ public class ParserBasic { > boolean foundNative = false; > boolean foundEager = false; > boolean foundLazy = false; > + boolean foundBadlyNamed = false; > > JARDesc[] jars = resources.getJARs(); > - Assert.assertEquals(3, jars.length); > + Assert.assertEquals(numResourceJars, jars.length); > for (int i = 0; i< jars.length; i++) { > if (jars[i].isNative()) { > foundNative = true; > Assert.assertEquals("http://localhost/native.jar", jars[i].getLocation().toString()); > + } else if (jars[i].isMain()) { > + foundBadlyNamed = true; > + Assert.assertEquals("http://localhost/semicolon.jar", jars[i].getLocation().toString()); I'm not sure if I understand pupose of this hunk > } else if (jars[i].isEager()) { > foundEager = true; > Assert.assertEquals("http://localhost/eager.jar", jars[i].getLocation().toString()); > @@ -243,6 +247,7 @@ public class ParserBasic { > Assert.assertTrue(foundNative); > Assert.assertTrue(foundLazy); > Assert.assertTrue(foundEager); > + Assert.assertTrue(foundBadlyNamed); > } > > @Test > @@ -281,4 +286,48 @@ public class ParserBasic { > Assert.assertArrayEquals(new String[] { "arg1", "arg2" }, app.getArguments()); > } > > + @Test > + public void testGetUrl() throws ParseException { > + Node resources = null; > + for (Node child : root.getChildNodes()) { > + if (child.getNodeName().equals("resources")) { > + resources = child; > + break; > + } > + } > + > + Assert.assertNotNull(resources); > + > + Node[] jars = new Node[numResourceJars - 1]; > + int index = 0; > + for (Node child: resources.getChildNodes()) { > + if (child.getNodeName().equals("jar")) { > + jars[index] = child; > + index++; > + } > + } > + > + for (Node jar : jars) { > + try { > + String url = parser.getURL(jar, "href", new URL("http://localhost")).toString(); > + String href = jar.getAttribute("href"); > + Assert.assertFalse(url.equals("")); > + Assert.assertFalse(href.equals("")); > + > + int fileExtension = href.toUpperCase().lastIndexOf(".JAR"); > + if (fileExtension != -1) { > + int semiColon = href.indexOf(';', fileExtension); > + if (semiColon != -1) { > + href = href.substring(0, semiColon); > + } > + } > + > + Assert.assertEquals(url,"http://localhost/" + href); > + > + if (url.lastIndexOf(';') != -1) Assert.assertTrue(url.lastIndexOf(';')< url.indexOf('.')); > + } catch (MalformedURLException e) { > + Assert.assertTrue(false); > + } actually even this is misty for me in context od unittests > + } > + } > } > diff --git a/tests/netx/unit/net/sourceforge/jnlp/basic.jnlp b/tests/netx/unit/net/sourceforge/jnlp/basic.jnlp > --- a/tests/netx/unit/net/sourceforge/jnlp/basic.jnlp > +++ b/tests/netx/unit/net/sourceforge/jnlp/basic.jnlp > @@ -35,6 +35,7 @@ > max-heap-size='128m' /> > > > + > > > Its probably good idea to test also parser on this issue. > diff --git a/tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java b/tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java > --- a/tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java > +++ b/tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java > @@ -43,6 +43,7 @@ import static org.junit.Assert.assertFal > import java.io.File; > import java.net.URL; > > +import org.junit.Assert; > import org.junit.Test; > > public class UrlUtilsTest { > @@ -116,4 +117,26 @@ public class UrlUtilsTest { > assertEquals(testFile, UrlUtils.decodeUrlAsFile(encodedUrl)); > } > } > + > + @Test > + public void testStripSemicolon() { > + String simpleCodebase ="http://localhost/", > + complexCodebase ="http://localhost/i=123?q=456¶m=test;semicolon/", > + simpleJarName = "file.jar", > + complexJarName = "file2.jar.pack.gz;no_javaws_cheat", > + multiTaggedJarName = "file.jar;ignored;ignored;ignored", > + bareJarName = "jar", > + taggedBareJarName = "jar;ignored"; > + > + Assert.assertEquals(simpleCodebase + simpleJarName, UrlUtils.stripSemicolon(simpleCodebase + simpleJarName)); > + Assert.assertEquals(simpleCodebase + bareJarName, UrlUtils.stripSemicolon(simpleCodebase + bareJarName)); > + Assert.assertEquals(simpleCodebase + "file2.jar.pack.gz", UrlUtils.stripSemicolon(simpleCodebase + complexJarName)); > + Assert.assertEquals(simpleCodebase + "file.jar", UrlUtils.stripSemicolon(simpleCodebase + multiTaggedJarName)); > + Assert.assertEquals(simpleCodebase + taggedBareJarName, UrlUtils.stripSemicolon(simpleCodebase + taggedBareJarName)); > + Assert.assertEquals(complexCodebase + simpleJarName, UrlUtils.stripSemicolon(complexCodebase + simpleJarName)); > + Assert.assertEquals(complexCodebase + bareJarName, UrlUtils.stripSemicolon(complexCodebase + bareJarName)); > + Assert.assertEquals(complexCodebase + "file2.jar.pack.gz", UrlUtils.stripSemicolon(complexCodebase + complexJarName)); > + Assert.assertEquals(complexCodebase + "file.jar", UrlUtils.stripSemicolon(complexCodebase + multiTaggedJarName)); > + Assert.assertEquals(complexCodebase + taggedBareJarName, UrlUtils.stripSemicolon(complexCodebase + taggedBareJarName)); This is strange. Sorry > + } > } > \ No newline at end of file > diff --git a/tests/reproducers/simple/StripSemicolons/resources/stripsemicolons.jnlp b/tests/reproducers/simple/StripSemicolons/resources/stripsemicolons.jnlp > new file mode 100644 > --- /dev/null > +++ b/tests/reproducers/simple/StripSemicolons/resources/stripsemicolons.jnlp > @@ -0,0 +1,53 @@ > + > + > + > + > +stripsemicolons > +IcedTea > + > +stripsemicolons > + > + > + > + > + > + > + > + > + > diff --git a/tests/reproducers/simple/StripSemicolons/srcs/StripSemicolons.java b/tests/reproducers/simple/StripSemicolons/srcs/StripSemicolons.java > new file mode 100644 > --- /dev/null > +++ b/tests/reproducers/simple/StripSemicolons/srcs/StripSemicolons.java > @@ -0,0 +1,45 @@ > +import net.sourceforge.jnlp.util.UrlUtils; > + > +/* SimpleTest2.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. > + */ > + > +public class StripSemicolons { > + public static void main(String[] args) { > + System.out.println("running"); > + for (String arg: args) System.out.println(UrlUtils.stripSemicolon(arg)); > + } > +} > diff --git a/tests/reproducers/simple/StripSemicolons/testcases/StripSemicolonsTest.java b/tests/reproducers/simple/StripSemicolons/testcases/StripSemicolonsTest.java > new file mode 100644 > --- /dev/null > +++ b/tests/reproducers/simple/StripSemicolons/testcases/StripSemicolonsTest.java > @@ -0,0 +1,83 @@ > +/* SimpleTest2Test.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.util.ArrayList; > +import net.sourceforge.jnlp.ServerAccess; > +import net.sourceforge.jnlp.util.UrlUtils; > +import net.sourceforge.jnlp.annotations.KnownToFail; > +import org.junit.Assert; > + > +import org.junit.Test; > + > +public class StripSemicolonsTest { > + > + private static ServerAccess server = new ServerAccess(); > + > + private static String[] testCases = { > + "http://localhost/jar.jar;tag", > + "http://localhost/jar;tag.jar", > + "http://local;host/jar;tag.jar;tag1;tag2", > + "http://zhbapssp-spsv01.bwns.ch:8080/spectrum/lib/jsafeJCEFIPS.jar;no_javaws_cheat" > + }; > + private static String[] expectedResults = { > + "http://localhost/jar.jar", > + "http://localhost/jar;tag.jar", > + "http://local;host/jar;tag.jar", > + "http://zhbapssp-spsv01.bwns.ch:8080/spectrum/lib/jsafeJCEFIPS.jar" > + }; > + > + @Test > + public void testStripSemicolonsLaunch() throws Exception { > + ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/stripsemicolons.jnlp"); > + Assert.assertTrue("stdout should contain " + "running" + " but did not", pr.stdout.contains("running")); > + } > + > + @Test > + public void testStripSemicolonsTests() throws Exception { > + ArrayList args = new ArrayList(); > + args.add("-nosecurity"); > + for (String test : testCases) { > + args.add("-arg"); > + args.add(test); > + } > + ServerAccess.ProcessResult pr = server.executeJavawsHeadless(args, "/stripsemicolons.jnlp"); > + for (String result : expectedResults) { > + Assert.assertTrue("stdout should contain " + result + " but did not.", pr.stdout.contains(result)); > + } > + } > + This was already here, wasn'nt it? > +} Genral comments to test: In your case you will add two or three testmethods to unittest files: - tests/netx/unit/net/sourceforge/jnlp/ParserBasic.java: added tests for Parser.getUrl() - correct, this will iterate through your testCase and comapre with expectedessults in assserEwuals. Nice test - tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java: This is bonus test, and should be muchhless complicated then you started it - You wil prvide jnlp file (like * tests/netx/unit/net/sourceforge/jnlp/basic.jnlp: added case for ParserBasic) s separate file or or as string (and s inputstream) for parser. No localhosts here! Then yo will tests if parser returns correct urls. Reproducer: You must prepare one or two "semicolon corrupted" html and one or two "semicolon corrupted" jnlp file. If you will try to test also extension with semicolon, you shoud tests taht extension was loaded in your (in src) main class. Otehrwise some "app finished" stdout is enough you shoud use closing listener for applets your testcase is then executing the html and jnlp files, and is checking the output. By this way you will find that your fix is really workling. I'm sending adam to look over your shoulder:) Good luck! J From adomurad at redhat.com Tue Jun 4 07:44:29 2013 From: adomurad at redhat.com (Adam Domurad) Date: Tue, 04 Jun 2013 10:44:29 -0400 Subject: [rfc][icedtea-web] Add helper for getting NetxPanel's by unique key In-Reply-To: <51AD8A1A.6060108@redhat.com> References: <51ACBEA6.6050108@redhat.com> <51AD8A1A.6060108@redhat.com> Message-ID: <51ADFD4D.5010101@redhat.com> Sorry for duplicate, forgot to send to list. On 06/04/2013 02:32 AM, Jiri Vanek wrote: > On 06/03/2013 06:04 PM, Adam Domurad wrote: >> Hi all. This mostly makes sense in the context of a patch that Jiri >> Vanek is working on. This adds a missing piece needed to operate on >> all NetxPanel's with a given unique key. >> >> To get the NetxPanel's from >> UnsignedAppletTrustConfirmation.checkUnsignedWithUserIfRequired just do: >> >> List appletPanels = >> PluginAppletViewer.getAppletPanelsWithUniqueKey(file.getUniqueKey()); >> >> ChangeLog: >> 2013-06-03 Adam Domurad >> >> * netx/net/sourceforge/jnlp/NetxPanel.java >> (getUniqueKey): New, returns applet unique key. >> (getThreadGroup): Use getUniqueKey. >> (NetxPanel): Use getUniqueKey. >> * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: >> (getAppletPanelsWithUniqueKey): New, get all applet panels with a >> given unique key. >> >> Pushing probably depends on how useful it is to Jiri. >> >> Happy hacking, >> -Adam > > I think there is an issue that I can not use PluginAppletViever from > netx where the splash code is placed. Good point. > Also isn't the synchronisation redundant? Nope. Iterating over Vector is not by itself thread-safe, there can still be a concurrent modification. > Do you mind If I get inspired by your code encapsulate it in my patch > instead of bubbling the NetxPanel? Of course! IMO you should keep this list in NetxPanel and have it updated on applet create, destroy etc. This way PluginAppletViewer will still indirectly control it. > > J. Cheers, -Adam From adomurad at icedtea.classpath.org Tue Jun 4 07:45:41 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Tue, 04 Jun 2013 14:45:41 +0000 Subject: /hg/icedtea-web: Remove unused IcedTeaRunnable.h & IcedTeaRunnab... Message-ID: changeset 07f37cd6d7bc in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=07f37cd6d7bc author: Adam Domurad date: Tue Jun 04 10:47:19 2013 -0400 Remove unused IcedTeaRunnable.h & IcedTeaRunnable.cc diffstat: ChangeLog | 6 ++ plugin/icedteanp/IcedTeaRunnable.cc | 75 -------------------------- plugin/icedteanp/IcedTeaRunnable.h | 102 ------------------------------------ 3 files changed, 6 insertions(+), 177 deletions(-) diffs (198 lines): diff -r a486f1493133 -r 07f37cd6d7bc ChangeLog --- a/ChangeLog Mon Jun 03 12:25:50 2013 -0400 +++ b/ChangeLog Tue Jun 04 10:47:19 2013 -0400 @@ -1,3 +1,9 @@ +2013-06-04 Adam Domurad + + Remove unused files. + * plugin/icedteanp/IcedTeaRunnable.cc: Removed. + * plugin/icedteanp/IcedTeaRunnable.h: Removed. + 2013-06-03 Adam Domurad * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: diff -r a486f1493133 -r 07f37cd6d7bc plugin/icedteanp/IcedTeaRunnable.cc --- a/plugin/icedteanp/IcedTeaRunnable.cc Mon Jun 03 12:25:50 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,75 +0,0 @@ -/* IcedTeaRunnable.cc - - Copyright (C) 2009, 2010 Red Hat - -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. */ - -#include -#include "IcedTeaRunnable.h" - -NS_IMPL_ISUPPORTS1 (IcedTeaRunnable, nsIRunnable) - -IcedTeaRunnable::IcedTeaRunnable () -{ -} - -IcedTeaRunnable::~IcedTeaRunnable () -{ -} - -NS_IMETHODIMP -IcedTeaRunnable::Run () -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -IcedTeaRunnableMethod::IcedTeaRunnableMethod (Method method, void* thread_data, void* result) -: method (method), - thread_data(thread_data), - result(result) -{ -} - -IcedTeaRunnableMethod::~IcedTeaRunnableMethod () -{ - } - -NS_IMETHODIMP -IcedTeaRunnableMethod::Run () -{ - printf("Running method...\n"); - (*method) (thread_data, result); - return NS_OK; -} diff -r a486f1493133 -r 07f37cd6d7bc plugin/icedteanp/IcedTeaRunnable.h --- a/plugin/icedteanp/IcedTeaRunnable.h Mon Jun 03 12:25:50 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,102 +0,0 @@ -/* IcedTeaRunnable.h - - Copyright (C) 2009, 2010 Red Hat - -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. */ - -#ifndef __ICEDTEARUNNABLE_H__ -#define __ICEDTEARUNNABLE_H__ - -#define MOZILLA 1 -#if MOZILLA - -#include -#include - -/* - * This struct holds the result from the main-thread dispatched method - */ -typedef struct result_data -{ - // Return identifier (if applicable) - int return_identifier; - - // Return string (if applicable) - std::string* return_string; - - // Return wide/mb string (if applicable) - std::wstring* return_wstring; - - // Error message (if an error occurred) - std::string* error_msg; - - // Boolean indicating if an error occurred - bool error_occured; - - // If this result is ready - bool result_ready; - -} ResultData; - -class IcedTeaRunnable : public nsIRunnable -{ -public: - NS_DECL_ISUPPORTS - NS_DECL_NSIRUNNABLE - - IcedTeaRunnable (); - - ~IcedTeaRunnable (); -}; - -class IcedTeaRunnableMethod : public IcedTeaRunnable -{ -public: - - typedef void* (*Method) (void*, void*); - - IcedTeaRunnableMethod (Method, void* thread_data, void* result); - NS_IMETHOD Run (); - - ~IcedTeaRunnableMethod (); - - Method method; - void* thread_data; - void* result; -}; - -#endif /* MOZILLA */ - -#endif /* __ICEDTEARUNNABLE_H__ */ From jvanek at icedtea.classpath.org Tue Jun 4 08:33:07 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Tue, 04 Jun 2013 15:33:07 +0000 Subject: /hg/icedtea-web: more detailed hint for CCannotClearCache Message-ID: changeset f22262521491 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=f22262521491 author: Jiri Vanek date: Tue Jun 04 17:35:53 2013 +0200 more detailed hint for CCannotClearCache diffstat: ChangeLog | 5 +++++ netx/net/sourceforge/jnlp/resources/Messages.properties | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diffs (24 lines): diff -r 07f37cd6d7bc -r f22262521491 ChangeLog --- a/ChangeLog Tue Jun 04 10:47:19 2013 -0400 +++ b/ChangeLog Tue Jun 04 17:35:53 2013 +0200 @@ -1,3 +1,8 @@ +2013-06-04 Jiri Vanek + + * netx/net/sourceforge/jnlp/resources/Messages.properties: + more detailed hint for CCannotClearCache + 2013-06-04 Adam Domurad Remove unused files. diff -r 07f37cd6d7bc -r f22262521491 netx/net/sourceforge/jnlp/resources/Messages.properties --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Tue Jun 04 10:47:19 2013 -0400 +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Tue Jun 04 17:35:53 2013 +0200 @@ -202,7 +202,7 @@ CChooseCache=Choose a cache directory... CChooseCacheInfo=NetX needs a location for storing cache files. CChooseCacheDir=Cache directory -CCannotClearCache=Can not clear cache at this time +CCannotClearCache=Can not clear the cache at this time. Try later. If the problem persists, try closing your browser(s) & JNLP applications. At the end you can try to kill all java applications. CFakeCache=Cache is corrupt. Fixing. CFakedCache=Cache was corrupt and has been fixed. It is strongly recommended that you run 'javaws -Xclearcache' and rerun your application as soon as possible. From jvanek at icedtea.classpath.org Tue Jun 4 08:33:36 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Tue, 04 Jun 2013 15:33:36 +0000 Subject: /hg/release/icedtea-web-1.4: more detailed hint for CCannotClear... Message-ID: changeset 6990997b492c in /hg/release/icedtea-web-1.4 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=6990997b492c author: Jiri Vanek date: Tue Jun 04 17:36:17 2013 +0200 more detailed hint for CCannotClearCache diffstat: ChangeLog | 5 +++++ netx/net/sourceforge/jnlp/resources/Messages.properties | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diffs (24 lines): diff -r e281ea56466e -r 6990997b492c ChangeLog --- a/ChangeLog Wed May 29 10:56:57 2013 -0400 +++ b/ChangeLog Tue Jun 04 17:36:17 2013 +0200 @@ -1,3 +1,8 @@ +2013-06-04 Jiri Vanek + + * netx/net/sourceforge/jnlp/resources/Messages.properties: + more detailed hint for CCannotClearCache + 2013-05-29 Adam Domurad * netx/net/sourceforge/jnlp/resources/Messages.properties: diff -r e281ea56466e -r 6990997b492c netx/net/sourceforge/jnlp/resources/Messages.properties --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Wed May 29 10:56:57 2013 -0400 +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Tue Jun 04 17:36:17 2013 +0200 @@ -202,7 +202,7 @@ CChooseCache=Choose a cache directory... CChooseCacheInfo=NetX needs a location for storing cache files. CChooseCacheDir=Cache directory -CCannotClearCache=Can not clear cache at this time +CCannotClearCache=Can not clear the cache at this time. Try later. If the problem persists, try closing your browser(s) & JNLP applications. At the end you can try to kill all java applications. CFakeCache=Cache is corrupt. Fixing. CFakedCache=Cache was corrupt and has been fixed. It is strongly recommended that you run 'javaws -Xclearcache' and rerun your application as soon as possible. From adomurad at redhat.com Tue Jun 4 08:58:28 2013 From: adomurad at redhat.com (Adam Domurad) Date: Tue, 04 Jun 2013 11:58:28 -0400 Subject: [rfc][icedtea-web] More testing for IcedTeaScriptablePluginObject.cc + memory leak fixes Message-ID: <51AE0EA4.5040405@redhat.com> Hi all, I am looking into making the 'getvalue' NPAPI hook non-blocking. This involves the Java-in-Javascript wrappers, so I'm trying to put more of it under test. Included is a leak fix and extra C++ test infrastructure + tests. It is working very well at detecting leaks due to 'new' without a corresponding 'delete'. Before the fix two tests should report 1 leak with 'new'. After fix all tests should pass. Test ChangeLog: 2013-XX-XX Adam Domurad * plugin/icedteanp/IcedTeaPluginUtils.cc: Add global state clearing utility functions. * plugin/icedteanp/IcedTeaPluginUtils.h: Same. * tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc: Test scriptable object creation and destruction. * tests/cpp-unit-tests/browser_mock.cc (mock_createobject): New, mocks NPAPI 'createobject'. * tests/cpp-unit-tests/MemoryLeakDetector.h: New, memory leak detection utility class. * tests/cpp-unit-tests/main.cc (ReportTestFinish): Print which tests resulted in memory leaks. Fix ChangeLog: 2013-XX-XX Adam Domurad * plugin/icedteanp/IcedTeaScriptablePluginObject.cc (IcedTeaScriptablePluginObject::get_scriptable_java_package_object): Fix memory leak due to allocated NPClass. (IcedTeaScriptableJavaPackageObject::get_scriptable_java_object): Same. Cheers, -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: test-JS-wrapper-objects.patch Type: text/x-patch Size: 11537 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130604/492bc822/test-JS-wrapper-objects.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: fix-JS-wrapper-leaks.patch Type: text/x-patch Size: 7110 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130604/492bc822/fix-JS-wrapper-leaks.patch From gnu.andrew at redhat.com Tue Jun 4 09:25:47 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Tue, 4 Jun 2013 12:25:47 -0400 (EDT) Subject: [rfc][icedtea-web] fix for RH947647, following the XDG basedir specification In-Reply-To: References: <519A756D.9030308@redhat.com> <519AD027.4050105@redhat.com> <519B5241.7010407@redhat.com> Message-ID: <1583560531.3709366.1370363147349.JavaMail.root@redhat.com> ----- Original Message ----- > Hi > > > On Tue, May 21, 2013 at 6:53 AM, Jiri Vanek wrote: > > > > > Some more thoughts about this: > > - eg I have non XDG variable set, but many applications have already > > started to use theirs default values. > > > > I am not sure what you mean by this but distributions aren't supposed to > set any of XDG environment variables by default. It is solely a deployment > customization for the odd cases out there. Running cache in tmpfs or > config from nfs or whatever > > > > - If we decide to move to ./config and ./cache: > > if used XDG* variables are set, then use them. otherwise use ./config > > and ./cache > > if they change, user is on his own? > > > > Yes. If users customize it, they will have to deal with the fallout. > > > > - how about xdg not following systems (windows) ? Keep .icedtea or move to > > ./config and ./cache ? > > > > Hidden directories is not how Windows programs stores its profiles. You > might consider following what glib helper functions do > > Refer to > https://developer.gnome.org/glib/2.34/glib-Miscellaneous-Utility-Functions.html > > g_get_user_cache_dir() and so on > I didn't realise glib supported this for so long (since 2.6). It seems like an excellent solution to just use that. > Rahul > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From helpcrypto at gmail.com Tue Jun 4 11:40:34 2013 From: helpcrypto at gmail.com (helpcrypto helpcrypto) Date: Tue, 4 Jun 2013 20:40:34 +0200 Subject: [OT?] Get current firefox profile In-Reply-To: <51ADEDE9.1030503@redhat.com> References: <51ADEDE9.1030503@redhat.com> Message-ID: Mine is signed, but still dont have the way to do it...any clue? On Tue, Jun 4, 2013 at 3:38 PM, Jiri Vanek wrote: > On 06/04/2013 03:14 PM, helpcrypto helpcrypto wrote: > >> Hi. >> >> >> Any of you know an easy way of getting firefox current profile from my >> applet? >> >> I found, but Component.classes gives permission denied: >> >> http://stackoverflow.com/**questions/5695230/how-to-get-** >> the-current-firefox-profile-**path-from-within-my-applet >> >> Thanks! >> >> >> > I have not tried, but it give sense that applet must be signed to do this. > J. > -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130604/4b14e78e/attachment.html From adomurad at redhat.com Tue Jun 4 13:06:34 2013 From: adomurad at redhat.com (Adam Domurad) Date: Tue, 04 Jun 2013 16:06:34 -0400 Subject: [rfc][icedtea-web] fix for PR1465 - java.io.FileNotFoundException while trying to download a JAR file In-Reply-To: <51ADEC2B.3000202@redhat.com> References: <51ADEC2B.3000202@redhat.com> Message-ID: <51AE48CA.6060102@redhat.com> On 06/04/2013 09:31 AM, Jiri Vanek wrote: > Although not nice, not even bad. > > tbh this was known issue, and when sad was pushing his patch we > decided to ignore %20 and + similarity under html encoding, and > difference under RFC2396. > Apearently, wrongly. > > J. I have done some research and I think I found a solution that should be pleasing. See the unit tests in the patch, too. Basically new URI(url) will check RFC2396 validity. See http://stackoverflow.com/questions/304806/encode-and-decode-rfc2396-urls This avoids the whole normalization mess if the URL is already valid. As long as we create URLs in a manner that ensures they are correct, this will be preserved. This should reduce the future chance of unintended icedtea-web quirks, too. Happy hacking, -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: PR1465-fix.patch Type: text/x-patch Size: 3990 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130604/d1802350/PR1465-fix.patch From adomurad at redhat.com Tue Jun 4 13:08:55 2013 From: adomurad at redhat.com (Adam Domurad) Date: Tue, 04 Jun 2013 16:08:55 -0400 Subject: [rfc][icedtea-web] fix for PR1465 - java.io.FileNotFoundException while trying to download a JAR file In-Reply-To: <51AE48CA.6060102@redhat.com> References: <51ADEC2B.3000202@redhat.com> <51AE48CA.6060102@redhat.com> Message-ID: <51AE4957.5020302@redhat.com> On 06/04/2013 04:06 PM, Adam Domurad wrote: > On 06/04/2013 09:31 AM, Jiri Vanek wrote: >> Although not nice, not even bad. >> >> tbh this was known issue, and when sad was pushing his patch we >> decided to ignore %20 and + similarity under html encoding, and >> difference under RFC2396. >> Apearently, wrongly. >> >> J. > > I have done some research and I think I found a solution that should > be pleasing. See the unit tests in the patch, too. > > Basically new URI(url) will check RFC2396 validity. > See > http://stackoverflow.com/questions/304806/encode-and-decode-rfc2396-urls > > This avoids the whole normalization mess if the URL is already valid. > As long as we create URLs in a manner that ensures they are correct, > this will be preserved. > This should reduce the future chance of unintended icedtea-web quirks, > too. > > Happy hacking, > -Adam There was a bit of noise in the diff, so just reassuring that UrlUtils.normalizeUrl is intended to be untouched other than the line 'if (protocol == null || !shouldEncode || url.getPath() == null || isValidRFC2396Url(url)) {' Happy hacking, -Adam From ptisnovs at icedtea.classpath.org Wed Jun 5 01:24:58 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 05 Jun 2013 08:24:58 +0000 Subject: /hg/gfx-test: Added five new tests into BitBltCropImage. Message-ID: changeset 423cbdb30284 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=423cbdb30284 author: Pavel Tisnovsky date: Wed Jun 05 10:28:26 2013 +0200 Added five new tests into BitBltCropImage. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltCropImage.java | 98 +++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 0 deletions(-) diffs (120 lines): diff -r b80631955f1a -r 423cbdb30284 ChangeLog --- a/ChangeLog Tue Jun 04 09:57:12 2013 +0200 +++ b/ChangeLog Wed Jun 05 10:28:26 2013 +0200 @@ -1,3 +1,8 @@ +2013-06-05 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltCropImage.java: + Added five new tests into BitBltCropImage. + 2013-06-04 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltConvolveOp.java: diff -r b80631955f1a -r 423cbdb30284 src/org/gfxtest/testsuites/BitBltCropImage.java --- a/src/org/gfxtest/testsuites/BitBltCropImage.java Tue Jun 04 09:57:12 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltCropImage.java Wed Jun 05 10:28:26 2013 +0200 @@ -83,6 +83,104 @@ { /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * No crop is performed to that image. + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRNoCrop(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform BitBlt test using crop operation. + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR); + } + + /** + * Test basic BitBlt operation for checker buffered image with type + * TYPE_3BYTE_BGR. Image is cropped so only north-west quarter of it is rendered. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRCropNW(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform BitBlt test using crop operation. + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, + BitmapCropRegions.CROP_REGION_NW); + } + + /** + * Test basic BitBlt operation for checker buffered image with type + * TYPE_3BYTE_BGR. Image is cropped so only north-east quarter of it is rendered. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRCropNE(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform BitBlt test using crop operation. + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, + BitmapCropRegions.CROP_REGION_NE); + } + + /** + * Test basic BitBlt operation for checker buffered image with type + * TYPE_3BYTE_BGR. Image is cropped so only south-west quarter of it is rendered. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRCropSW(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform BitBlt test using crop operation. + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, + BitmapCropRegions.CROP_REGION_SW); + } + + /** + * Test basic BitBlt operation for checker buffered image with type + * TYPE_3BYTE_BGR. Image is cropped so only south-east quarter of it is rendered. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRCropSE(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform BitBlt test using crop operation. + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, + BitmapCropRegions.CROP_REGION_SE); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR. + * No crop is performed to that image. + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGRNoCrop(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform BitBlt test using crop operation. + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR); + } + + /** * Test basic BitBlt operation for checker buffered image with type * TYPE_BYTE_BINARY. No crop is performed to that image. * From ptisnovs at icedtea.classpath.org Wed Jun 5 01:39:15 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 05 Jun 2013 08:39:15 +0000 Subject: /hg/rhino-tests: Updated ScriptContextClassTest to work correctl... Message-ID: changeset 4de9c7877164 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=4de9c7877164 author: Pavel Tisnovsky date: Wed Jun 05 10:42:41 2013 +0200 Updated ScriptContextClassTest to work correctly in JDK6-JDK8. diffstat: ChangeLog | 5 +++ src/org/RhinoTests/ScriptContextClassTest.java | 36 ++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diffs (79 lines): diff -r 704a31613698 -r 4de9c7877164 ChangeLog --- a/ChangeLog Tue Jun 04 10:25:30 2013 +0200 +++ b/ChangeLog Wed Jun 05 10:42:41 2013 +0200 @@ -1,3 +1,8 @@ +2013-06-05 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptContextClassTest.java: + Updated ScriptContextClassTest to work correctly in JDK6-JDK8. + 2013-06-04 Pavel Tisnovsky * src/org/RhinoTests/ScriptEngineFactoryClassTest.java: diff -r 704a31613698 -r 4de9c7877164 src/org/RhinoTests/ScriptContextClassTest.java --- a/src/org/RhinoTests/ScriptContextClassTest.java Tue Jun 04 10:25:30 2013 +0200 +++ b/src/org/RhinoTests/ScriptContextClassTest.java Wed Jun 05 10:42:41 2013 +0200 @@ -967,6 +967,9 @@ final String[] annotationsThatShouldExists_jdk7 = { }; + final String[] annotationsThatShouldExists_jdk8 = { + }; + // get all annotations Annotation[] annotations = this.scriptContextClass.getAnnotations(); // and transform the array into a list of annotation names @@ -974,7 +977,20 @@ for (Annotation annotation : annotations) { annotationsAsString.add(annotation.toString()); } - String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + + String[] annotationsThatShouldExists = null; + switch (getJavaVersion()) { + case 6: + annotationsThatShouldExists = annotationsThatShouldExists_jdk6; + break; + case 7: + annotationsThatShouldExists = annotationsThatShouldExists_jdk7; + break; + case 8: + annotationsThatShouldExists = annotationsThatShouldExists_jdk8; + break; + } + // check if all required annotations really exists for (String annotationThatShouldExists : annotationsThatShouldExists) { assertTrue(annotationsAsString.contains(annotationThatShouldExists), @@ -993,6 +1009,9 @@ final String[] annotationsThatShouldExists_jdk7 = { }; + final String[] annotationsThatShouldExists_jdk8 = { + }; + // get all annotations Annotation[] annotations = this.scriptContextClass.getDeclaredAnnotations(); // and transform the array into a list of annotation names @@ -1000,7 +1019,20 @@ for (Annotation annotation : annotations) { annotationsAsString.add(annotation.toString()); } - String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + + String[] annotationsThatShouldExists = null; + switch (getJavaVersion()) { + case 6: + annotationsThatShouldExists = annotationsThatShouldExists_jdk6; + break; + case 7: + annotationsThatShouldExists = annotationsThatShouldExists_jdk7; + break; + case 8: + annotationsThatShouldExists = annotationsThatShouldExists_jdk8; + break; + } + // check if all required annotations really exists for (String annotationThatShouldExists : annotationsThatShouldExists) { assertTrue(annotationsAsString.contains(annotationThatShouldExists), From bugzilla-daemon at icedtea.classpath.org Wed Jun 5 05:16:30 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 05 Jun 2013 12:16:30 +0000 Subject: [Bug 1471] New: Error: guarantee(error != (symbolOop)__null,"tag mismatch with resolution error table") Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1471 Bug ID: 1471 Summary: Error: guarantee(error != (symbolOop)__null,"tag mismatch with resolution error table") Classification: Unclassified Product: IcedTea Version: 6-1.8.13 Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: clement.bellot at exascale-computing.eu CC: unassigned at icedtea.classpath.org Created attachment 884 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=884&action=edit The error log. When debugging step by step an eclipse plugin, the attached error occurred. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130605/7af7c269/attachment.html From adomurad at redhat.com Wed Jun 5 07:34:40 2013 From: adomurad at redhat.com (Adam Domurad) Date: Wed, 05 Jun 2013 10:34:40 -0400 Subject: [rfc][icedtea-web] Fix wrongly placed object construction helpers in IcedTeaScriptablePluginObject Message-ID: <51AF4C80.4050609@redhat.com> Whoever wrote these static helpers switched up which class they are associated with -- it took me a while of being confused to notice it, too. This patch places the object creation helper methods in the right class. I added some more type safety too to prevent future confusion. No changelog yet, I'll wait for an ack on the patch first. Cheers, -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: IcedTeaScriptablePluginObject-fix-wrongly-placed-static-methods.patch Type: text/x-patch Size: 9587 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130605/c5e8b2f4/IcedTeaScriptablePluginObject-fix-wrongly-placed-static-methods.patch From bugzilla-daemon at icedtea.classpath.org Wed Jun 5 08:17:27 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 05 Jun 2013 15:17:27 +0000 Subject: [Bug 1062] JVM Crashes while image load using Java Advanced Imaging (JAI) library In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1062 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |WONTFIX --- Comment #1 from Andrew John Hughes --- This version is no longer supported. Please reopen if this bug can be replicated on 1.11.x or 1.12.x. -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130605/c58ca31e/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Jun 5 08:17:59 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 05 Jun 2013 15:17:59 +0000 Subject: [Bug 1064] hs_err_pid2132.log In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1064 --- Comment #1 from Andrew John Hughes --- How do you reproduce this error? -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130605/186398bc/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Jun 5 08:44:51 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 05 Jun 2013 15:44:51 +0000 Subject: [Bug 1473] New: javaws should not depend on name od local file Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1473 Bug ID: 1473 Summary: javaws should not depend on name od local file Classification: Unclassified Product: IcedTea-Web Version: unspecified Hardware: all OS: All Status: NEW Severity: major Priority: P3 Component: NetX (javaws) Assignee: jvanek at redhat.com Reporter: jvanek at redhat.com CC: omajid at redhat.com, unassigned at icedtea.classpath.org When user use firefox (or any other browser) to download an jnlp file like "open with" then (mostly) happens this : file save as correctName.jnlp, and javaws will take it and execute it. When this same happens next times, then file is saved as (not) correctName_someIdToMakeItUnique_.jnlp Then itw will crash because it tryes to download (from codebase) the file correctName_someIdToMakeItUnique_.jnlp - which do not exist. The fix should be easy - to ignore name of the file completely and use (extracted) value from href. Maybe there can be issue as we are redownlaoding jnlp in some strange way but I hope whit will not bean obstacle. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130605/85774b6a/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Jun 5 08:47:30 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 05 Jun 2013 15:47:30 +0000 Subject: [Bug 1473] javaws should not depend on name of local file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1473 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|javaws should not depend on |javaws should not depend on |name od local file |name of local file -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130605/bb28d41d/attachment.html From jvanek at redhat.com Wed Jun 5 09:02:49 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 05 Jun 2013 18:02:49 +0200 Subject: [rfc][icedtea-web] fix for RH947647, following the XDG basedir specification In-Reply-To: <1583560531.3709366.1370363147349.JavaMail.root@redhat.com> References: <519A756D.9030308@redhat.com> <519AD027.4050105@redhat.com> <519B5241.7010407@redhat.com> <1583560531.3709366.1370363147349.JavaMail.root@redhat.com> Message-ID: <51AF6129.2080502@redhat.com> ... >>> >> >> Yes. If users customize it, they will have to deal with the fallout. >> >> >>> - how about xdg not following systems (windows) ? Keep .icedtea or move to >>> ./config and ./cache ? >>> >> >> Hidden directories is not how Windows programs stores its profiles. You >> might consider following what glib helper functions do >> >> Refer to >> https://developer.gnome.org/glib/2.34/glib-Miscellaneous-Utility-Functions.html >> >> g_get_user_cache_dir() and so on >> > > I didn't realise glib supported this for so long (since 2.6). It seems like an > excellent solution to just use that. > Hm... Im' wondering how to use this function cleanly from java... I think that we should use the value of XDG variables or default ~/{.config .cache}/icedtea-web and _everywhere_. Even on systems like windows which do not support this. As if we do this difference now, possible change of filesytem structure for some far future icedtea-web x.y.z , will be quite complicated. J. From jvanek at redhat.com Wed Jun 5 10:52:20 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 05 Jun 2013 19:52:20 +0200 Subject: [rfc][icedtea-web] fix for PR1465 - java.io.FileNotFoundException while trying to download a JAR file In-Reply-To: <51AE4957.5020302@redhat.com> References: <51ADEC2B.3000202@redhat.com> <51AE48CA.6060102@redhat.com> <51AE4957.5020302@redhat.com> Message-ID: <51AF7AD4.7090604@redhat.com> On 06/04/2013 10:08 PM, Adam Domurad wrote: > On 06/04/2013 04:06 PM, Adam Domurad wrote: >> On 06/04/2013 09:31 AM, Jiri Vanek wrote: >>> Although not nice, not even bad. >>> >>> tbh this was known issue, and when sad was pushing his patch we decided to ignore %20 and + >>> similarity under html encoding, and difference under RFC2396. >>> Apearently, wrongly. >>> >>> J. >> >> I have done some research and I think I found a solution that should be pleasing. See the unit >> tests in the patch, too. >> >> Basically new URI(url) will check RFC2396 validity. >> See http://stackoverflow.com/questions/304806/encode-and-decode-rfc2396-urls >> >> This avoids the whole normalization mess if the URL is already valid. As long as we create URLs in >> a manner that ensures they are correct, this will be preserved. >> This should reduce the future chance of unintended icedtea-web quirks, too. >> >> Happy hacking, >> -Adam > > There was a bit of noise in the diff, so just reassuring that UrlUtils.normalizeUrl is intended to > be untouched other than the line > 'if (protocol == null || !shouldEncode || url.getPath() == null || isValidRFC2396Url(url)) {' > > Happy hacking, > -Adam Hi. Here is final version. I think you can go and push. Both head and 1.4 (or let it for me at morning CET) Before push - can you run "Spaces can be everywhere" reproducers set? (about 7tests...) It worked for me but there were some random(I hope..) failures, and I'm littlebit on doubts because of need of ResourceTrackerTest changes. Thanx for double checking and cooperation. J. -------------- next part -------------- A non-text attachment was scrubbed... Name: pr14XX.patch Type: text/x-patch Size: 6442 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130605/e253d3e4/pr14XX.patch From jvanek at redhat.com Wed Jun 5 10:56:21 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 05 Jun 2013 19:56:21 +0200 Subject: [fyi][icedtea-web] enabling testing on f19 again Message-ID: <51AF7BC5.1040502@redhat.com> Hi! There was some mysterious change in junit api. This small fix is fixing it,a nd should be harmelss for older. This will go also to 1.4 otherwise we will not be able to enable %check in spec. Also can possible reviewer try this (junit, codecoverage, reproducers(just one is enough:) and reproducers coverage targets) on some older then 19 fedora? I have run out of machines and have everywhere f19 right now:-/ Thanx! J. -------------- next part -------------- A non-text attachment was scrubbed... Name: unittestsOkForf19.patch Type: text/x-patch Size: 827 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130605/e2ece08d/unittestsOkForf19.patch From adomurad at icedtea.classpath.org Wed Jun 5 12:10:27 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Wed, 05 Jun 2013 19:10:27 +0000 Subject: /hg/icedtea-web: Fix PR1465 - java.io.FileNotFoundException whil... Message-ID: changeset 83e496086fea in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=83e496086fea author: Adam Domurad date: Wed Jun 05 15:12:01 2013 -0400 Fix PR1465 - java.io.FileNotFoundException while trying to download a JAR file diffstat: ChangeLog | 13 +++++ NEWS | 2 + netx/net/sourceforge/jnlp/util/UrlUtils.java | 15 +++++- tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java | 4 +- tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java | 26 +++++++++- 5 files changed, 56 insertions(+), 4 deletions(-) diffs (139 lines): diff -r f22262521491 -r 83e496086fea ChangeLog --- a/ChangeLog Tue Jun 04 17:35:53 2013 +0200 +++ b/ChangeLog Wed Jun 05 15:12:01 2013 -0400 @@ -1,3 +1,16 @@ +2013-06-05 Adam Domurad + + Fix PR1465 + * NEWS: Bug fix note + * netx/net/sourceforge/jnlp/util/UrlUtils.java + (isValidRFC2396Url): New, tests if valid URL by RFC2396 rules + (normalizeUrl): Don't normalize if valid by RFC2396 + * tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java: + Adapt which URLs we expect to change when normalizing URLs + * tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java: + (testIsValidRFC2396Url): New, tests isValidRFC2396Url + (testNormalizeUrl): Add new test with valid RFC2396 URL + 2013-06-04 Jiri Vanek * netx/net/sourceforge/jnlp/resources/Messages.properties: diff -r f22262521491 -r 83e496086fea NEWS --- a/NEWS Tue Jun 04 17:35:53 2013 +0200 +++ b/NEWS Wed Jun 05 15:12:01 2013 -0400 @@ -9,6 +9,8 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY New in release 1.5 (2013-XX-XX): +* NetX + - PR1465 - java.io.FileNotFoundException while trying to download a JAR file * Plugin - PR854: Resizing an applet several times causes 100% CPU load diff -r f22262521491 -r 83e496086fea netx/net/sourceforge/jnlp/util/UrlUtils.java --- a/netx/net/sourceforge/jnlp/util/UrlUtils.java Tue Jun 04 17:35:53 2013 +0200 +++ b/netx/net/sourceforge/jnlp/util/UrlUtils.java Wed Jun 05 15:12:01 2013 -0400 @@ -86,16 +86,29 @@ } } + /* Use the URI syntax check of 'toURI' to see if it matches RFC2396. + * See http://www.ietf.org/rfc/rfc2396.txt */ + public static boolean isValidRFC2396Url(URL url) { + try { + url.toURI(); + return true; + } catch (URISyntaxException e) { + return false; + } + } + /* Ensure a URL is properly percent-encoded. * Certain usages require local-file URLs to be encoded, eg for code-base & document-base. */ public static URL normalizeUrl(URL url, boolean encodeFileUrls) throws MalformedURLException, UnsupportedEncodingException, URISyntaxException { if (url == null) { return null; } + String protocol = url.getProtocol(); boolean shouldEncode = (encodeFileUrls || !"file".equals(protocol)); - if (protocol == null || !shouldEncode || url.getPath() == null) { + // PR1465: We should not call 'URLDecoder.decode' on RFC2396-compliant URLs + if (protocol == null || !shouldEncode || url.getPath() == null || isValidRFC2396Url(url)) { return url; } diff -r f22262521491 -r 83e496086fea tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java --- a/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java Tue Jun 04 17:35:53 2013 +0200 +++ b/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java Wed Jun 05 15:12:01 2013 -0400 @@ -80,7 +80,7 @@ Assert.assertFalse("url " + i + " must be normalized (and so not equals) too normalized url " + i, u[i].equals(n[i])); } } - public static final int CHANGE_BORDER = 6; + public static final int CHANGE_BORDER = 8; public static URL[] getUrls() throws MalformedURLException { URL[] u = { @@ -91,9 +91,9 @@ new URL("http:///SpacesCanBeEverywhere1.jnlp"), new URL("file://localhost/home/jvanek/Desktop/icedtea-web/tests.build/jnlp_test_server/Spaces can be everywhere2.jnlp"), new URL("http://localhost:44321/testpage.jnlp?applicationID=25"), - /*changing*/ new URL("http://localhost:44321/Spaces%20Can%20Be%20Everyw%2Fhere1.jnlp"), new URL("http://localhost/Spaces+Can+Be+Everywhere1.jnlp"), + /*changing*/ new URL("http://localhost/SpacesC anBeEverywhere1.jnlp?a=5&b=10#df"), new URL("http:///oook.jnlp?a=5&b=ahoj ???? dd#df"), new URL("http://localhost/Spaces?????????????????????? can !@^*(){}[].jnlp?a=5&ahoj ???? dd#df"), diff -r f22262521491 -r 83e496086fea tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java --- a/tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java Tue Jun 04 17:35:53 2013 +0200 +++ b/tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java Wed Jun 05 15:12:01 2013 -0400 @@ -39,8 +39,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.io.File; +import java.net.MalformedURLException; +import java.net.URISyntaxException; import java.net.URL; import org.junit.Test; @@ -95,6 +98,27 @@ // Test file URL with file URL encoding turned on assertEquals("file://example/%20test", UrlUtils.normalizeUrl(new URL("file://example/ test"), true).toString()); + + // PR1465: Test that RFC2396-compliant URLs are not touched + // Example taken from bug report: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1465 + String rfc2396Valid = "https://example.com/,DSID=64c19c5b657df383835706571a7c7216,DanaInfo=example.com,CT=java+JICAComponents/JICA-sicaN.jar"; + assertEquals(rfc2396Valid, + UrlUtils.normalizeUrl(new URL(rfc2396Valid)).toString()); + } + + @Test + public void testIsValidRFC2396Url() throws Exception { + String rfc2396Valid = "https://example.com/,foo=bar+baz/JICA-sicaN.jar"; + assertTrue(UrlUtils.isValidRFC2396Url(new URL(rfc2396Valid))); + + // These should invalidate the URL + // See http://www.ietf.org/rfc/rfc2396.txt (2.4.3. Excluded US-ASCII Characters) + char[] invalidCharacters = {'<', '>', '%', '"', }; + for (char chr : invalidCharacters) { + assertFalse("validation failed with '" + chr + "'",UrlUtils.isValidRFC2396Url(new URL(rfc2396Valid + chr))); + } + //special test for space inisde. Space at the end can be trimmed + assertFalse("validation failed with '" + ' ' + "'",UrlUtils.isValidRFC2396Url(new URL("https://example.com/,foo=bar+ba z/JICA-sicaN.jar"))); } @Test @@ -116,4 +140,4 @@ assertEquals(testFile, UrlUtils.decodeUrlAsFile(encodedUrl)); } } -} \ No newline at end of file +} From bugzilla-daemon at icedtea.classpath.org Wed Jun 5 12:10:37 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 05 Jun 2013 19:10:37 +0000 Subject: [Bug 1465] java.io.FileNotFoundException while trying to download a JAR file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1465 --- Comment #10 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea-web?cmd=changeset;node=83e496086fea author: Adam Domurad date: Wed Jun 05 15:12:01 2013 -0400 Fix PR1465 - java.io.FileNotFoundException while trying to download a JAR file -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130605/4f43e252/attachment.html From adomurad at redhat.com Wed Jun 5 12:49:51 2013 From: adomurad at redhat.com (Adam Domurad) Date: Wed, 05 Jun 2013 15:49:51 -0400 Subject: [rfc][icedtea-web] Fix wrongly placed object construction helpers in IcedTeaScriptablePluginObject In-Reply-To: <51AF9629.5070506@redhat.com> References: <51AF4C80.4050609@redhat.com> <51AF9629.5070506@redhat.com> Message-ID: <51AF965F.8050602@redhat.com> On 06/05/2013 03:48 PM, Adam Domurad wrote: > On 06/05/2013 10:34 AM, Adam Domurad wrote: >> Whoever wrote these static helpers switched up which class they are >> associated with -- it took me a while of being confused to notice it, >> too. This patch places the object creation helper methods in the >> right class. >> I added some more type safety too to prevent future confusion. >> >> No changelog yet, I'll wait for an ack on the patch first. >> >> Cheers, >> -Adam > > Here is additional refactoring on top of this patch and the > '[rfc][icedtea-web] More testing for IcedTeaScriptablePluginObject.cc > + memory leak fixes' fix patch. This stuff is necessary cleanup in my > opinion; this code has been neglected. > > Again changelog waiting for ack, I recommend using a tool like eg meld > to look at the differences here. They are all safe and minor IMO. > The reason for touching this code is to try to make the 'getvalue' > npapi call non-blocking, so it will never hang firefox. To clarify, the reason for the refactoring is to make way for a nicer patch for this. This patch does not accomplish it yet. > > Cheers, > -Adam From adomurad at redhat.com Wed Jun 5 12:55:09 2013 From: adomurad at redhat.com (Adam Domurad) Date: Wed, 05 Jun 2013 15:55:09 -0400 Subject: [rfc][icedtea-web] Fix wrongly placed object construction helpers in IcedTeaScriptablePluginObject In-Reply-To: <51AF965F.8050602@redhat.com> References: <51AF4C80.4050609@redhat.com> <51AF9629.5070506@redhat.com> <51AF965F.8050602@redhat.com> Message-ID: <51AF979D.9070502@redhat.com> On 06/05/2013 03:49 PM, Adam Domurad wrote: > On 06/05/2013 03:48 PM, Adam Domurad wrote: >> On 06/05/2013 10:34 AM, Adam Domurad wrote: >>> Whoever wrote these static helpers switched up which class they are >>> associated with -- it took me a while of being confused to notice >>> it, too. This patch places the object creation helper methods in the >>> right class. >>> I added some more type safety too to prevent future confusion. >>> >>> No changelog yet, I'll wait for an ack on the patch first. >>> >>> Cheers, >>> -Adam >> >> Here is additional refactoring on top of this patch and the >> '[rfc][icedtea-web] More testing for IcedTeaScriptablePluginObject.cc >> + memory leak fixes' fix patch. This stuff is necessary cleanup in my >> opinion; this code has been neglected. >> >> Again changelog waiting for ack, I recommend using a tool like eg >> meld to look at the differences here. They are all safe and minor IMO. >> The reason for touching this code is to try to make the 'getvalue' >> npapi call non-blocking, so it will never hang firefox. > > To clarify, the reason for the refactoring is to make way for a nicer > patch for this. This patch does not accomplish it yet. > Ugh, forgot the patch as well in my hurry, here it is. >> >> Cheers, >> -Adam > -------------- next part -------------- A non-text attachment was scrubbed... Name: refactor-icedteascriptable.patch Type: text/x-patch Size: 17823 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130605/2289d5ea/refactor-icedteascriptable.patch From andrew at icedtea.classpath.org Wed Jun 5 12:59:46 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 05 Jun 2013 19:59:46 +0000 Subject: /hg/icedtea7: PR1170: Ensure unlimited crypto policy is in place. Message-ID: changeset 080f4776a2f8 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=080f4776a2f8 author: Andrew John Hughes date: Wed Jun 05 20:59:33 2013 +0100 PR1170: Ensure unlimited crypto policy is in place. 2013-06-05 Andrew John Hughes PR1170: Ensure unlimited crypto policy is in place. * Makefile.am: (CRYPTO_CHECK_BUILD_DIR): New variable. (EXTRA_DIST): Add TestCryptoLevel.java (.PHONY): Add new clean targets. (check-crypto): Run the crypto checker on a normal stage 2 build. (clean-check-crypto): Delete the check-crypto stamp. (check-crypto-debug): Run the crypto checker on a debug stage 2 build. (clean-check-crypto-debug): Delete the check-crypto-debug stamp. (icedtea-stage2): Depend on check-crypto. (clean-icedtea-stage2): Depend on clean-check-crypto. (icedtea-debug-stage2): Depend on check-crypto-debug. (clean-icedtea-debug-stage2): Depend on clean-check-crypto-debug. (check-crypto-boot): Run the crypto checker on the stage 1 build. (clean-check-crypto-boot): Delete the check-crypto-boot stamp. (icedtea-stage1): Depend on check-crypto-boot. (clean-icedtea-stage1): Depend on clean-check-crypto-boot. (cryptocheck): Build the crypto checker. (clean-cryptocheck): Revert cryptocheck. * NEWS: Updated. * TestCryptoLevel.java: Checks whether the unlimited crypto policy is in place or not. diffstat: ChangeLog | 33 ++++++++++++++++++++++ Makefile.am | 75 +++++++++++++++++++++++++++++++++++++++++++------ NEWS | 1 + TestCryptoLevel.java | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 177 insertions(+), 10 deletions(-) diffs (293 lines): diff -r 02bbff3d71ff -r 080f4776a2f8 ChangeLog --- a/ChangeLog Thu May 23 11:26:52 2013 +0100 +++ b/ChangeLog Wed Jun 05 20:59:33 2013 +0100 @@ -1,3 +1,36 @@ +2013-06-05 Andrew John Hughes + + PR1170: Ensure unlimited crypto policy is in place. + * Makefile.am: + (CRYPTO_CHECK_BUILD_DIR): New variable. + (EXTRA_DIST): Add TestCryptoLevel.java + (.PHONY): Add new clean targets. + (check-crypto): Run the crypto checker on a normal + stage 2 build. + (clean-check-crypto): Delete the check-crypto stamp. + (check-crypto-debug): Run the crypto checker on a + debug stage 2 build. + (clean-check-crypto-debug): Delete the + check-crypto-debug stamp. + (icedtea-stage2): Depend on check-crypto. + (clean-icedtea-stage2): Depend on clean-check-crypto. + (icedtea-debug-stage2): Depend on check-crypto-debug. + (clean-icedtea-debug-stage2): Depend on + clean-check-crypto-debug. + (check-crypto-boot): Run the crypto checker on + the stage 1 build. + (clean-check-crypto-boot): Delete the + check-crypto-boot stamp. + (icedtea-stage1): Depend on check-crypto-boot. + (clean-icedtea-stage1): Depend on + clean-check-crypto-boot. + (cryptocheck): Build the crypto checker. + (clean-cryptocheck): Revert cryptocheck. + * NEWS: Updated. + * TestCryptoLevel.java: + Checks whether the unlimited crypto policy is in + place or not. + 2013-05-23 Andrew John Hughes * NEWS: Update with fixes brought in by latest diff -r 02bbff3d71ff -r 080f4776a2f8 Makefile.am --- a/Makefile.am Thu May 23 11:26:52 2013 +0100 +++ b/Makefile.am Wed Jun 05 20:59:33 2013 +0100 @@ -66,6 +66,7 @@ STAGE1_BOOT_DIR = $(abs_top_builddir)/bootstrap/boot STAGE2_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea JAMVM_IMPORT_PATH = $(abs_top_builddir)/jamvm/install/hotspot +CRYPTO_CHECK_BUILD_DIR = $(abs_top_builddir)/cryptocheck.build # Source directories @@ -251,6 +252,7 @@ # Sources list REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java +CRYPTO_CHECK_SRCS = $(top_srcdir)/TestCryptoLevel.java # Patch list @@ -774,7 +776,8 @@ scripts/jni_desc \ rewriter/agpl-3.0.txt \ $(REWRITER_SRCS) \ - THANKYOU test/tapset + THANKYOU test/tapset \ + $(CRYPTO_CHECK_SRCS) # Top-Level Targets # ================= @@ -831,7 +834,8 @@ clean-tests clean-tapset-report clean-add-systemtap \ clean-add-systemtap-debug clean-add-pulseaudio clean-add-pulseaudio-debug \ clean-add-nss clean-add-tzdata-support clean-add-tzdata-support-debug \ - clean-add-systemtap-boot clean-add-pulseaudio-boot clean-add-tzdata-support-boot + clean-add-systemtap-boot clean-add-pulseaudio-boot clean-add-tzdata-support-boot \ + clean-check-crypto clean-check-crypto-debug clean-check-crypto-boot env: @echo 'unset JAVA_HOME' @@ -1802,6 +1806,16 @@ fi rm -f stamps/add-tzdata-support.stamp +stamps/check-crypto.stamp: stamps/cryptocheck.stamp + if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ + fi + mkdir -p stamps + touch $@ + +clean-check-crypto: + rm -f stamps/check-crypto.stamp + stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \ stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \ stamps/cacao.stamp stamps/rewrite-rhino.stamp stamps/jamvm.stamp @@ -1904,23 +1918,33 @@ fi rm -f stamps/add-tzdata-support-debug.stamp -stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \ - stamps/add-zero.stamp stamps/add-jamvm.stamp stamps/add-systemtap.stamp \ - stamps/add-pulseaudio.stamp stamps/add-tzdata-support.stamp +stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp + if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ + fi mkdir -p stamps touch $@ -clean-icedtea-stage2: clean-add-jamvm +clean-check-crypto-debug: + rm -f stamps/check-crypto-debug.stamp + +stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \ + stamps/add-zero.stamp stamps/add-jamvm.stamp stamps/add-systemtap.stamp \ + stamps/add-pulseaudio.stamp stamps/add-tzdata-support.stamp stamps/check-crypto.stamp + mkdir -p stamps + touch $@ + +clean-icedtea-stage2: clean-add-jamvm clean-check-crypto rm -f stamps/icedtea-stage2.stamp stamps/icedtea-debug-stage2.stamp: stamps/icedtea-debug.stamp \ stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp stamps/add-jamvm-debug.stamp \ stamps/add-systemtap-debug.stamp stamps/add-pulseaudio-debug.stamp \ - stamps/add/tzdata-support-debug.stamp + stamps/add/tzdata-support-debug.stamp stamps/check-crypto-debug.stamp mkdir -p stamps touch $@ -clean-icedtea-debug-stage2: clean-add-jamvm-debug +clean-icedtea-debug-stage2: clean-add-jamvm-debug clean-check-crypto-debug rm -f stamps/icedtea-debug-stage2.stamp # OpenJDK boot Targets @@ -2012,14 +2036,24 @@ fi rm -f stamps/add-tzdata-support-boot.stamp +stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp + if [ -e $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \ + $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ + fi + mkdir -p stamps + touch $@ + +clean-check-crypto-boot: + rm -f stamps/check-crypto-boot.stamp + stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp \ stamps/add-systemtap-boot.stamp stamps/add-pulseaudio-boot.stamp \ - stamps/add-tzdata-support-boot.stamp + stamps/add-tzdata-support-boot.stamp stamps/check-crypto-boot.stamp mkdir -p stamps touch $@ clean-icedtea-stage1: clean-add-systemtap-boot clean-add-pulseaudio-boot \ - clean-add-tzdata-support-boot + clean-add-tzdata-support-boot clean-check-crypto-boot rm -f stamps/icedtea-stage1.stamp # Rebuild targets @@ -2582,6 +2616,19 @@ cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(STAGE1_BOOT_DIR)/jre/lib ; \ fi +# Crypto Level Check + +stamps/cryptocheck.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) + mkdir -p $(CRYPTO_CHECK_BUILD_DIR) + $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ + -d $(CRYPTO_CHECK_BUILD_DIR) $(CRYPTO_CHECK_SRCS) + mkdir -p stamps + touch $@ + +clean-cryptocheck: + rm -rf $(CRYPTO_CHECK_BUILD_DIR) + rm -f stamps/cryptocheck.stamp + # Target Aliases # =============== @@ -2615,8 +2662,16 @@ cacao: stamps/cacao.stamp +check-crypto: stamps/check-crypto.stamp + +check-crypto-boot: stamps/check-crypto-boot.stamp + +check-crypto-debug: stamps/check-crypto-debug.stamp + clone-boot: stamps/clone-boot.stamp +cryptocheck: stamps/cryptocheck.stamp + download: stamps/download.stamp download-cacao: stamps/download-cacao.stamp diff -r 02bbff3d71ff -r 080f4776a2f8 NEWS --- a/NEWS Thu May 23 11:26:52 2013 +0100 +++ b/NEWS Wed Jun 05 20:59:33 2013 +0100 @@ -809,6 +809,7 @@ - Include defs.make in buildtree.make so ZERO_BUILD is recognised and JVM_VARIANT_ZERO set. - Make sure libffi cflags and libs are used. - PR1378: Add AArch64 support to Zero + - PR1170: Ensure unlimited crypto policy is in place. * CACAO - src/vm/jit/x86_64/asmpart.S (asm_abstractmethoderror): Keep stack aligned. - src/native/jni.cpp (GetObjectClass): Remove null pointer check. diff -r 02bbff3d71ff -r 080f4776a2f8 TestCryptoLevel.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/TestCryptoLevel.java Wed Jun 05 20:59:33 2013 +0100 @@ -0,0 +1,78 @@ +/* TestCryptoLevel -- Ensure unlimited crypto policy is in use. + Copyright (C) 2012 Red Hat, Inc. + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. + +This program 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 Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . +*/ + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.InvocationTargetException; + +import java.security.Permission; +import java.security.PermissionCollection; + +public class TestCryptoLevel +{ + public static void main(String[] args) + throws NoSuchFieldException, ClassNotFoundException, + IllegalAccessException, InvocationTargetException + { + Class cls = null; + Method def = null, exempt = null; + + try + { + cls = Class.forName("javax.crypto.JceSecurity"); + } + catch (ClassNotFoundException ex) + { + System.err.println("Running a non-Sun JDK."); + System.exit(0); + } + catch (ExceptionInInitializerError err) + { + System.err.println("Failed to initialise JceSecurity: " + + err.getCause().getCause().getMessage()); + System.exit(-2); + } + try + { + def = cls.getDeclaredMethod("getDefaultPolicy"); + exempt = cls.getDeclaredMethod("getExemptPolicy"); + } + catch (NoSuchMethodException ex) + { + System.err.println("Running IcedTea with the original crypto patch."); + System.exit(0); + } + def.setAccessible(true); + exempt.setAccessible(true); + PermissionCollection defPerms = (PermissionCollection) def.invoke(null); + PermissionCollection exemptPerms = (PermissionCollection) exempt.invoke(null); + Class apCls = Class.forName("javax.crypto.CryptoAllPermission"); + Field apField = apCls.getDeclaredField("INSTANCE"); + apField.setAccessible(true); + Permission allPerms = (Permission) apField.get(null); + if (defPerms.implies(allPerms) && (exemptPerms == null || exemptPerms.implies(allPerms))) + { + System.err.println("Running with the unlimited policy."); + System.exit(0); + } + else + { + System.err.println("WARNING: Running with a restricted crypto policy."); + System.exit(-1); + } + } +} From adomurad at redhat.com Wed Jun 5 12:48:57 2013 From: adomurad at redhat.com (Adam Domurad) Date: Wed, 05 Jun 2013 15:48:57 -0400 Subject: [rfc][icedtea-web] Fix wrongly placed object construction helpers in IcedTeaScriptablePluginObject In-Reply-To: <51AF4C80.4050609@redhat.com> References: <51AF4C80.4050609@redhat.com> Message-ID: <51AF9629.5070506@redhat.com> On 06/05/2013 10:34 AM, Adam Domurad wrote: > Whoever wrote these static helpers switched up which class they are > associated with -- it took me a while of being confused to notice it, > too. This patch places the object creation helper methods in the right > class. > I added some more type safety too to prevent future confusion. > > No changelog yet, I'll wait for an ack on the patch first. > > Cheers, > -Adam Here is additional refactoring on top of this patch and the '[rfc][icedtea-web] More testing for IcedTeaScriptablePluginObject.cc + memory leak fixes' fix patch. This stuff is necessary cleanup in my opinion; this code has been neglected. Again changelog waiting for ack, I recommend using a tool like eg meld to look at the differences here. They are all safe and minor IMO. The reason for touching this code is to try to make the 'getvalue' npapi call non-blocking, so it will never hang firefox. Cheers, -Adam From bugzilla-daemon at icedtea.classpath.org Wed Jun 5 14:30:54 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 05 Jun 2013 21:30:54 +0000 Subject: [Bug 1474] New: Can't get javaws to use SOCKS proxy Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1474 Bug ID: 1474 Summary: Can't get javaws to use SOCKS proxy Classification: Unclassified Product: IcedTea-Web Version: 1.4 Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P3 Component: NetX (javaws) Assignee: omajid at redhat.com Reporter: silvrax at gmail.com CC: unassigned at icedtea.classpath.org I've been trying to load a web start application using a SOCKS proxy. The proxy is provided using ssh -D option, so there is only a SOCKS proxy, at localhost:8989. I've been saving the jnlp locally and then running javaws from the command line. I've used itweb-settings to configure the proxy. First, I've only configured the SOCKS proxy, which results in this ~/.icedtea/deployment.properties: deployment.proxy.socks.port=8989 deployment.proxy.socks.host=localhost deployment.proxy.type=1 deployment.security.level=ASK_UNSIGNED I've also tried checking the "Use this proxy for all protocols" check-box, which results in: deployment.proxy.socks.port=8989 deployment.proxy.same=true deployment.proxy.socks.host=localhost deployment.proxy.type=1 deployment.security.level=ASK_UNSIGNED In both of these cases I see this exception when it tries to download the first file: Status: CONNECTING DOWNLOAD STARTED +(CONNECTING) -(CONNECT) @ /images/logo.gif All possible urls for location=https://10.10.0.1:443/images/logo.gif state=CONNECTING DOWNLOAD STARTED : [https://10.10.0.1:443/images/logo.gif, https://10.10.0.1:443/images/logo.gif] Selecting proxy for: https://10.10.0.1:443/images/logo.gif java.lang.RuntimeException: java.lang.IllegalArgumentException: hostname can't be null at sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1241) at sun.net.www.protocol.http.HttpURLConnection.getHeaderField(HttpURLConnection.java:2713) at java.net.HttpURLConnection.getResponseCode(HttpURLConnection.java:477) at sun.net.www.protocol.https.HttpsURLConnectionImpl.getResponseCode(HttpsURLConnectionImpl.java:338) at net.sourceforge.jnlp.cache.ResourceTracker.getUrlResponseCode(ResourceTracker.java:872) at net.sourceforge.jnlp.cache.ResourceTracker.findBestUrl(ResourceTracker.java:911) at net.sourceforge.jnlp.cache.ResourceTracker.initializeResource(ResourceTracker.java:789) at net.sourceforge.jnlp.cache.ResourceTracker.processResource(ResourceTracker.java:624) at net.sourceforge.jnlp.cache.ResourceTracker.access$500(ResourceTracker.java:76) at net.sourceforge.jnlp.cache.ResourceTracker$Downloader$1.run(ResourceTracker.java:1172) at net.sourceforge.jnlp.cache.ResourceTracker$Downloader$1.run(ResourceTracker.java:1170) at java.security.AccessController.doPrivileged(Native Method) at net.sourceforge.jnlp.cache.ResourceTracker$Downloader.run(ResourceTracker.java:1170) at java.lang.Thread.run(Thread.java:722) Caused by: java.lang.IllegalArgumentException: hostname can't be null at java.net.InetSocketAddress.checkHost(InetSocketAddress.java:149) at java.net.InetSocketAddress.(InetSocketAddress.java:216) at net.sourceforge.jnlp.runtime.JNLPProxySelector.getFromConfiguration(JNLPProxySelector.java:306) at net.sourceforge.jnlp.runtime.JNLPProxySelector.select(JNLPProxySelector.java:202) at sun.net.www.protocol.http.HttpURLConnection.plainConnect(HttpURLConnection.java:925) at sun.net.www.protocol.https.AbstractDelegateHttpsURLConnection.connect(AbstractDelegateHttpsURLConnection.java:177) at sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1299) at java.net.HttpURLConnection.getResponseCode(HttpURLConnection.java:468) ... 11 more So, it looks like in this it's just not grokking my proxy configuration. I also tried filling in localhost:8989 for the http(s) protocols, which resulted in this configuration file: deployment.proxy.https.host=localhost deployment.proxy.http.host=localhost deployment.proxy.socks.port=8989 deployment.proxy.socks.host=localhost deployment.proxy.https.port=8989 deployment.proxy.type=1 deployment.proxy.http.port=8989 deployment.security.level=ASK_UNSIGNED In this case I got the following exception: Status: CONNECTING DOWNLOAD STARTED +(CONNECTING) -(CONNECT) @ /images/logo.gif All possible urls for location=https://10.10.0.1:443/images/logo.gif state=CONNECTING DOWNLOAD STARTED : [https://10.10.0.1:443/images/logo.gif, https://10.10.0.1:443/images/logo.gif] Selecting proxy for: https://10.10.0.1:443/images/logo.gif Selected proxies: [HTTP @ localhost/127.0.0.1:8989] While processing https://10.10.0.1:443/images/logo.gif by HEAD for resource location=https://10.10.0.1:443/images/logo.gif state=CONNECTING DOWNLOAD STARTED got java.net.SocketException: Unexpected end of file from server: java.net.SocketException: Unexpected end of file from server at sun.net.www.http.HttpClient.parseHTTPHeader(HttpClient.java:718) at sun.net.www.http.HttpClient.parseHTTP(HttpClient.java:579) at sun.net.www.protocol.http.HttpURLConnection.doTunneling(HttpURLConnection.java:1788) at sun.net.www.protocol.https.AbstractDelegateHttpsURLConnection.connect(AbstractDelegateHttpsURLConnection.java:183) at sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1299) at java.net.HttpURLConnection.getResponseCode(HttpURLConnection.java:468) at sun.net.www.protocol.https.HttpsURLConnectionImpl.getResponseCode(HttpsURLConnectionImpl.java:338) at net.sourceforge.jnlp.cache.ResourceTracker.getUrlResponseCode(ResourceTracker.java:872) at net.sourceforge.jnlp.cache.ResourceTracker.findBestUrl(ResourceTracker.java:911) at net.sourceforge.jnlp.cache.ResourceTracker.initializeResource(ResourceTracker.java:789) at net.sourceforge.jnlp.cache.ResourceTracker.processResource(ResourceTracker.java:624) at net.sourceforge.jnlp.cache.ResourceTracker.access$500(ResourceTracker.java:76) at net.sourceforge.jnlp.cache.ResourceTracker$Downloader$1.run(ResourceTracker.java:1172) at net.sourceforge.jnlp.cache.ResourceTracker$Downloader$1.run(ResourceTracker.java:1170) at java.security.AccessController.doPrivileged(Native Method) at net.sourceforge.jnlp.cache.ResourceTracker$Downloader.run(ResourceTracker.java:1170) at java.lang.Thread.run(Thread.java:722) To me that seems to indicate that it is now trying to use the proxy, but my guess is it's not using the SOCKS protocol to talk to it? -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130605/f15b4832/attachment.html From andrew at icedtea.classpath.org Wed Jun 5 15:03:08 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 05 Jun 2013 22:03:08 +0000 Subject: /hg/icedtea7: 2 new changesets Message-ID: changeset 609b5317bd98 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=609b5317bd98 author: Andrew John Hughes date: Wed Jun 05 22:56:36 2013 +0100 RH513605, PR1280: Updating/Installing OpenJDK should recreate the shared class-data archive 2013-06-05 Andrew John Hughes PR1280: Updating/Installing OpenJDK should recreate the shared class-data archive * Makefile.am: (.PHONY): Add clean-add-archive, clean-add-archive-debug and clean-add-archive-boot. 2013-02-08 Andrew John Hughes PR1301: PR1171 causes Zero builds to fail * Makefile.am: (add-archive): Don't run -Xshare:dump if building Zero. (add-archive-debug): Likewise. (add-archive-boot): Likewise. 2013-01-25 Andrew John Hughes * Makefile.am: (clean-add-archive): Delete the archive. (clean-add-archive-debug): Likewise for debug. (clean-add-archive-boot): Likewise for bootstrap. 2012-11-28 Andrew John Hughes * Makefile.am: (add-archive): Only run -Xshare:dump when java exists and we aren't building CACAO or JamVM. (add-archive-debug): Likewise. (add-archive-boot): Likewise. 2012-11-20 Andrew John Hughes RH513605: Updating/Installing OpenJDK should recreate the shared class-data archive * Makefile.am: (add-archive): Run -Xshare:dump on the newly built JDK. (clean-add-archive): Delete stamp. (add-archive-debug): Same as add-archive for icedtea-debug. (clean-add-archive-debug): Same as clean-add-archive for icedtea-debug. (icedtea-stage2): Depend on add-archive. (clean-icedtea-stage2): Depend on clean-add-archive. (icedtea-debug-stage2): Depend on add-archive-debug. (clean-icedtea-debug-stage2): Depend on clean-add-archive-debug. (add-archive-boot): Same as add-archive for icedtea-boot. (clean-add-archive-boot): Same as clean-add-archive for icedtea-boot. (icedtea-stage1): Depend on add-archive-boot. (clean-icedtea-stage1): Depend on clean-add-archive-boot. * NEWS: Mention. changeset bfcb188e2568 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=bfcb188e2568 author: Andrew John Hughes date: Wed Jun 05 23:01:32 2013 +0100 Make clean-crypto targets depend on JDK being built. 2013-06-05 Andrew John Hughes * Makefile.am: (check-crypto): Depend on icedtea.stamp. (add-archive): Move into correct position in file. (clean-add-archive): Likewise. (check-crypto-debug): Depend on icedtea-debug.stamp. (clean-crypto-boot): Depend on icedtea-boot.stamp. diffstat: ChangeLog | 60 ++++++++++++++++++++++++++++++++++++++++++++++ Makefile.am | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++------- NEWS | 1 + 3 files changed, 130 insertions(+), 10 deletions(-) diffs (235 lines): diff -r 080f4776a2f8 -r bfcb188e2568 ChangeLog --- a/ChangeLog Wed Jun 05 20:59:33 2013 +0100 +++ b/ChangeLog Wed Jun 05 23:01:32 2013 +0100 @@ -1,3 +1,63 @@ +2013-06-05 Andrew John Hughes + + * Makefile.am: + (check-crypto): Depend on icedtea.stamp. + (add-archive): Move into correct position in file. + (clean-add-archive): Likewise. + (check-crypto-debug): Depend on icedtea-debug.stamp. + (clean-crypto-boot): Depend on icedtea-boot.stamp. + +2013-06-05 Andrew John Hughes + + PR1280: Updating/Installing OpenJDK should recreate the + shared class-data archive + * Makefile.am: + (.PHONY): Add clean-add-archive, clean-add-archive-debug + and clean-add-archive-boot. + +2013-02-08 Andrew John Hughes + + PR1301: PR1171 causes Zero builds to fail + * Makefile.am: + (add-archive): Don't run -Xshare:dump if building + Zero. + (add-archive-debug): Likewise. + (add-archive-boot): Likewise. + +2013-01-25 Andrew John Hughes + + * Makefile.am: + (clean-add-archive): Delete the archive. + (clean-add-archive-debug): Likewise for debug. + (clean-add-archive-boot): Likewise for bootstrap. + +2012-11-28 Andrew John Hughes + + * Makefile.am: + (add-archive): Only run -Xshare:dump when java + exists and we aren't building CACAO or JamVM. + (add-archive-debug): Likewise. + (add-archive-boot): Likewise. + +2012-11-20 Andrew John Hughes + + RH513605: Updating/Installing OpenJDK should recreate + the shared class-data archive + * Makefile.am: + (add-archive): Run -Xshare:dump on the newly built JDK. + (clean-add-archive): Delete stamp. + (add-archive-debug): Same as add-archive for icedtea-debug. + (clean-add-archive-debug): Same as clean-add-archive for icedtea-debug. + (icedtea-stage2): Depend on add-archive. + (clean-icedtea-stage2): Depend on clean-add-archive. + (icedtea-debug-stage2): Depend on add-archive-debug. + (clean-icedtea-debug-stage2): Depend on clean-add-archive-debug. + (add-archive-boot): Same as add-archive for icedtea-boot. + (clean-add-archive-boot): Same as clean-add-archive for icedtea-boot. + (icedtea-stage1): Depend on add-archive-boot. + (clean-icedtea-stage1): Depend on clean-add-archive-boot. + * NEWS: Mention. + 2013-06-05 Andrew John Hughes PR1170: Ensure unlimited crypto policy is in place. diff -r 080f4776a2f8 -r bfcb188e2568 Makefile.am --- a/Makefile.am Wed Jun 05 20:59:33 2013 +0100 +++ b/Makefile.am Wed Jun 05 23:01:32 2013 +0100 @@ -835,7 +835,8 @@ clean-add-systemtap-debug clean-add-pulseaudio clean-add-pulseaudio-debug \ clean-add-nss clean-add-tzdata-support clean-add-tzdata-support-debug \ clean-add-systemtap-boot clean-add-pulseaudio-boot clean-add-tzdata-support-boot \ - clean-check-crypto clean-check-crypto-debug clean-check-crypto-boot + clean-check-crypto clean-check-crypto-debug clean-check-crypto-boot \ + clean-add-archive clean-add-archive-debug clean-add-archive-boot env: @echo 'unset JAVA_HOME' @@ -1806,7 +1807,7 @@ fi rm -f stamps/add-tzdata-support.stamp -stamps/check-crypto.stamp: stamps/cryptocheck.stamp +stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/icedtea.stamp if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \ $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ fi @@ -1816,6 +1817,22 @@ clean-check-crypto: rm -f stamps/check-crypto.stamp +stamps/add-archive.stamp: stamps/icedtea.stamp +if !ENABLE_JAMVM +if !ENABLE_CACAO +if !ZERO_BUILD + if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \ + fi +endif +endif +endif + touch stamps/add-archive.stamp + +clean-add-archive: + rm -vf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa + rm -f stamps/add-archive.stamp + stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \ stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \ stamps/cacao.stamp stamps/rewrite-rhino.stamp stamps/jamvm.stamp @@ -1918,7 +1935,7 @@ fi rm -f stamps/add-tzdata-support-debug.stamp -stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp +stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp stamps/icedtea-debug.stamp if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ fi @@ -1928,23 +1945,42 @@ clean-check-crypto-debug: rm -f stamps/check-crypto-debug.stamp +stamps/add-archive-debug.stamp: stamps/icedtea-debug.stamp +if !ENABLE_JAMVM +if !ENABLE_CACAO +if !ZERO_BUILD + if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \ + fi +endif +endif +endif + touch stamps/add-archive-debug.stamp + +clean-add-archive-debug: + rm -vf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa + rm -f stamps/add-archive-debug.stamp + stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \ stamps/add-zero.stamp stamps/add-jamvm.stamp stamps/add-systemtap.stamp \ - stamps/add-pulseaudio.stamp stamps/add-tzdata-support.stamp stamps/check-crypto.stamp + stamps/add-pulseaudio.stamp stamps/add-tzdata-support.stamp stamps/check-crypto.stamp \ + stamps/add-archive.stamp mkdir -p stamps touch $@ -clean-icedtea-stage2: clean-add-jamvm clean-check-crypto +clean-icedtea-stage2: clean-add-jamvm clean-check-crypto clean-add-archive rm -f stamps/icedtea-stage2.stamp stamps/icedtea-debug-stage2.stamp: stamps/icedtea-debug.stamp \ stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp stamps/add-jamvm-debug.stamp \ stamps/add-systemtap-debug.stamp stamps/add-pulseaudio-debug.stamp \ - stamps/add/tzdata-support-debug.stamp stamps/check-crypto-debug.stamp + stamps/add/tzdata-support-debug.stamp stamps/check-crypto-debug.stamp \ + stamps/add-archive-debug.stamp mkdir -p stamps touch $@ -clean-icedtea-debug-stage2: clean-add-jamvm-debug clean-check-crypto-debug +clean-icedtea-debug-stage2: clean-add-jamvm-debug clean-check-crypto-debug \ + clean-add-archive-debug rm -f stamps/icedtea-debug-stage2.stamp # OpenJDK boot Targets @@ -2036,7 +2072,7 @@ fi rm -f stamps/add-tzdata-support-boot.stamp -stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp +stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp stamps/icedtea-boot.stamp if [ -e $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \ $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ fi @@ -2046,14 +2082,31 @@ clean-check-crypto-boot: rm -f stamps/check-crypto-boot.stamp +stamps/add-archive-boot.stamp: stamps/icedtea-boot.stamp +if !ENABLE_JAMVM +if !ENABLE_CACAO +if !ZERO_BUILD + if [ -e $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \ + $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \ + fi +endif +endif +endif + touch $@ + +clean-add-archive-boot: + rm -vf $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa + rm -f stamps/add-archive-boot.stamp + stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp \ stamps/add-systemtap-boot.stamp stamps/add-pulseaudio-boot.stamp \ - stamps/add-tzdata-support-boot.stamp stamps/check-crypto-boot.stamp + stamps/add-tzdata-support-boot.stamp stamps/check-crypto-boot.stamp \ + stamps/add-archive-boot.stamp mkdir -p stamps touch $@ clean-icedtea-stage1: clean-add-systemtap-boot clean-add-pulseaudio-boot \ - clean-add-tzdata-support-boot clean-check-crypto-boot + clean-add-tzdata-support-boot clean-check-crypto-boot clean-add-archive-boot rm -f stamps/icedtea-stage1.stamp # Rebuild targets @@ -2632,6 +2685,12 @@ # Target Aliases # =============== +add-archive: stamps/add-archive.stamp + +add-archive-boot: stamps/add-archive-ecj.stamp + +add-archive-debug: stamps/add-archive-debug.stamp + add-nss: stamps/add-nss.stamp add-nss-debug: stamps/add-nss-debug.stamp diff -r 080f4776a2f8 -r bfcb188e2568 NEWS --- a/NEWS Wed Jun 05 20:59:33 2013 +0100 +++ b/NEWS Wed Jun 05 23:01:32 2013 +0100 @@ -810,6 +810,7 @@ - Make sure libffi cflags and libs are used. - PR1378: Add AArch64 support to Zero - PR1170: Ensure unlimited crypto policy is in place. + - RH513605, PR1280: Updating/Installing OpenJDK should recreate the shared class-data archive * CACAO - src/vm/jit/x86_64/asmpart.S (asm_abstractmethoderror): Keep stack aligned. - src/native/jni.cpp (GetObjectClass): Remove null pointer check. From bugzilla-daemon at icedtea.classpath.org Wed Jun 5 15:03:22 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 05 Jun 2013 22:03:22 +0000 Subject: [Bug 1280] [IcedTea7] Shared class data archive should be generated post-build on architectures with the client VM In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1280 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7?cmd=changeset;node=609b5317bd98 author: Andrew John Hughes date: Wed Jun 05 22:56:36 2013 +0100 RH513605, PR1280: Updating/Installing OpenJDK should recreate the shared class-data archive 2013-06-05 Andrew John Hughes PR1280: Updating/Installing OpenJDK should recreate the shared class-data archive * Makefile.am: (.PHONY): Add clean-add-archive, clean-add-archive-debug and clean-add-archive-boot. 2013-02-08 Andrew John Hughes PR1301: PR1171 causes Zero builds to fail * Makefile.am: (add-archive): Don't run -Xshare:dump if building Zero. (add-archive-debug): Likewise. (add-archive-boot): Likewise. 2013-01-25 Andrew John Hughes * Makefile.am: (clean-add-archive): Delete the archive. (clean-add-archive-debug): Likewise for debug. (clean-add-archive-boot): Likewise for bootstrap. 2012-11-28 Andrew John Hughes * Makefile.am: (add-archive): Only run -Xshare:dump when java exists and we aren't building CACAO or JamVM. (add-archive-debug): Likewise. (add-archive-boot): Likewise. 2012-11-20 Andrew John Hughes RH513605: Updating/Installing OpenJDK should recreate the shared class-data archive * Makefile.am: (add-archive): Run -Xshare:dump on the newly built JDK. (clean-add-archive): Delete stamp. (add-archive-debug): Same as add-archive for icedtea-debug. (clean-add-archive-debug): Same as clean-add-archive for icedtea-debug. (icedtea-stage2): Depend on add-archive. (clean-icedtea-stage2): Depend on clean-add-archive. (icedtea-debug-stage2): Depend on add-archive-debug. (clean-icedtea-debug-stage2): Depend on clean-add-archive-debug. (add-archive-boot): Same as add-archive for icedtea-boot. (clean-add-archive-boot): Same as clean-add-archive for icedtea-boot. (icedtea-stage1): Depend on add-archive-boot. (clean-icedtea-stage1): Depend on clean-add-archive-boot. * NEWS: Mention. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130605/0713bde6/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Jun 5 15:03:29 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 05 Jun 2013 22:03:29 +0000 Subject: [Bug 1301] PR1171 causes builds of Zero to fail In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1301 --- Comment #5 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7?cmd=changeset;node=609b5317bd98 author: Andrew John Hughes date: Wed Jun 05 22:56:36 2013 +0100 RH513605, PR1280: Updating/Installing OpenJDK should recreate the shared class-data archive 2013-06-05 Andrew John Hughes PR1280: Updating/Installing OpenJDK should recreate the shared class-data archive * Makefile.am: (.PHONY): Add clean-add-archive, clean-add-archive-debug and clean-add-archive-boot. 2013-02-08 Andrew John Hughes PR1301: PR1171 causes Zero builds to fail * Makefile.am: (add-archive): Don't run -Xshare:dump if building Zero. (add-archive-debug): Likewise. (add-archive-boot): Likewise. 2013-01-25 Andrew John Hughes * Makefile.am: (clean-add-archive): Delete the archive. (clean-add-archive-debug): Likewise for debug. (clean-add-archive-boot): Likewise for bootstrap. 2012-11-28 Andrew John Hughes * Makefile.am: (add-archive): Only run -Xshare:dump when java exists and we aren't building CACAO or JamVM. (add-archive-debug): Likewise. (add-archive-boot): Likewise. 2012-11-20 Andrew John Hughes RH513605: Updating/Installing OpenJDK should recreate the shared class-data archive * Makefile.am: (add-archive): Run -Xshare:dump on the newly built JDK. (clean-add-archive): Delete stamp. (add-archive-debug): Same as add-archive for icedtea-debug. (clean-add-archive-debug): Same as clean-add-archive for icedtea-debug. (icedtea-stage2): Depend on add-archive. (clean-icedtea-stage2): Depend on clean-add-archive. (icedtea-debug-stage2): Depend on add-archive-debug. (clean-icedtea-debug-stage2): Depend on clean-add-archive-debug. (add-archive-boot): Same as add-archive for icedtea-boot. (clean-add-archive-boot): Same as clean-add-archive for icedtea-boot. (icedtea-stage1): Depend on add-archive-boot. (clean-icedtea-stage1): Depend on clean-add-archive-boot. * NEWS: Mention. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130605/bb02dfab/attachment.html From metherid at gmail.com Wed Jun 5 22:32:48 2013 From: metherid at gmail.com (Rahul Sundaram) Date: Thu, 6 Jun 2013 01:32:48 -0400 Subject: [rfc][icedtea-web] fix for RH947647, following the XDG basedir specification In-Reply-To: <1583560531.3709366.1370363147349.JavaMail.root@redhat.com> References: <519A756D.9030308@redhat.com> <519AD027.4050105@redhat.com> <519B5241.7010407@redhat.com> <1583560531.3709366.1370363147349.JavaMail.root@redhat.com> Message-ID: Hi If it is ok to call into that, it would work in a standard way according to the spec. It is well tested and widely used. Rahul On Tue, Jun 4, 2013 at 12:25 PM, Andrew Hughes wrote: > > > ----- Original Message ----- > > Hi > > > > > > On Tue, May 21, 2013 at 6:53 AM, Jiri Vanek wrote: > > > > > > > > Some more thoughts about this: > > > - eg I have non XDG variable set, but many applications have already > > > started to use theirs default values. > > > > > > > I am not sure what you mean by this but distributions aren't supposed to > > set any of XDG environment variables by default. It is solely a > deployment > > customization for the odd cases out there. Running cache in tmpfs or > > config from nfs or whatever > > > > > > > - If we decide to move to ./config and ./cache: > > > if used XDG* variables are set, then use them. otherwise use > ./config > > > and ./cache > > > if they change, user is on his own? > > > > > > > Yes. If users customize it, they will have to deal with the fallout. > > > > > > > - how about xdg not following systems (windows) ? Keep .icedtea or > move to > > > ./config and ./cache ? > > > > > > > Hidden directories is not how Windows programs stores its profiles. You > > might consider following what glib helper functions do > > > > Refer to > > > https://developer.gnome.org/glib/2.34/glib-Miscellaneous-Utility-Functions.html > > > > g_get_user_cache_dir() and so on > > > > I didn't realise glib supported this for so long (since 2.6). It seems > like an > excellent solution to just use that. > > > Rahul > > > > -- > Andrew :) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > PGP Key: 248BDC07 (https://keys.indymedia.org/) > Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 > > -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/b6584281/attachment.html From thomas at m3y3r.de Wed Jun 5 23:40:31 2013 From: thomas at m3y3r.de (Thomas Meyer) Date: Thu, 06 Jun 2013 08:40:31 +0200 Subject: Fwd: Re: [rfc][icedtea-web] fix for PR1465 - java.io.FileNotFoundException while trying to download a JAR file In-Reply-To: <51AE4A5F.6020902@redhat.com> References: <51AE48CA.6060102@redhat.com> <51AE4A5F.6020902@redhat.com> Message-ID: <1370500831.24531.1.camel@localhost.localdomain> Am Dienstag, den 04.06.2013, 16:13 -0400 schrieb Adam Domurad: > Hi, this is re: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1465 > I would greatly appreciate if you could try this patch (apply to HEAD) > with the applet from the bug report. > > Thanks, > -Adam > > > -------- Original Message -------- > Subject: Re: [rfc][icedtea-web] fix for PR1465 - > java.io.FileNotFoundException while trying to download a JAR file > Date: Tue, 04 Jun 2013 16:06:34 -0400 > From: Adam Domurad > To: distro-pkg-dev at openjdk.java.net, Jiri Vanek > > > > On 06/04/2013 09:31 AM, Jiri Vanek wrote: > > Although not nice, not even bad. > > > > tbh this was known issue, and when sad was pushing his patch we > > decided to ignore %20 and + similarity under html encoding, and > > difference under RFC2396. > > Apearently, wrongly. > > > > J. > > I have done some research and I think I found a solution that should be > pleasing. See the unit tests in the patch, too. > > Basically new URI(url) will check RFC2396 validity. > See http://stackoverflow.com/questions/304806/encode-and-decode-rfc2396-urls > > This avoids the whole normalization mess if the URL is already valid. As > long as we create URLs in a manner that ensures they are correct, this > will be preserved. > This should reduce the future chance of unintended icedtea-web quirks, too. Hi, thanks for the patch. It works for me. Besides that I'm seeing these stacktraces on startup of icedtea-web: java version "1.7.0_19" OpenJDK Runtime Environment (fedora-2.3.9.9.fc19-x86_64) OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) Exception in thread "AWT-EventQueue-1" java.lang.IllegalArgumentException: Width (0) and height (0) cannot be <= 0 at java.awt.image.DirectColorModel.createCompatibleWritableRaster(DirectColorModel.java:1016) at sun.awt.X11GraphicsConfig.createAcceleratedImage(X11GraphicsConfig.java:384) at sun.awt.X11.XComponentPeer.createImage(XComponentPeer.java:769) at java.awt.Component.createImage(Component.java:3555) at sun.applet.PluginAppletViewer.paint(PluginAppletViewer.java:1550) at sun.applet.PluginAppletViewer.update(PluginAppletViewer.java:1566) at sun.awt.RepaintArea.updateComponent(RepaintArea.java:255) at sun.awt.X11.XRepaintArea.updateComponent(XRepaintArea.java:60) at sun.awt.RepaintArea.paint(RepaintArea.java:232) at sun.awt.X11.XComponentPeer.handleEvent(XComponentPeer.java:591) at java.awt.Component.dispatchEventImpl(Component.java:4937) at java.awt.Container.dispatchEventImpl(Container.java:2287) at java.awt.Window.dispatchEventImpl(Window.java:2719) at java.awt.Component.dispatchEvent(Component.java:4687) at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:729) at java.awt.EventQueue.access$200(EventQueue.java:103) at java.awt.EventQueue$3.run(EventQueue.java:688) at java.awt.EventQueue$3.run(EventQueue.java:686) at java.security.AccessController.doPrivileged(Native Method) at java.security.ProtectionDomain $1.doIntersectionPrivilege(ProtectionDomain.java:76) at java.security.ProtectionDomain $1.doIntersectionPrivilege(ProtectionDomain.java:87) at java.awt.EventQueue$4.run(EventQueue.java:702) at java.awt.EventQueue$4.run(EventQueue.java:700) at java.security.AccessController.doPrivileged(Native Method) at java.security.ProtectionDomain $1.doIntersectionPrivilege(ProtectionDomain.java:76) at java.awt.EventQueue.dispatchEvent(EventQueue.java:699) at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:242) at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:161) at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:150) at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:146) at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:138) at java.awt.EventDispatchThread.run(EventDispatchThread.java:91) Exception in thread "Thread-6" java.lang.NullPointerException at sun.applet.PluginAppletViewer$8.run(PluginAppletViewer.java:1485) at java.lang.Thread.run(Thread.java:722) with kind regards thomas > > Happy hacking, > -Adam > > > From ptisnovs at icedtea.classpath.org Thu Jun 6 00:36:37 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 06 Jun 2013 07:36:37 +0000 Subject: /hg/gfx-test: New method used by several gfx. tests added into C... Message-ID: changeset ad011872d058 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=ad011872d058 author: Pavel Tisnovsky date: Wed Jun 05 15:38:12 2013 +0200 New method used by several gfx. tests added into CommonBitmapOperations, six new tests added into BitBltBasicTests test suite. diffstat: ChangeLog | 7 + src/org/gfxtest/framework/CommonBitmapOperations.java | 28 +++++- src/org/gfxtest/testsuites/BitBltBasicTests.java | 90 +++++++++++++++++++ 3 files changed, 124 insertions(+), 1 deletions(-) diffs (159 lines): diff -r 423cbdb30284 -r ad011872d058 ChangeLog --- a/ChangeLog Wed Jun 05 10:28:26 2013 +0200 +++ b/ChangeLog Wed Jun 05 15:38:12 2013 +0200 @@ -1,3 +1,10 @@ +2013-06-06 Pavel Tisnovsky + + * src/org/gfxtest/framework/CommonBitmapOperations.java: + New method used by several gfx. tests. + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + Six new tests added into BitBltBasicTests test suite. + 2013-06-05 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltCropImage.java: diff -r 423cbdb30284 -r ad011872d058 src/org/gfxtest/framework/CommonBitmapOperations.java --- a/src/org/gfxtest/framework/CommonBitmapOperations.java Wed Jun 05 10:28:26 2013 +0200 +++ b/src/org/gfxtest/framework/CommonBitmapOperations.java Wed Jun 05 15:38:12 2013 +0200 @@ -370,7 +370,7 @@ // BitBlt with 1:1 scaling, no flipping and no cropping return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, bgcolor) ? TestResult.PASSED : TestResult.FAILED; } - + /** * Create new buffered image containing checker pattern and then perform basic BitBlt test. * @@ -509,6 +509,32 @@ } /** + * Create new buffered image and then perform basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + * @param bgcolor + * background color + */ + public static TestResult doBitBltTestWithDiagonalCheckerImage(TestImage image, Graphics2D graphics2d, int imageType, Color bgcolor) + { + // create new buffered bitmap with given type + // bitmap should be empty - solid color pixels + BufferedImage bufferedImage = ImageFactory.createDiagonalCheckerImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling, no flipping and no cropping + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, bgcolor) ? TestResult.PASSED : TestResult.FAILED; + } + + /** * Create new buffered image containing diagonal checker pattern and then perform basic BitBlt test. * * @param image diff -r 423cbdb30284 -r ad011872d058 src/org/gfxtest/testsuites/BitBltBasicTests.java --- a/src/org/gfxtest/testsuites/BitBltBasicTests.java Wed Jun 05 10:28:26 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Wed Jun 05 15:38:12 2013 +0200 @@ -4308,6 +4308,96 @@ } /** + * Test basic BitBlt operation for horizontal cyan gradient buffered image with type TYPE_INT_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalCyanGradientBufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_INT_RGB); + } + + /** + * Test basic BitBlt operation for horizontal cyan gradient buffered image with type TYPE_INT_ARGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalCyanGradientBufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB); + } + + /** + * Test basic BitBlt operation for horizontal cyan gradient buffered image with type TYPE_INT_ARGB_PRE. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalCyanGradientBufferedImageTypeIntARGB_Pre(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE); + } + + /** + * Test basic BitBlt operation for horizontal cyan gradient buffered image with type TYPE_USHORT_555_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalCyanGradientBufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB); + } + + /** + * Test basic BitBlt operation for horizontal cyan gradient buffered image with type TYPE_USHORT_565_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalCyanGradientBufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB); + } + + /** + * Test basic BitBlt operation for horizontal cyan gradient buffered image with type TYPE_USHORT_GRAY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalCyanGradientBufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY); + } + + /** * Entry point to the test suite. * * @param args not used in this case From ptisnovs at icedtea.classpath.org Thu Jun 6 00:37:21 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 06 Jun 2013 07:37:21 +0000 Subject: /hg/rhino-tests: Updated some tests in ScriptEngineClassTest for... Message-ID: changeset 55a3c2780d77 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=55a3c2780d77 author: Pavel Tisnovsky date: Thu Jun 06 09:40:50 2013 +0200 Updated some tests in ScriptEngineClassTest for (Open)JDK8 API: getFields and getDeclaredFields. diffstat: ChangeLog | 6 + src/org/RhinoTests/ScriptEngineClassTest.java | 90 +++++++++++++++++++++++++- 2 files changed, 92 insertions(+), 4 deletions(-) diffs (141 lines): diff -r 4de9c7877164 -r 55a3c2780d77 ChangeLog --- a/ChangeLog Wed Jun 05 10:42:41 2013 +0200 +++ b/ChangeLog Thu Jun 06 09:40:50 2013 +0200 @@ -1,3 +1,9 @@ +2013-06-06 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptEngineClassTest.java: + Updated some tests in ScriptEngineClassTest for (Open)JDK8 API: + getFields and getDeclaredFields. + 2013-06-05 Pavel Tisnovsky * src/org/RhinoTests/ScriptContextClassTest.java: diff -r 4de9c7877164 -r 55a3c2780d77 src/org/RhinoTests/ScriptEngineClassTest.java --- a/src/org/RhinoTests/ScriptEngineClassTest.java Wed Jun 05 10:42:41 2013 +0200 +++ b/src/org/RhinoTests/ScriptEngineClassTest.java Thu Jun 06 09:40:50 2013 +0200 @@ -454,9 +454,29 @@ "public static final java.lang.String javax.script.ScriptEngine.LANGUAGE", "public static final java.lang.String javax.script.ScriptEngine.LANGUAGE_VERSION", }; + final String[] fieldsThatShouldExist_jdk8 = { + "public static final java.lang.String javax.script.ScriptEngine.ARGV", + "public static final java.lang.String javax.script.ScriptEngine.FILENAME", + "public static final java.lang.String javax.script.ScriptEngine.ENGINE", + "public static final java.lang.String javax.script.ScriptEngine.ENGINE_VERSION", + "public static final java.lang.String javax.script.ScriptEngine.NAME", + "public static final java.lang.String javax.script.ScriptEngine.LANGUAGE", + "public static final java.lang.String javax.script.ScriptEngine.LANGUAGE_VERSION", + }; // get the right array of field signatures - final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7; + String[] fieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + fieldsThatShouldExist = fieldsThatShouldExist_jdk6; + break; + case 7: + fieldsThatShouldExist = fieldsThatShouldExist_jdk7; + break; + case 8: + fieldsThatShouldExist = fieldsThatShouldExist_jdk8; + break; + } // get all fields Field[] fields = this.scriptEngineClass.getFields(); @@ -495,10 +515,30 @@ "public static final java.lang.String javax.script.ScriptEngine.LANGUAGE", "public static final java.lang.String javax.script.ScriptEngine.LANGUAGE_VERSION", }; + final String[] declaredFieldsThatShouldExist_jdk8 = { + "public static final java.lang.String javax.script.ScriptEngine.ARGV", + "public static final java.lang.String javax.script.ScriptEngine.FILENAME", + "public static final java.lang.String javax.script.ScriptEngine.ENGINE", + "public static final java.lang.String javax.script.ScriptEngine.ENGINE_VERSION", + "public static final java.lang.String javax.script.ScriptEngine.NAME", + "public static final java.lang.String javax.script.ScriptEngine.LANGUAGE", + "public static final java.lang.String javax.script.ScriptEngine.LANGUAGE_VERSION", + }; // get the right array of field signatures // following fields should be declared - final String[] declaredFieldsThatShouldExist = getJavaVersion() < 7 ? declaredFieldsThatShouldExist_jdk6 : declaredFieldsThatShouldExist_jdk7; + String[] declaredFieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk6; + break; + case 7: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk7; + break; + case 8: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk8; + break; + } // get all declared fields Field[] declaredFields = this.scriptEngineClass.getDeclaredFields(); @@ -537,8 +577,28 @@ "LANGUAGE", "LANGUAGE_VERSION", }; + final String[] fieldsThatShouldExist_jdk8 = { + "ARGV", + "FILENAME", + "ENGINE", + "ENGINE_VERSION", + "NAME", + "LANGUAGE", + "LANGUAGE_VERSION", + }; - final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7; + String[] fieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + fieldsThatShouldExist = fieldsThatShouldExist_jdk6; + break; + case 7: + fieldsThatShouldExist = fieldsThatShouldExist_jdk7; + break; + case 8: + fieldsThatShouldExist = fieldsThatShouldExist_jdk8; + break; + } // check if all required fields really exists for (String fieldThatShouldExists : fieldsThatShouldExist) { @@ -578,8 +638,30 @@ "LANGUAGE", "LANGUAGE_VERSION", }; + final String[] declaredFieldsThatShouldExist_jdk8 = { + "ARGV", + "FILENAME", + "ENGINE", + "ENGINE_VERSION", + "NAME", + "LANGUAGE", + "LANGUAGE_VERSION", + }; - final String[] declaredFieldsThatShouldExist = getJavaVersion() < 7 ? declaredFieldsThatShouldExist_jdk6 : declaredFieldsThatShouldExist_jdk7; + // get the right array of field signatures + // following fields should be declared + String[] declaredFieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk6; + break; + case 7: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk7; + break; + case 8: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk8; + break; + } // check if all required declared fields really exists for (String declaredFieldThatShouldExists : declaredFieldsThatShouldExist) { From bugzilla-daemon at icedtea.classpath.org Thu Jun 6 03:37:46 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 06 Jun 2013 10:37:46 +0000 Subject: [Bug 1274] [TRACKER] IcedTea 2.4.0 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1274 Bug 1274 depends on bug 1170, which changed state. Bug 1170 Summary: [IcedTea7] Ensure unlimited crypto policy or crypto removal patch is in place. http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1170 What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/f63c524f/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu Jun 6 03:39:33 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 06 Jun 2013 10:39:33 +0000 Subject: [Bug 1280] [IcedTea7] Shared class data archive should be generated post-build on architectures with the client VM In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1280 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/9139359c/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu Jun 6 03:39:34 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 06 Jun 2013 10:39:34 +0000 Subject: [Bug 1274] [TRACKER] IcedTea 2.4.0 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1274 Bug 1274 depends on bug 1280, which changed state. Bug 1280 Summary: [IcedTea7] Shared class data archive should be generated post-build on architectures with the client VM http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1280 What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/f71884c0/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu Jun 6 03:50:00 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 06 Jun 2013 10:50:00 +0000 Subject: [Bug 1471] Error: guarantee(error != (symbolOop)__null, "tag mismatch with resolution error table") In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1471 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |WONTFIX --- Comment #1 from Andrew John Hughes --- This version is no longer supported. Please reopen if this can be reproduced on 1.11.x or 1.12.x. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/32ead328/attachment.html From jvanek at redhat.com Thu Jun 6 06:15:14 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 06 Jun 2013 15:15:14 +0200 Subject: Issues in latests updates - selinux, firefox and icedtea-web Message-ID: <51B08B62.101@redhat.com> Hi all! There is new rule in selinux (since slinux-policy.3) when enforcing for firefox (since 20) When something launched in firefox is launching something, what is not in standard path (/usr/lib(64) /usr/bin ...), then it is denied. That is case of custom installations of icedtea-web (eg I have --prefix=~/icedtea-web-image) The IcedTeaPlugin.so is launching java - and is palced in {prefix} - So is denied. I think this behaviour is not a bug. However user is not always informed via "pop up" (is always in logs) so this can be confusing. I think that the bug with ppups was already fixed so no bug even here. Interesting is that other browsers are not affected. J. From gitne at excite.co.jp Thu Jun 6 06:45:18 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Thu, 6 Jun 2013 22:45:18 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtpY2VkdGVhLXdlYl1bcmZjXSBNb3JlIGNvbXBsZXRlIE5ldFggamFyIGZpbGUgbWFuaWZlc3Q=?= Message-ID: <201306061345.r56DjIp2010387@mail-web02.excite.co.jp> "Jiri Vanek" wrote: > On 05/21/2013 01:30 AM, Jacob Wisor wrote: > > "Jiri Vanek" wrote: > >> On 05/03/2013 03:33 PM, Jiri Vanek wrote: > >>> On 05/02/2013 07:03 PM, Omair Majid wrote: > >>>> On 05/02/2013 12:57 PM, Jacob Wisor wrote: > >>>>> "Omair Majid" wrote: > >>>>>> On 05/02/2013 11:15 AM, Jacob Wisor wrote: > >>>>>>> "Jacob Wisor" wrote: > >>>>>>>>> I would like to propose to make the jar file manifest more > >>>>>>>>> complete, though I am not sure about the "Implementation-Vendor" > >>>>>>>>> attribute's (key) value. > >>>>>> > >>>>>> I would use "IcedTea" > >>>>>> > >>>>>>> +Implementation-URL: http://icedtea.classpath.org/wiki/IcedTea-Web > >>>>>> > >>>>>> Please use @PACKAGE_URL@ here, instead of duplicating the URL. > >>>>> > >>>>> Setting IcedTea as vendor and then setting "Implementation-URL" to > >>>>> @PACKAGE_URL@ does not compute. How about setting > >>>>> "Implementation-Vendor" to @VENDOR@ (or @PACKAGE_VENDOR@?) and adding > >>>>> it to the build script, hence "IcedTea" being the default for > >>>>> @VENDOR@ and "http://icedtea.classpath.org/wiki/IcedTea-Web" the > >>>>> default for @PACKAGE_URL@? > >>>> > >>>> That sounds fine to me. I went with @PACKAGE_URL@ since it's already > >>>> defined, and used in only a few places, whereas the string IcedTea is > >>>> probably present in every file already (along the lines of "This file is > >>>> part of IcedTea"). > >>>> > >>>> I would like to hear what others think about "IcedTea" as the vendor, > >>>> before we decide to use it. > >>> > >>> I'm for it. We are also using it in *all* jnlp testcases (IcedTea) so it would be > >>> nicely consistent. > >>> > >>> Thank you for taking this review! > >>> > >>> J. > >>> > >> > >> diff -r 3dd0ae4efe78 netx.manifest.in > >> --- a/netx.manifest.in Mon May 20 15:13:32 2013 +0200 > >> +++ b/netx.manifest.in Mon May 20 15:57:59 2013 +0200 > >> @@ -1,2 +1,8 @@ > >> Implementation-Title: @PACKAGE_NAME@ > >> Implementation-Version: @FULL_VERSION@ > >> +Implementation-URL: @PACKAGE_URL@ > >> +Implementation-Vendor: IcedTea > > > > What about the vendor? This acutally should be a distro's or publisher's name. It is the same as with the title and url. In my understanding only an unmodified release may/should bear the label IcedTea as vendor, hence especially major or commercial distros should adjust this key for thier release, even more, should they modify an IcedTea release before releasing a binary. > > > > But, this is only my interpretation of the jar manifest file specification, and maybe I am taking this too seriously. :) > > > We are forwarding the distribution via configure - eg > http://pkgs.fedoraproject.org/cgit/icedtea-web.git/tree/icedtea-web.spec#n103 Sorry for responding so late, but I have been cut off the inet lately. What is the status on this? > My interpretation of Implementation-Vendor is the person/organisation who actually implemented the > specification. > > Thanx for hints! > > > >> +Specification-Title: JSR56: Java Network Launching Protocol and API > >> +Specification-URL: http://jcp.org/aboutJava/communityprocess/mrel/jsr056 > >> +Specification-Vendor: Java Community Process > >> +Specification-Version: 6.0 From jvanek at redhat.com Thu Jun 6 06:51:06 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 06 Jun 2013 15:51:06 +0200 Subject: [icedtea-web][rfc] More complete NetX jar file manifest In-Reply-To: <201306061345.r56DjIp2010387@mail-web02.excite.co.jp> References: <201306061345.r56DjIp2010387@mail-web02.excite.co.jp> Message-ID: <51B093CA.4040403@redhat.com> On 06/06/2013 03:45 PM, Jacob Wisor wrote: > "Jiri Vanek" wrote: >> On 05/21/2013 01:30 AM, Jacob Wisor wrote: >>> "Jiri Vanek" wrote: >>>> On 05/03/2013 03:33 PM, Jiri Vanek wrote: >>>>> On 05/02/2013 07:03 PM, Omair Majid wrote: >>>>>> On 05/02/2013 12:57 PM, Jacob Wisor wrote: >>>>>>> "Omair Majid" wrote: >>>>>>>> On 05/02/2013 11:15 AM, Jacob Wisor wrote: >>>>>>>>> "Jacob Wisor" wrote: >>>>>>>>>>> I would like to propose to make the jar file manifest more >>>>>>>>>>> complete, though I am not sure about the "Implementation-Vendor" >>>>>>>>>>> attribute's (key) value. >>>>>>>> >>>>>>>> I would use "IcedTea" >>>>>>>> >>>>>>>>> +Implementation-URL: http://icedtea.classpath.org/wiki/IcedTea-Web >>>>>>>> >>>>>>>> Please use @PACKAGE_URL@ here, instead of duplicating the URL. >>>>>>> >>>>>>> Setting IcedTea as vendor and then setting "Implementation-URL" to >>>>>>> @PACKAGE_URL@ does not compute. How about setting >>>>>>> "Implementation-Vendor" to @VENDOR@ (or @PACKAGE_VENDOR@?) and adding >>>>>>> it to the build script, hence "IcedTea" being the default for >>>>>>> @VENDOR@ and "http://icedtea.classpath.org/wiki/IcedTea-Web" the >>>>>>> default for @PACKAGE_URL@? >>>>>> >>>>>> That sounds fine to me. I went with @PACKAGE_URL@ since it's already >>>>>> defined, and used in only a few places, whereas the string IcedTea is >>>>>> probably present in every file already (along the lines of "This file is >>>>>> part of IcedTea"). >>>>>> >>>>>> I would like to hear what others think about "IcedTea" as the vendor, >>>>>> before we decide to use it. >>>>> >>>>> I'm for it. We are also using it in *all* jnlp testcases (IcedTea) so it would be >>>>> nicely consistent. >>>>> >>>>> Thank you for taking this review! >>>>> >>>>> J. >>>>> >>>> >>>> diff -r 3dd0ae4efe78 netx.manifest.in >>>> --- a/netx.manifest.in Mon May 20 15:13:32 2013 +0200 >>>> +++ b/netx.manifest.in Mon May 20 15:57:59 2013 +0200 >>>> @@ -1,2 +1,8 @@ >>>> Implementation-Title: @PACKAGE_NAME@ >>>> Implementation-Version: @FULL_VERSION@ >>>> +Implementation-URL: @PACKAGE_URL@ >>>> +Implementation-Vendor: IcedTea >>> >>> What about the vendor? This acutally should be a distro's or publisher's name. It is the same as with the title and url. In my understanding only an unmodified release may/should bear the label IcedTea as vendor, hence especially major or commercial distros should adjust this key for thier release, even more, should they modify an IcedTea release before releasing a binary. >>> >>> But, this is only my interpretation of the jar manifest file specification, and maybe I am taking this too seriously. :) >> >> >> We are forwarding the distribution via configure - eg >> http://pkgs.fedoraproject.org/cgit/icedtea-web.git/tree/icedtea-web.spec#n103 > > Sorry for responding so late, but I have been cut off the inet lately. What is the status on this? Np! It is waiting for your allow. to be pushed by me, or by yourself J. > >> My interpretation of Implementation-Vendor is the person/organisation who actually implemented the >> specification. >> >> Thanx for hints! >>> >>>> +Specification-Title: JSR56: Java Network Launching Protocol and API >>>> +Specification-URL: http://jcp.org/aboutJava/communityprocess/mrel/jsr056 >>>> +Specification-Vendor: Java Community Process >>>> +Specification-Version: 6.0 From gitne at excite.co.jp Thu Jun 6 06:57:19 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Thu, 6 Jun 2013 22:57:19 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtpY2VkdGVhLXdlYl1bcmZjXSBNb3JlIGNvbXBsZXRlIE5ldFggamFyIGZpbGUgbWFuaWZlc3Q=?= Message-ID: <201306061357.r56DvJfm021354@mail-web03.excite.co.jp> "Jiri Vanek" wrote: > On 06/06/2013 03:45 PM, Jacob Wisor wrote: > > "Jiri Vanek" wrote: > >> On 05/21/2013 01:30 AM, Jacob Wisor wrote: > >>> "Jiri Vanek" wrote: > >>>> On 05/03/2013 03:33 PM, Jiri Vanek wrote: > >>>>> On 05/02/2013 07:03 PM, Omair Majid wrote: > >>>>>> On 05/02/2013 12:57 PM, Jacob Wisor wrote: > >>>>>>> "Omair Majid" wrote: > >>>>>>>> On 05/02/2013 11:15 AM, Jacob Wisor wrote: > >>>>>>>>> "Jacob Wisor" wrote: > >>>>>>>>>>> I would like to propose to make the jar file manifest more > >>>>>>>>>>> complete, though I am not sure about the "Implementation-Vendor" > >>>>>>>>>>> attribute's (key) value. > >>>>>>>> > >>>>>>>> I would use "IcedTea" > >>>>>>>> > >>>>>>>>> +Implementation-URL: http://icedtea.classpath.org/wiki/IcedTea-Web > >>>>>>>> > >>>>>>>> Please use @PACKAGE_URL@ here, instead of duplicating the URL. > >>>>>>> > >>>>>>> Setting IcedTea as vendor and then setting "Implementation-URL" to > >>>>>>> @PACKAGE_URL@ does not compute. How about setting > >>>>>>> "Implementation-Vendor" to @VENDOR@ (or @PACKAGE_VENDOR@?) and adding > >>>>>>> it to the build script, hence "IcedTea" being the default for > >>>>>>> @VENDOR@ and "http://icedtea.classpath.org/wiki/IcedTea-Web" the > >>>>>>> default for @PACKAGE_URL@? > >>>>>> > >>>>>> That sounds fine to me. I went with @PACKAGE_URL@ since it's already > >>>>>> defined, and used in only a few places, whereas the string IcedTea is > >>>>>> probably present in every file already (along the lines of "This file is > >>>>>> part of IcedTea"). > >>>>>> > >>>>>> I would like to hear what others think about "IcedTea" as the vendor, > >>>>>> before we decide to use it. > >>>>> > >>>>> I'm for it. We are also using it in *all* jnlp testcases (IcedTea) so it would be > >>>>> nicely consistent. > >>>>> > >>>>> Thank you for taking this review! > >>>>> > >>>>> J. > >>>>> > >>>> > >>>> diff -r 3dd0ae4efe78 netx.manifest.in > >>>> --- a/netx.manifest.in Mon May 20 15:13:32 2013 +0200 > >>>> +++ b/netx.manifest.in Mon May 20 15:57:59 2013 +0200 > >>>> @@ -1,2 +1,8 @@ > >>>> Implementation-Title: @PACKAGE_NAME@ > >>>> Implementation-Version: @FULL_VERSION@ > >>>> +Implementation-URL: @PACKAGE_URL@ > >>>> +Implementation-Vendor: IcedTea > >>> > >>> What about the vendor? This acutally should be a distro's or publisher's name. It is the same as with the title and url. In my understanding only an unmodified release may/should bear the label IcedTea as vendor, hence especially major or commercial distros should adjust this key for thier release, even more, should they modify an IcedTea release before releasing a binary. > >>> > >>> But, this is only my interpretation of the jar manifest file specification, and maybe I am taking this too seriously. :) > >> > >> > >> We are forwarding the distribution via configure - eg > >> http://pkgs.fedoraproject.org/cgit/icedtea-web.git/tree/icedtea-web.spec#n103 > > > > Sorry for responding so late, but I have been cut off the inet lately. What is the status on this? > > Np! > > > It is waiting for your allow. to be pushed by me, or by yourself Okay then, push please. I am currently missing any really usable access, so there is not much for me that I can do. > J. > > > >> My interpretation of Implementation-Vendor is the person/organisation who actually implemented the > >> specification. > >> > >> Thanx for hints! > >>> > >>>> +Specification-Title: JSR56: Java Network Launching Protocol and API > >>>> +Specification-URL: http://jcp.org/aboutJava/communityprocess/mrel/jsr056 > >>>> +Specification-Vendor: Java Community Process > >>>> +Specification-Version: 6.0 > > From jvanek at redhat.com Thu Jun 6 07:08:42 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 06 Jun 2013 16:08:42 +0200 Subject: [fyi][icedtea-web] enabling testing on f19 again In-Reply-To: <51AF7BC5.1040502@redhat.com> References: <51AF7BC5.1040502@redhat.com> Message-ID: <51B097EA.80006@redhat.com> On 06/05/2013 07:56 PM, Jiri Vanek wrote: > Hi! > > There was some mysterious change in junit api. This small fix is fixing it,a nd should be harmelss > for older. > > This will go also to 1.4 otherwise we will not be able to enable %check in spec. > > Also can possible reviewer try this (junit, codecoverage, reproducers(just one is enough:) and > reproducers coverage targets) on some older then 19 fedora? I have run out of machines and have > everywhere f19 right now:-/ > > Thanx! > > J. Ugh. Jana have reviewed this today a and tested on f18. It looks like she forgot to sent results. As I desperately need this in, and she left for vacation, I will push, J. From jvanek at redhat.com Thu Jun 6 07:11:52 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 06 Jun 2013 16:11:52 +0200 Subject: [rfc][icedtea-web] get rid of two unwanted exception - was Re: Fwd: Re: [rfc][icedtea-web] fix for PR1465 - java.io.FileNotFoundException while trying to download a JAR file In-Reply-To: <1370500831.24531.1.camel@localhost.localdomain> References: <51AE48CA.6060102@redhat.com> <51AE4A5F.6020902@redhat.com> <1370500831.24531.1.camel@localhost.localdomain> Message-ID: <51B098A8.1070006@redhat.com> On 06/06/2013 08:40 AM, Thomas Meyer wrote: > Am Dienstag, den 04.06.2013, 16:13 -0400 schrieb Adam Domurad: >> Hi, this is re: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1465 >> I would greatly appreciate if you could try this patch (apply to HEAD) >> with the applet from the bug report. >> >> Thanks, >> -Adam >> >> >> -------- Original Message -------- >> Subject: Re: [rfc][icedtea-web] fix for PR1465 - >> java.io.FileNotFoundException while trying to download a JAR file >> Date: Tue, 04 Jun 2013 16:06:34 -0400 >> From: Adam Domurad >> To: distro-pkg-dev at openjdk.java.net, Jiri Vanek >> >> >> >> On 06/04/2013 09:31 AM, Jiri Vanek wrote: >>> Although not nice, not even bad. >>> >>> tbh this was known issue, and when sad was pushing his patch we >>> decided to ignore %20 and + similarity under html encoding, and >>> difference under RFC2396. >>> Apearently, wrongly. >>> >>> J. >> >> I have done some research and I think I found a solution that should be >> pleasing. See the unit tests in the patch, too. >> >> Basically new URI(url) will check RFC2396 validity. >> See http://stackoverflow.com/questions/304806/encode-and-decode-rfc2396-urls >> >> This avoids the whole normalization mess if the URL is already valid. As >> long as we create URLs in a manner that ensures they are correct, this >> will be preserved. >> This should reduce the future chance of unintended icedtea-web quirks, too. > > Hi, > > thanks for the patch. It works for me. > Thanx for test! > Besides that I'm seeing these stacktraces on startup of icedtea-web: it loosk like your applet have width and height 0. Surprisingly It will not fail for "or". The best fix is to enhance it to 1 x 1 on your side;) - Actually - you really *should*. According to my knowledge chrome and chromium do not lunch zero area applets. nvm - the fix + reproducer is simple and is attached. Thanx for keeping in loop with us! > > java version "1.7.0_19" > OpenJDK Runtime Environment (fedora-2.3.9.9.fc19-x86_64) > OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) > Exception in thread "AWT-EventQueue-1" > java.lang.IllegalArgumentException: Width (0) and height (0) cannot be > <= 0 > at > java.awt.image.DirectColorModel.createCompatibleWritableRaster(DirectColorModel.java:1016) > at > sun.awt.X11GraphicsConfig.createAcceleratedImage(X11GraphicsConfig.java:384) > at sun.awt.X11.XComponentPeer.createImage(XComponentPeer.java:769) > at java.awt.Component.createImage(Component.java:3555) > at sun.applet.PluginAppletViewer.paint(PluginAppletViewer.java:1550) > at sun.applet.PluginAppletViewer.update(PluginAppletViewer.java:1566) > at sun.awt.RepaintArea.updateComponent(RepaintArea.java:255) > at sun.awt.X11.XRepaintArea.updateComponent(XRepaintArea.java:60) > at sun.awt.RepaintArea.paint(RepaintArea.java:232) > at sun.awt.X11.XComponentPeer.handleEvent(XComponentPeer.java:591) > at java.awt.Component.dispatchEventImpl(Component.java:4937) > at java.awt.Container.dispatchEventImpl(Container.java:2287) > at java.awt.Window.dispatchEventImpl(Window.java:2719) > at java.awt.Component.dispatchEvent(Component.java:4687) > at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:729) > at java.awt.EventQueue.access$200(EventQueue.java:103) > at java.awt.EventQueue$3.run(EventQueue.java:688) > at java.awt.EventQueue$3.run(EventQueue.java:686) > at java.security.AccessController.doPrivileged(Native Method) > at java.security.ProtectionDomain > $1.doIntersectionPrivilege(ProtectionDomain.java:76) > at java.security.ProtectionDomain > $1.doIntersectionPrivilege(ProtectionDomain.java:87) > at java.awt.EventQueue$4.run(EventQueue.java:702) > at java.awt.EventQueue$4.run(EventQueue.java:700) > at java.security.AccessController.doPrivileged(Native Method) > at java.security.ProtectionDomain > $1.doIntersectionPrivilege(ProtectionDomain.java:76) > at java.awt.EventQueue.dispatchEvent(EventQueue.java:699) > at > java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:242) > at > java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:161) > at > java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:150) > at > java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:146) > at > java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:138) > at java.awt.EventDispatchThread.run(EventDispatchThread.java:91) > > Exception in thread "Thread-6" java.lang.NullPointerException > at sun.applet.PluginAppletViewer$8.run(PluginAppletViewer.java:1485) > at java.lang.Thread.run(Thread.java:722) > > with kind regards > thomas > >> >> Happy hacking, >> -Adam >> >> >> > > > -------------- next part -------------- A non-text attachment was scrubbed... Name: 2twoSilencedExceptions-fix.patch Type: text/x-patch Size: 1631 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/68f6122b/2twoSilencedExceptions-fix.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: 2twoSilencedExceptions-test.patch Type: text/x-patch Size: 8001 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/68f6122b/2twoSilencedExceptions-test.patch From jvanek at redhat.com Thu Jun 6 07:16:22 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 06 Jun 2013 16:16:22 +0200 Subject: [rfc][icedtea-web] access denied for new PropertyPermission("java.vm.name", "read") inisde net.sourceforge.jnlp Message-ID: <51B099B6.60608@redhat.com> I have just noted that javaws is throwing AccessCotnroll exception by its own run when launching some applets/applications (not plugin). The "corrupted" entry is access denied for new PropertyPermission("java.vm.name", "read") inside netx/net/sourceforge/jnlp/SecurityDesc.java: new PropertyPermission("java.vm.name", "read"), Have anybody encountered it too? J. From adomurad at redhat.com Thu Jun 6 07:33:22 2013 From: adomurad at redhat.com (Adam Domurad) Date: Thu, 06 Jun 2013 10:33:22 -0400 Subject: [rfc][icedtea-web] get rid of two unwanted exception - was Re: Fwd: Re: [rfc][icedtea-web] fix for PR1465 - java.io.FileNotFoundException while trying to download a JAR file In-Reply-To: <51B098A8.1070006@redhat.com> References: <51AE48CA.6060102@redhat.com> <51AE4A5F.6020902@redhat.com> <1370500831.24531.1.camel@localhost.localdomain> <51B098A8.1070006@redhat.com> Message-ID: <51B09DB2.4050807@redhat.com> On 06/06/2013 10:11 AM, Jiri Vanek wrote: > On 06/06/2013 08:40 AM, Thomas Meyer wrote: >> Am Dienstag, den 04.06.2013, 16:13 -0400 schrieb Adam Domurad: >>> Hi, this is re: >>> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1465 >>> I would greatly appreciate if you could try this patch (apply to HEAD) >>> with the applet from the bug report. >>> >>> Thanks, >>> -Adam >>> >>> >>> -------- Original Message -------- >>> Subject: Re: [rfc][icedtea-web] fix for PR1465 - >>> java.io.FileNotFoundException while trying to download a JAR file >>> Date: Tue, 04 Jun 2013 16:06:34 -0400 >>> From: Adam Domurad >>> To: distro-pkg-dev at openjdk.java.net, Jiri Vanek >>> >>> >>> >>> On 06/04/2013 09:31 AM, Jiri Vanek wrote: >>>> Although not nice, not even bad. >>>> >>>> tbh this was known issue, and when sad was pushing his patch we >>>> decided to ignore %20 and + similarity under html encoding, and >>>> difference under RFC2396. >>>> Apearently, wrongly. >>>> >>>> J. >>> >>> I have done some research and I think I found a solution that should be >>> pleasing. See the unit tests in the patch, too. >>> >>> Basically new URI(url) will check RFC2396 validity. >>> See >>> http://stackoverflow.com/questions/304806/encode-and-decode-rfc2396-urls >>> >>> >>> This avoids the whole normalization mess if the URL is already >>> valid. As >>> long as we create URLs in a manner that ensures they are correct, this >>> will be preserved. >>> This should reduce the future chance of unintended icedtea-web >>> quirks, too. >> >> Hi, >> >> thanks for the patch. It works for me. >> > Thanx for test! >> Besides that I'm seeing these stacktraces on startup of icedtea-web: > > it loosk like your applet have width and height 0. Surprisingly It > will not fail for "or". > The best fix is to enhance it to 1 x 1 on your side;) > - Actually - you really *should*. According to my knowledge chrome > and chromium do not lunch zero area applets. > > nvm - the fix + reproducer is simple and is attached. > > Thanx for keeping in loop with us! > >> >> java version "1.7.0_19" >> OpenJDK Runtime Environment (fedora-2.3.9.9.fc19-x86_64) >> OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) >> Exception in thread "AWT-EventQueue-1" >> java.lang.IllegalArgumentException: Width (0) and height (0) cannot be >> <= 0 >> at >> java.awt.image.DirectColorModel.createCompatibleWritableRaster(DirectColorModel.java:1016) >> >> at >> sun.awt.X11GraphicsConfig.createAcceleratedImage(X11GraphicsConfig.java:384) >> >> at sun.awt.X11.XComponentPeer.createImage(XComponentPeer.java:769) >> at java.awt.Component.createImage(Component.java:3555) >> at sun.applet.PluginAppletViewer.paint(PluginAppletViewer.java:1550) >> at >> sun.applet.PluginAppletViewer.update(PluginAppletViewer.java:1566) >> at sun.awt.RepaintArea.updateComponent(RepaintArea.java:255) >> at sun.awt.X11.XRepaintArea.updateComponent(XRepaintArea.java:60) >> at sun.awt.RepaintArea.paint(RepaintArea.java:232) >> at sun.awt.X11.XComponentPeer.handleEvent(XComponentPeer.java:591) >> at java.awt.Component.dispatchEventImpl(Component.java:4937) >> at java.awt.Container.dispatchEventImpl(Container.java:2287) >> at java.awt.Window.dispatchEventImpl(Window.java:2719) >> at java.awt.Component.dispatchEvent(Component.java:4687) >> at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:729) >> at java.awt.EventQueue.access$200(EventQueue.java:103) >> at java.awt.EventQueue$3.run(EventQueue.java:688) >> at java.awt.EventQueue$3.run(EventQueue.java:686) >> at java.security.AccessController.doPrivileged(Native Method) >> at java.security.ProtectionDomain >> $1.doIntersectionPrivilege(ProtectionDomain.java:76) >> at java.security.ProtectionDomain >> $1.doIntersectionPrivilege(ProtectionDomain.java:87) >> at java.awt.EventQueue$4.run(EventQueue.java:702) >> at java.awt.EventQueue$4.run(EventQueue.java:700) >> at java.security.AccessController.doPrivileged(Native Method) >> at java.security.ProtectionDomain >> $1.doIntersectionPrivilege(ProtectionDomain.java:76) >> at java.awt.EventQueue.dispatchEvent(EventQueue.java:699) >> at >> java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:242) >> >> at >> java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:161) >> >> at >> java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:150) >> >> at >> java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:146) >> at >> java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:138) >> at java.awt.EventDispatchThread.run(EventDispatchThread.java:91) >> >> Exception in thread "Thread-6" java.lang.NullPointerException >> at sun.applet.PluginAppletViewer$8.run(PluginAppletViewer.java:1485) >> at java.lang.Thread.run(Thread.java:722) >> >> with kind regards >> thomas >> >>> >>> Happy hacking, >>> -Adam >>> >>> >>> >> >> >> > Fix: > diff -r 83e496086fea > netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java > --- a/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java > Wed Jun 05 15:12:01 2013 -0400 > +++ b/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java > Thu Jun 06 16:05:09 2013 +0200 > @@ -427,7 +427,9 @@ > jrePath = jreSetting.getValue(); > } > } catch (Exception ex) { > - ex.printStackTrace(); > + if (JNLPRuntime.isDebug()){ > + ex.printStackTrace(); > + } I am a bit weary of debuggifying *all* exceptions this way, just because it can even silence array bound exceptions, and I don't search through the debug logs much unless I have a specific issue in mind. I don't insist though. > } > > File jreFile; > @@ -530,6 +532,9 @@ > try { > return parsePropertiesFile(file); > } catch (IOException e) { > + if (JNLPRuntime.isDebug()){ > + e.printStackTrace(); > + } This one is OK > return null; > } > } > diff -r 83e496086fea > plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Wed > Jun 05 15:12:01 2013 -0400 > +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Thu > Jun 06 16:05:09 2013 +0200 > @@ -1547,7 +1547,9 @@ > > // If the image or the graphics don't exist, create new ones > if (bufFrameImg == null || bufFrameImgGraphics == null) { > - bufFrameImg = createImage(getWidth(), getHeight()); > + // althoug invisible applets do not have right to palint > + // we rather paint to 1x1 to be sure all callabck will be > completed This looks OK to go in. Spelling: althoug -> although, palint -> paint, callabck -> callbacks > + bufFrameImg = createImage(Math.max(1, getWidth()), > Math.max(1, getHeight())); > bufFrameImgGraphics = bufFrameImg.getGraphics(); > } > Reproducer looks good, thanks for the test. Cheers, -Adam From aazores at redhat.com Thu Jun 6 08:07:53 2013 From: aazores at redhat.com (Andrew Azores) Date: Thu, 06 Jun 2013 11:07:53 -0400 Subject: [rfc][icedtea-web] Stripping semicolon tags from jar urls In-Reply-To: <51ADFB00.2040009@redhat.com> References: <51ACCCFD.9080505@redhat.com> <51ADAA3A.8090809@redhat.com> <51ADEA27.1060501@redhat.com> <51ADFB00.2040009@redhat.com> Message-ID: <51B0A5C9.5050704@redhat.com> Changelog: * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: added stripHttpPathParams method to remove semicolon-delimited "tags" from end of JAR URLs * tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java: added test case for new method in TinyHttpdImpl * tests/reproducers/simple/StripHttpPathParams/resources/StripHttpPathParams.html: browser-launched applet test case for reproducer * tests/reproducers/simple/StripHttpPathParams/resources/StripHttpPathParams.jnlp: JNLP test case for reproducer * tests/reproducers/simple/StripHttpPathParams/srcs/StripHttpPathParams.java: reproducer * tests/reproducers/simple/StripHttpPathParams/testcases/StripHttpPathParamsTest.java: reproducer Moved the semicolon-stripping logic out of Parser since it turns out it wasn't needed there anymore, but it was needed for TinyHttpdImpl. Changed unit testing to target this instead. Fixed existing reproducer and added HTML applet test case. Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: fix.patch Type: text/x-patch Size: 2144 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/7d3a09b1/fix.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: reproducer.patch Type: text/x-patch Size: 10371 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/7d3a09b1/reproducer.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: unit_test.patch Type: text/x-patch Size: 1604 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/7d3a09b1/unit_test.patch From jvanek at icedtea.classpath.org Thu Jun 6 08:13:05 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 06 Jun 2013 15:13:05 +0000 Subject: /hg/release/icedtea-web-1.3: Made all tests running wit junit4.1... Message-ID: changeset 3c5e0952d876 in /hg/release/icedtea-web-1.3 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.3?cmd=changeset;node=3c5e0952d876 author: Jiri Vanek date: Thu Jun 06 17:09:54 2013 +0200 Made all tests running wit junit4.10 and higher * tests/junit-runner/CommandLine.java: (runMain) is no longer overriding and (runMainAndExit) is now calling System.exit rather then system.exit diffstat: ChangeLog | 6 ++++++ tests/junit-runner/CommandLine.java | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diffs (28 lines): diff -r ff0d07a33ad2 -r 3c5e0952d876 ChangeLog --- a/ChangeLog Thu May 02 13:55:23 2013 -0400 +++ b/ChangeLog Thu Jun 06 17:09:54 2013 +0200 @@ -1,3 +1,9 @@ +2013-06-06 Jiri Vanek + + Made all tests running wit junit4.10 and higher + * tests/junit-runner/CommandLine.java: (runMain) is no longer overriding + and (runMainAndExit) is now calling System.exit rather then system.exit + 2013-05-02 Adam Domurad Ensure document-base is properly encoded. diff -r ff0d07a33ad2 -r 3c5e0952d876 tests/junit-runner/CommandLine.java --- a/tests/junit-runner/CommandLine.java Thu May 02 13:55:23 2013 -0400 +++ b/tests/junit-runner/CommandLine.java Thu Jun 06 17:09:54 2013 +0200 @@ -26,10 +26,9 @@ public static void runMainAndExit(JUnitSystem system, String... args) { new CommandLine().runMain(system, args); - system.exit(0); + System.exit(0); } - @Override public Result runMain(JUnitSystem system, String... args) { List> classes = new ArrayList>(); List missingClasses = new ArrayList(); From jvanek at icedtea.classpath.org Thu Jun 6 08:13:28 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 06 Jun 2013 15:13:28 +0000 Subject: /hg/release/icedtea-web-1.4: 2 new changesets Message-ID: changeset 49e141f43b54 in /hg/release/icedtea-web-1.4 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=49e141f43b54 author: Jiri Vanek date: Thu Jun 06 16:59:47 2013 +0200 Silenced deployment.properties and zero size applet exceptions with tests changeset f9a77057c524 in /hg/release/icedtea-web-1.4 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=f9a77057c524 author: Jiri Vanek date: Thu Jun 06 17:08:19 2013 +0200 Made all tests running wit junit4.10 and higher * tests/junit-runner/CommandLine.java: (runMain) is no longer overriding and (runMainAndExit) is now calling System.exit rather then system.exit diffstat: ChangeLog | 22 +++++ netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java | 7 +- plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 4 +- tests/junit-runner/CommandLine.java | 3 +- tests/reproducers/simple/AppletTest/resources/appletZeroH.html | 44 ++++++++++ tests/reproducers/simple/AppletTest/resources/appletZeroW.html | 44 ++++++++++ tests/reproducers/simple/AppletTest/resources/appletZeroWH.html | 44 ++++++++++ tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java | 27 +++++- 8 files changed, 190 insertions(+), 5 deletions(-) diffs (265 lines): diff -r 6990997b492c -r f9a77057c524 ChangeLog --- a/ChangeLog Tue Jun 04 17:36:17 2013 +0200 +++ b/ChangeLog Thu Jun 06 17:08:19 2013 +0200 @@ -1,3 +1,25 @@ +2013-06-06 Jiri Vanek + + Made all tests running wit junit4.10 and higher + * tests/junit-runner/CommandLine.java: (runMain) is no longer overriding + and (runMainAndExit) is now calling System.exit rather then system.exit + +2013-06-06 Jiri Vanek + + Silenced deployment.properties and zero size applet exceptions with tests + * netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java: + (findSystemConfigFile) and (loadProperties) now prints already cough exception + only in debug mode + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: (paint) + now paints into 1 x 1 applet instead of 0 x 0 in case of 0 x 0 applet + * tests/reproducers/simple/AppletTest/resources/appletZeroH.html: new file + * tests/reproducers/simple/AppletTest/resources/appletZeroW.html: new file + * tests/reproducers/simple/AppletTest/resources/appletZeroWH.html: new file + - testing launchers with zero as width, height or both + * tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java: + added launchers and evaluations for three new htmls - (appletZeroWH) + (appletZeroW) (appletZeroH) + 2013-06-04 Jiri Vanek * netx/net/sourceforge/jnlp/resources/Messages.properties: diff -r 6990997b492c -r f9a77057c524 netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java --- a/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Tue Jun 04 17:36:17 2013 +0200 +++ b/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Thu Jun 06 17:08:19 2013 +0200 @@ -427,7 +427,9 @@ jrePath = jreSetting.getValue(); } } catch (Exception ex) { - ex.printStackTrace(); + if (JNLPRuntime.isDebug()){ + ex.printStackTrace(); + } } File jreFile; @@ -530,6 +532,9 @@ try { return parsePropertiesFile(file); } catch (IOException e) { + if (JNLPRuntime.isDebug()){ + e.printStackTrace(); + } return null; } } diff -r 6990997b492c -r f9a77057c524 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Tue Jun 04 17:36:17 2013 +0200 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Thu Jun 06 17:08:19 2013 +0200 @@ -1538,7 +1538,9 @@ // If the image or the graphics don't exist, create new ones if (bufFrameImg == null || bufFrameImgGraphics == null) { - bufFrameImg = createImage(getWidth(), getHeight()); + // although invisible applets do not have right to paint + // we rather paint to 1x1 to be sure all callbacks will be completed + bufFrameImg = createImage(Math.max(1, getWidth()), Math.max(1, getHeight())); bufFrameImgGraphics = bufFrameImg.getGraphics(); } diff -r 6990997b492c -r f9a77057c524 tests/junit-runner/CommandLine.java --- a/tests/junit-runner/CommandLine.java Tue Jun 04 17:36:17 2013 +0200 +++ b/tests/junit-runner/CommandLine.java Thu Jun 06 17:08:19 2013 +0200 @@ -26,10 +26,9 @@ public static void runMainAndExit(JUnitSystem system, String... args) { new CommandLine().runMain(system, args); - system.exit(0); + System.exit(0); } - @Override public Result runMain(JUnitSystem system, String... args) { List> classes = new ArrayList>(); List missingClasses = new ArrayList(); diff -r 6990997b492c -r f9a77057c524 tests/reproducers/simple/AppletTest/resources/appletZeroH.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/AppletTest/resources/appletZeroH.html Thu Jun 06 17:08:19 2013 +0200 @@ -0,0 +1,44 @@ + + +

+ + +

+ + diff -r 6990997b492c -r f9a77057c524 tests/reproducers/simple/AppletTest/resources/appletZeroW.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/AppletTest/resources/appletZeroW.html Thu Jun 06 17:08:19 2013 +0200 @@ -0,0 +1,44 @@ + + +

+ + +

+ + diff -r 6990997b492c -r f9a77057c524 tests/reproducers/simple/AppletTest/resources/appletZeroWH.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/AppletTest/resources/appletZeroWH.html Thu Jun 06 17:08:19 2013 +0200 @@ -0,0 +1,44 @@ + + +

+ + +

+ + diff -r 6990997b492c -r f9a77057c524 tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java --- a/tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java Tue Jun 04 17:36:17 2013 +0200 +++ b/tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java Thu Jun 06 17:08:19 2013 +0200 @@ -1,4 +1,4 @@ -/* AppletTestTests.java +/* Copyright (C) 2011 Red Hat, Inc. This file is part of IcedTea. @@ -154,4 +154,29 @@ ServerAccess.PROCESS_TIMEOUT = 20 * 1000; //back to normal } } + + + @Test + @TestInBrowsers(testIn = {Browsers.one}) + @NeedsDisplay + public void appletZeroWH() throws Exception { + ProcessResult pr = server.executeBrowser("/appletZeroWH.html", new CountingClosingListenerImpl(), new CountingClosingListenerImpl()); + evaluateApplet(pr, false); + } + + @Test + @TestInBrowsers(testIn = {Browsers.one}) + @NeedsDisplay + public void appletZeroW() throws Exception { + ProcessResult pr = server.executeBrowser("/appletZeroW.html", new CountingClosingListenerImpl(), new CountingClosingListenerImpl()); + evaluateApplet(pr, false); + } + + @Test + @TestInBrowsers(testIn = {Browsers.one}) + @NeedsDisplay + public void appletZeroH() throws Exception { + ProcessResult pr = server.executeBrowser("/appletZeroH.html", new CountingClosingListenerImpl(), new CountingClosingListenerImpl()); + evaluateApplet(pr, false); + } } From jvanek at icedtea.classpath.org Thu Jun 6 08:13:53 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 06 Jun 2013 15:13:53 +0000 Subject: /hg/icedtea-web: 3 new changesets Message-ID: changeset 229f9b1f594a in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=229f9b1f594a author: Jiri Vanek date: Thu Jun 06 16:39:44 2013 +0200 Enhanced manifest * netx.manifest.in: added Implementation-URL, Implementation-Vendor, Specification-Title, Specification-URL, Specification-Vendor and Specification-Version entries changeset 3e8df126cba2 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=3e8df126cba2 author: Jiri Vanek date: Thu Jun 06 16:57:14 2013 +0200 Silenced deployment.properties and zero size applet exceptions with tests changeset e8341834febd in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=e8341834febd author: Jiri Vanek date: Thu Jun 06 17:07:28 2013 +0200 Made all tests running wit junit4.10 and higher * tests/junit-runner/CommandLine.java: (runMain) is no longer overriding and (runMainAndExit) is now calling System.exit rather then system.exit diffstat: ChangeLog | 30 ++++++ netx.manifest.in | 6 + netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java | 7 +- plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 4 +- tests/junit-runner/CommandLine.java | 3 +- tests/reproducers/simple/AppletTest/resources/appletZeroH.html | 44 ++++++++++ tests/reproducers/simple/AppletTest/resources/appletZeroW.html | 44 ++++++++++ tests/reproducers/simple/AppletTest/resources/appletZeroWH.html | 44 ++++++++++ tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java | 27 +++++- 9 files changed, 204 insertions(+), 5 deletions(-) diffs (285 lines): diff -r 83e496086fea -r e8341834febd ChangeLog --- a/ChangeLog Wed Jun 05 15:12:01 2013 -0400 +++ b/ChangeLog Thu Jun 06 17:07:28 2013 +0200 @@ -1,3 +1,33 @@ +2013-06-06 Jiri Vanek + + Made all tests running wit junit4.10 and higher + * tests/junit-runner/CommandLine.java: (runMain) is no longer overriding + and (runMainAndExit) is now calling System.exit rather then system.exit + +2013-06-06 Jiri Vanek + + Silenced deployment.properties and zero size applet exceptions with tests + * netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java: + (findSystemConfigFile) and (loadProperties) now prints already cough exception + only in debug mode + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: (paint) + now paints into 1 x 1 applet instead of 0 x 0 in case of 0 x 0 applet + * tests/reproducers/simple/AppletTest/resources/appletZeroH.html: new file + * tests/reproducers/simple/AppletTest/resources/appletZeroW.html: new file + * tests/reproducers/simple/AppletTest/resources/appletZeroWH.html: new file + - testing launchers with zero as width, height or both + * tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java: + added launchers and evaluations for three new htmls - (appletZeroWH) + (appletZeroW) (appletZeroH) + +2013-06-06 Jiri Vanek + Jacob Wisor + + Enhanced manifest + * netx.manifest.in: added Implementation-URL, Implementation-Vendor, + Specification-Title, Specification-URL, Specification-Vendor and + Specification-Version entries + 2013-06-05 Adam Domurad Fix PR1465 diff -r 83e496086fea -r e8341834febd netx.manifest.in --- a/netx.manifest.in Wed Jun 05 15:12:01 2013 -0400 +++ b/netx.manifest.in Thu Jun 06 17:07:28 2013 +0200 @@ -1,2 +1,8 @@ Implementation-Title: @PACKAGE_NAME@ Implementation-Version: @FULL_VERSION@ +Implementation-URL: @PACKAGE_URL@ +Implementation-Vendor: IcedTea +Specification-Title: JSR56: Java Network Launching Protocol and API +Specification-URL: http://jcp.org/aboutJava/communityprocess/mrel/jsr056 +Specification-Vendor: Java Community Process +Specification-Version: 6.0 diff -r 83e496086fea -r e8341834febd netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java --- a/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Wed Jun 05 15:12:01 2013 -0400 +++ b/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Thu Jun 06 17:07:28 2013 +0200 @@ -427,7 +427,9 @@ jrePath = jreSetting.getValue(); } } catch (Exception ex) { - ex.printStackTrace(); + if (JNLPRuntime.isDebug()){ + ex.printStackTrace(); + } } File jreFile; @@ -530,6 +532,9 @@ try { return parsePropertiesFile(file); } catch (IOException e) { + if (JNLPRuntime.isDebug()){ + e.printStackTrace(); + } return null; } } diff -r 83e496086fea -r e8341834febd plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Wed Jun 05 15:12:01 2013 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Thu Jun 06 17:07:28 2013 +0200 @@ -1547,7 +1547,9 @@ // If the image or the graphics don't exist, create new ones if (bufFrameImg == null || bufFrameImgGraphics == null) { - bufFrameImg = createImage(getWidth(), getHeight()); + // although invisible applets do not have right to paint + // we rather paint to 1x1 to be sure all callbacks will be completed + bufFrameImg = createImage(Math.max(1, getWidth()), Math.max(1, getHeight())); bufFrameImgGraphics = bufFrameImg.getGraphics(); } diff -r 83e496086fea -r e8341834febd tests/junit-runner/CommandLine.java --- a/tests/junit-runner/CommandLine.java Wed Jun 05 15:12:01 2013 -0400 +++ b/tests/junit-runner/CommandLine.java Thu Jun 06 17:07:28 2013 +0200 @@ -26,10 +26,9 @@ public static void runMainAndExit(JUnitSystem system, String... args) { new CommandLine().runMain(system, args); - system.exit(0); + System.exit(0); } - @Override public Result runMain(JUnitSystem system, String... args) { List> classes = new ArrayList>(); List missingClasses = new ArrayList(); diff -r 83e496086fea -r e8341834febd tests/reproducers/simple/AppletTest/resources/appletZeroH.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/AppletTest/resources/appletZeroH.html Thu Jun 06 17:07:28 2013 +0200 @@ -0,0 +1,44 @@ + + +

+ + +

+ + diff -r 83e496086fea -r e8341834febd tests/reproducers/simple/AppletTest/resources/appletZeroW.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/AppletTest/resources/appletZeroW.html Thu Jun 06 17:07:28 2013 +0200 @@ -0,0 +1,44 @@ + + +

+ + +

+ + diff -r 83e496086fea -r e8341834febd tests/reproducers/simple/AppletTest/resources/appletZeroWH.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/AppletTest/resources/appletZeroWH.html Thu Jun 06 17:07:28 2013 +0200 @@ -0,0 +1,44 @@ + + +

+ + +

+ + diff -r 83e496086fea -r e8341834febd tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java --- a/tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java Wed Jun 05 15:12:01 2013 -0400 +++ b/tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java Thu Jun 06 17:07:28 2013 +0200 @@ -1,4 +1,4 @@ -/* AppletTestTests.java +/* Copyright (C) 2011 Red Hat, Inc. This file is part of IcedTea. @@ -154,4 +154,29 @@ ServerAccess.PROCESS_TIMEOUT = 20 * 1000; //back to normal } } + + + @Test + @TestInBrowsers(testIn = {Browsers.one}) + @NeedsDisplay + public void appletZeroWH() throws Exception { + ProcessResult pr = server.executeBrowser("/appletZeroWH.html", new CountingClosingListenerImpl(), new CountingClosingListenerImpl()); + evaluateApplet(pr, false); + } + + @Test + @TestInBrowsers(testIn = {Browsers.one}) + @NeedsDisplay + public void appletZeroW() throws Exception { + ProcessResult pr = server.executeBrowser("/appletZeroW.html", new CountingClosingListenerImpl(), new CountingClosingListenerImpl()); + evaluateApplet(pr, false); + } + + @Test + @TestInBrowsers(testIn = {Browsers.one}) + @NeedsDisplay + public void appletZeroH() throws Exception { + ProcessResult pr = server.executeBrowser("/appletZeroH.html", new CountingClosingListenerImpl(), new CountingClosingListenerImpl()); + evaluateApplet(pr, false); + } } From jvanek at redhat.com Thu Jun 6 08:50:58 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 06 Jun 2013 17:50:58 +0200 Subject: [rfc][icedtea-web] Stripping semicolon tags from jar urls In-Reply-To: <51B0A5C9.5050704@redhat.com> References: <51ACCCFD.9080505@redhat.com> <51ADAA3A.8090809@redhat.com> <51ADEA27.1060501@redhat.com> <51ADFB00.2040009@redhat.com> <51B0A5C9.5050704@redhat.com> Message-ID: <51B0AFE2.3020204@redhat.com> On 06/06/2013 05:07 PM, Andrew Azores wrote: > Changelog: > > * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: added stripHttpPathParams method to > remove semicolon-delimited "tags" from end of JAR URLs > > * tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java: added test case for new > method in TinyHttpdImpl > > * tests/reproducers/simple/StripHttpPathParams/resources/StripHttpPathParams.html: browser-launched > applet test case for reproducer > * tests/reproducers/simple/StripHttpPathParams/resources/StripHttpPathParams.jnlp: JNLP test case > for reproducer > * tests/reproducers/simple/StripHttpPathParams/srcs/StripHttpPathParams.java: reproducer > * tests/reproducers/simple/StripHttpPathParams/testcases/StripHttpPathParamsTest.java: reproducer > > > Moved the semicolon-stripping logic out of Parser since it turns out it wasn't needed there anymore, > but it was needed for TinyHttpdImpl. Changed unit testing to target this instead. Fixed existing > reproducer and added HTML applet test case. > After discussion Nice work on this already ! FileInputStream f = new FileInputStream(pp); f.read(b); + f.close(); String content = "" Are you sure with this close? I'm not.... I'm actually against this line unless it is defended. Before so - please run all reproducers and double check that this line have not caused any issues. rest is only cosmetic changes please: public static String stripHttpPathParams(String url) { + if (url == null) + return null; + Brackets needed around condition body + public void testStripHttpPathParamsLaunch() throws Exception { + ProcessResult pr = server.executeJavawsHeadless("/StripHttpPathParams.jnlp"); + Assert.assertTrue("stdout should contain \"running\" but did not", pr.stdout.contains("running")); + } Indentation issue + System.out.println("*** APPLET RUNNING ***"); + System.exit(0); The exit is redundant for applets. Pelase remove + Assert.assertTrue("stdout should contain \"*** APPLET RUNNING ***\" but did not", pr.stdout.contains("*** APPLET RUNNING ***")); + Assert.assertTrue(pr.wasTerminated); Please do not copypaste - the *** APPLET RUNNING *** is known consatnt in test-extensions. + Assert.assertTrue(pr.wasTerminated); I know this is wide spread across the tests, but I believe it is wrong. Unless you strongly desire to keep it here, please remove. Unittests do also have strange indentation. Are you using some formatting tool? Both Netbens and Eclipse can do the job for you. In icedtea-web is .settiings directory with config files for ITW if you wont. After above is fixed, then I will push for you. Also one more nit. As separate changeset, can you please extract the: p = URLDecoder.decode(p, "UTF-8"); p = p.replaceAll("\\?.*", ""); p = (".".concat((p.endsWith("/")) ? p.concat("index.html") : p)).replace('/', File.separatorChar); p = stripHttpPathParams(p); (and maybe few more lines) To some method urlToFile or similar and - especially - with unittes in test-extensions-tests as you are already skilled in. The future urlToFile have already grown a bit and it is not clear what is is supposed to do :) Good job! Thankx for your code! J. From andrew at icedtea.classpath.org Thu Jun 6 09:06:38 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 06 Jun 2013 16:06:38 +0000 Subject: /hg/icedtea7: 5 new changesets Message-ID: changeset 76348ab9702d in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=76348ab9702d author: Andrew John Hughes date: Thu Jun 06 14:23:03 2013 +0100 Actually invoke clean-cryptocheck. 2013-06-06 Andrew John Hughes * Makefile.am: (.PHONY): Add clean-cryptocheck. (clean-local): Likewise. changeset 8a402a3b4727 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=8a402a3b4727 author: Andrew John Hughes date: Thu Jun 06 14:28:36 2013 +0100 PR1358: Make XRender mandatory. 2013-03-21 Michal Vyskocil PR1358: Make XRender mandatory. * configure.ac: Remove check on ENABLE_XRENDER variable which is no longer set. changeset cec6f644a4db in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=cec6f644a4db author: Andrew John Hughes date: Thu Jun 06 17:03:19 2013 +0100 PR1360: Check for /usr/lib64 JVMs and generic JPackage alternative 2013-06-06 Andrew John Hughes * INSTALL: Synchronise list of VMs with macro in acinclude.m4. * acinclude.m4: Provide separate output for user specified JDKs and the checking process. Extend the list of JVMs to include more from Fedora & RHEL and the newer Gentoo variants. * NEWS: Updated. 2013-03-21 Michal Vyskocil PR1360: Check for /usr/lib64 JVMs and generic JPackage alternative * INSTALL: Add /etc/alternatives/java_sdk_openjdk. * acinclude.m4: Likewise. 2013-06-06 Andrew John Hughes * AUTHORS: Updated with Michal. changeset fdf24edd4879 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=fdf24edd4879 author: Andrew John Hughes date: Thu Jun 06 17:05:25 2013 +0100 Merge THANKYOU into AUTHORS for simplicity. 2013-06-06 Andrew John Hughes * AUTHORS: Include entries from THANKYOU. * THANKYOU: Removed. changeset 070a86b396c8 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=070a86b396c8 author: Andrew John Hughes date: Thu Jun 06 17:06:23 2013 +0100 Update my Red Hat e-mail address. 2013-06-06 Andrew John Hughes * ChangeLog: Update my Red Hat e-mail address. diffstat: AUTHORS | 5 +- ChangeLog | 916 ++++++++++++++++++++++++++++++---------------------------- INSTALL | 7 +- Makefile.am | 6 +- NEWS | 2 + THANKYOU | 9 - acinclude.m4 | 24 +- configure.ac | 11 +- 8 files changed, 515 insertions(+), 465 deletions(-) diffs (truncated from 3882 to 500 lines): diff -r bfcb188e2568 -r 070a86b396c8 AUTHORS --- a/AUTHORS Wed Jun 05 23:01:32 2013 +0100 +++ b/AUTHORS Thu Jun 06 17:06:23 2013 +0100 @@ -14,7 +14,8 @@ Kyle Galloway Dennis Gilmore Andrew Haley -Andrew John Hughes +C. K. Jester-Young +Andrew John Hughes Tomas Hurka Ioana Ivan Matthias Klose @@ -26,6 +27,7 @@ Raif Naffah Parag Nemade Xerxes R??nby +Damien Raude-Morvan Mark Reinhold Bernhard Rosenkr??nzer Marc Schoenefeld @@ -36,6 +38,7 @@ Christian Thalinger Dalibor Topic Arnaud Vandyck +Michal Vyskocil Mark Wielaard Yi Zhan diff -r bfcb188e2568 -r 070a86b396c8 ChangeLog --- a/ChangeLog Wed Jun 05 23:01:32 2013 +0100 +++ b/ChangeLog Thu Jun 06 17:06:23 2013 +0100 @@ -1,3 +1,45 @@ +2013-06-06 Andrew John Hughes + + * ChangeLog: Update my Red Hat e-mail address. + +2013-06-06 Andrew John Hughes + + * AUTHORS: Include entries from THANKYOU. + * THANKYOU: Removed. + +2013-06-06 Andrew John Hughes + + * INSTALL: + Synchronise list of VMs with macro in acinclude.m4. + * acinclude.m4: Provide separate output for user + specified JDKs and the checking process. Extend + the list of JVMs to include more from Fedora & + RHEL and the newer Gentoo variants. + * NEWS: Updated. + +2013-03-21 Michal Vyskocil + + PR1360: Check for /usr/lib64 JVMs and generic JPackage alternative + * INSTALL: Add /etc/alternatives/java_sdk_openjdk. + * acinclude.m4: Likewise. + +2013-06-06 Andrew John Hughes + + * AUTHORS: Updated with Michal. + +2013-03-21 Michal Vyskocil + + PR1358: Make XRender mandatory. + * configure.ac: + Remove check on ENABLE_XRENDER variable + which is no longer set. + +2013-06-06 Andrew John Hughes + + * Makefile.am: + (.PHONY): Add clean-cryptocheck. + (clean-local): Likewise. + 2013-06-05 Andrew John Hughes * Makefile.am: @@ -1102,7 +1144,7 @@ Extend with additional cases in HotSpot and the JDK. -2012-03-20 Andrew John Hughes +2012-03-20 Andrew John Hughes * acinclude.m4: (IT_FIND_COMPILER): Define only once and @@ -1151,7 +1193,7 @@ (versioning): Don't add a suffix if building the default project, 'icedtea'. -2012-05-25 Andrew John Hughes +2012-05-25 Andrew John Hughes * Makefile.am: (OPENJDK_VERSION): Bump to b10. @@ -1181,13 +1223,13 @@ generation application to fail, presumably due to variable moving from private to package-private). -2012-05-23 Andrew John Hughes +2012-05-23 Andrew John Hughes * Makefile.am: (extract-openjdk): Mirror replacement of '.' with '-' done by Mercurial server when creating tarball. -2012-05-23 Andrew John Hughes +2012-05-23 Andrew John Hughes (CORBA_CHANGESET): Bump to bring in typo fix. (CORBA_SHA256SUM): Likewise. @@ -1195,16 +1237,16 @@ digest cloning fix. (JDK_SHA256SUM): Likewise. -2012-05-23 Andrew John Hughes +2012-05-23 Andrew John Hughes * NEWS: Sync with 2.2 branch. -2012-05-23 Andrew John Hughes +2012-05-23 Andrew John Hughes * configure.ac: Bump to 2.3pre. * NEWS: Add 2.3 section. -2012-05-23 Andrew John Hughes +2012-05-23 Andrew John Hughes * patches/boot/corba-defs.patch: Removed. Makes changes which aren't needed @@ -1222,7 +1264,7 @@ Don't set JAVACFLAGS to point to non-existent rt.jar in {JDK_HOME}/lib. Point to just-built langtools instead. -2011-03-02 Andrew John Hughes +2011-03-02 Andrew John Hughes * Makefile.am: (icedtea): Explicitly set -j1 for the @@ -1233,13 +1275,13 @@ (icedtea-debug): Likewise. (icedtea-ecj): Likewise. -2012-05-21 Andrew John Hughes +2012-05-21 Andrew John Hughes (JDK_CHANGESET): Bump to bring in the aliasing and wrap mode fixes. (JDK_SHA256SUM): Likewise. -2012-05-21 Andrew John Hughes +2012-05-21 Andrew John Hughes * AUTHORS: Add Ralph Sennhauser. @@ -1264,7 +1306,7 @@ * pax-mark-vm.in: Script to PaX mark a JDK image. -2012-05-02 Andrew John Hughes +2012-05-02 Andrew John Hughes Bump to jdk7u4 b13. * Makefile.am: @@ -1290,7 +1332,7 @@ * patches/boot/ecj-multicatch.patch: Likewise. * patches/boot/ecj-trywithresources.patch: Likewise. -2012-04-23 Andrew John Hughes +2012-04-23 Andrew John Hughes * Makefile.am: (HOTSPOT_CHANGESET): Bump to bring in @@ -1299,20 +1341,20 @@ (ICEDTEA_ENV): Set ALT_STRIP_POLICY to no_strip. -2012-04-12 Andrew John Hughes +2012-04-12 Andrew John Hughes * Makefile.am: (download-openjdk): Fix syntax. (download-cacao): Likewise. (download-jamvm): Likewise. -2012-04-11 Andrew John Hughes +2012-04-11 Andrew John Hughes * Makefile.am: (JDK_CHANGESET): Bump to include GCC 4.7 build fixes. (JDK_SHA256SUM): Likewise. -2012-04-11 Andrew John Hughes +2012-04-11 Andrew John Hughes * Makefile.am: (download-openjdk): Don't download unless @@ -1324,13 +1366,13 @@ --disable-downloading. * configure.ac: Call IT_CHECK_FOR_DOWNLOADING. -2012-04-06 Andrew John Hughes +2012-04-06 Andrew John Hughes * Makefile.am: (JDK_CHANGESET): Bump to include generalied crypto tests. (JDK_SHA256SUM): Likewise. -2012-04-06 Andrew John Hughes +2012-04-06 Andrew John Hughes * acinclude.m4: (IT_CHECK_FOR_GTK): Work with glib >= 2.32 @@ -1347,13 +1389,13 @@ * test/tapset/jstaptest.pl: thread_start and thread_stop thread id can be any positive number. -2012-03-23 Andrew John Hughes +2012-03-23 Andrew John Hughes * patches/boot/pr39408.patch, * patches/cacao/launcher.patch: Regenerated. -2012-03-22 Andrew John Hughes +2012-03-22 Andrew John Hughes * patches/systemtap-alloc-size-workaround.patch: Removed; upstream. @@ -1645,17 +1687,17 @@ (HOTSPOT_CHANGESET): Add latest Zero HS22 fixes. (HOTSPOT_SHA256SUM): Likewise. -2012-02-15 Andrew John Hughes +2012-02-15 Andrew John Hughes * NEWS: Add 2.0.1 and 2.1.0 release notes. * configure.ac: Bump to 2.2pre. -2012-02-14 Andrew John Hughes +2012-02-14 Andrew John Hughes * NEWS: Update with OpenJDK fixes and add release date for 2.1. -2012-02-14 Andrew John Hughes +2012-02-14 Andrew John Hughes (HOTSPOT_CHANGESET): Add latest fixes: 7140882, 7049339 and 7091528. @@ -1676,20 +1718,20 @@ to work with latest OpenJDK ALT_HOTSPOT_IMPORT_PATH functionality. * patches/cacao/version.patch: Removed, replaced by upstream CACAO changeset 30edcde287d9. -2012-02-08 Andrew John Hughes +2012-02-08 Andrew John Hughes (HOTSPOT_CHANGESET): Bump to fix HotSpot merge issue. (HOTSPOT_SHA256SUM): Likewise. -2012-02-08 Andrew John Hughes +2012-02-08 Andrew John Hughes * Makefile.am: Move JDK_UPDATE_VERSION and COMBINED_VERSION to top of file with OPENJDK_VERSION. (JDK_UPDATE_VERSION): Set to 02 for u2. -2012-02-08 Andrew John Hughes +2012-02-08 Andrew John Hughes * Makefile.am: (CORBA_CHANGESET): Updated. @@ -1751,7 +1793,7 @@ (HOTSPOT_CHANGESET): Updated. (HOTSPOT_SHA256SUM): Updated. -2011-10-19 Andrew John Hughes +2011-10-19 Andrew John Hughes * NEWS: Move recent JamVM changes to correct section. Sync with 2.0. @@ -1776,13 +1818,13 @@ (JAMVM_VERSION): Updated JamVM to 2011-10-07 revision. (JAMVM_SHA256SUM): Updated. -2011-10-19 Andrew John Hughes +2011-10-19 Andrew John Hughes * NEWS: Set release date of 2.0 and add section for 2.1. * configure.ac: Bump to 2.1pre. -2011-10-19 Andrew John Hughes +2011-10-19 Andrew John Hughes * patches/cacao/6714758.patch: Removed; upstream. @@ -1791,7 +1833,7 @@ (extract-cacao): Use gzip not bzip2. (extract-jamvm): Explicitly use gzip. -2011-10-19 Andrew John Hughes +2011-10-19 Andrew John Hughes * Makefile.am: Bring in security updates. (CORBA_CHANGESET): Updated. @@ -1804,13 +1846,13 @@ after 7046823 is applied. * NEWS: Updated. -2011-09-30 Andrew John Hughes +2011-09-30 Andrew John Hughes * acinclude.m4: (IT_CHECK_FOR_GIO): Require 2.26 and above for GSettings. -2011-09-30 Andrew John Hughes +2011-09-30 Andrew John Hughes Bump changesets to bring in fix which turns off forced -Werror. @@ -1835,7 +1877,7 @@ * Makefile.am: Upgrade CACAO version, use .tar.gz archive -2011-09-30 Andrew John Hughes +2011-09-30 Andrew John Hughes * NEWS: Cleanup. @@ -1863,14 +1905,14 @@ (CACAO_VERSION): Updated CACAO to 2011-08-08 revision. (CACAO_SHA256SUM): Updated. -2010-11-19 Andrew John Hughes +2010-11-19 Andrew John Hughes * Makefile.am: (CACAO_BASE_URL): Switch to using IcedTea server for CACAO drops too. (CACAO_URL): Likewise. -2011-09-30 Andrew John Hughes +2011-09-30 Andrew John Hughes * Makefile.am: (ICEDTEA_BOOT_PATCHES): Only apply @@ -1882,20 +1924,20 @@ 1.7 bytecode. * configure.ac: Call IT_BYTECODE7_CHECK. -2011-09-27 Andrew John Hughes +2011-09-27 Andrew John Hughes * Makefile.am: (EXTRA_DIST): Remove patch directories that no longer exist. -2011-09-27 Andrew John Hughes +2011-09-27 Andrew John Hughes * acinclude.m4: (AC_CHECK_FOR_JDK): Look for IcedTea7 JDKs. Don't check for IcedTea6 JDKs when bootstrapping until PR716 is fixed. -2011-09-27 Andrew John Hughes +2011-09-27 Andrew John Hughes PR790: Include JAXP, JAF and JAXWS sources directly in OpenJDK tree, removing the need for drop tarballs. @@ -1950,7 +1992,7 @@ * acinclude.m4: Add devel package suggestions for epoll/xattr check failure. -2011-09-27 Andrew John Hughes +2011-09-27 Andrew John Hughes * acinclude.m4: Always quote using '[' and ']' in macro calls. @@ -1960,7 +2002,7 @@ (IT_CHECK_FOR_CUPS): Likewise. (IT_CHECK_FOR_SYSCALLS): Likewise. -2011-09-27 Andrew John Hughes +2011-09-27 Andrew John Hughes * acinclude.m4: (IT_CHECK_FOR_SYSCALLS): Include checks @@ -1986,7 +2028,7 @@ (JAMVM_VERSION): Updated JamVM to 2011-09-24 revision. (JAMVM_SHA256SUM): Updated. -2011-09-21 Andrew John Hughes +2011-09-21 Andrew John Hughes PR717: Remove all non-bootstrap non-conditional patches. @@ -2045,14 +2087,14 @@ Updated against upstream disable-intree-ec. * NEWS: Updated. -2011-09-21 Andrew John Hughes +2011-09-21 Andrew John Hughes * Makefile.am: (JDK_CHANGESET): Include Damian's compilation fix for building without USE_SYSTEM_CUPS. (JDK_SHA256SUM): Likewise. -2011-09-21 Andrew John Hughes +2011-09-21 Andrew John Hughes * Makefile.am: (ICEDTEA_ENV): Set COMPILE_AGAINST_SYSCALLS @@ -2063,7 +2105,7 @@ *at). * configure.ac: Call IT_CHECK_FOR_SYSCALLS. -2011-09-21 Andrew John Hughes +2011-09-21 Andrew John Hughes * Makefile.am: (JDK_CHANGESET): Bump to bring in latest @@ -2084,21 +2126,21 @@ Add calls to IT_CHECK_FOR_GTK, IT_CHECK_FOR_GIO, IT_CHECK_FOR_FONTCONFIG and IT_CHECK_FOR_CUPS. -2011-09-09 Andrew John Hughes +2011-09-09 Andrew John Hughes * Makefile.am: (JDK_CHANGESET): Bring in fix for another duplicate gboolean definition. (JDK_SHA256SUM): Likewise. -2011-09-08 Andrew John Hughes +2011-09-08 Andrew John Hughes * Makefile.am: (JDK_CHANGESET): Bring in fix for duplicate gboolean definition. (JDK_SHA256SUM): Likewise. -2011-09-06 Andrew John Hughes +2011-09-06 Andrew John Hughes * patches/hotspot-gcc-pr36917.patch: Redundant, was removed from IcedTea6. @@ -2189,12 +2231,12 @@ (JAMVM_VERSION): Updated JamVM to 2011-08-08 revision. (JAMVM_SHA256SUM): Updated. -2011-08-03 Andrew John Hughes +2011-08-03 Andrew John Hughes * NEWS: Updated with changes from Pavel's HotSpot update. -2011-08-03 Andrew John Hughes +2011-08-03 Andrew John Hughes * Makefile.am: (JDK_CHANGESET): Updated to bring in @@ -2202,7 +2244,7 @@ (JDK_SHA256SUM): Likewise. * NEWS: Updated. -2011-08-03 Andrew John Hughes +2011-08-03 Andrew John Hughes * Makefile.am: Apply explicit-inner-class-headers patch as required. @@ -2241,7 +2283,7 @@ (JAMVM_VERSION): Updated JamVM to 2011-08-01 revision. (JAMVM_SHA256SUM): Updated. -2011-07-29 Andrew John Hughes +2011-07-29 Andrew John Hughes PR717: All non-bootstrap patches in IcedTea7 should be in the forest or dropped @@ -2283,7 +2325,7 @@ against new forest. * NEWS: Updated. -2011-07-28 Andrew John Hughes +2011-07-28 Andrew John Hughes Bring in new JDK build cleanups and HotSpot fixes for Zero/Shark. @@ -2321,7 +2363,7 @@ (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. From bugzilla-daemon at icedtea.classpath.org Thu Jun 6 09:06:50 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 06 Jun 2013 16:06:50 +0000 Subject: [Bug 1358] [IcedTea7] Make XRender mandatory In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1358 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7?cmd=changeset;node=8a402a3b4727 author: Andrew John Hughes date: Thu Jun 06 14:28:36 2013 +0100 PR1358: Make XRender mandatory. 2013-03-21 Michal Vyskocil PR1358: Make XRender mandatory. * configure.ac: Remove check on ENABLE_XRENDER variable which is no longer set. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/df348dab/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu Jun 6 09:06:56 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 06 Jun 2013 16:06:56 +0000 Subject: [Bug 1360] [IcedTea7] Check for /usr/lib64 JVMs and generic JPackage alternative In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1360 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7?cmd=changeset;node=cec6f644a4db author: Andrew John Hughes date: Thu Jun 06 17:03:19 2013 +0100 PR1360: Check for /usr/lib64 JVMs and generic JPackage alternative 2013-06-06 Andrew John Hughes * INSTALL: Synchronise list of VMs with macro in acinclude.m4. * acinclude.m4: Provide separate output for user specified JDKs and the checking process. Extend the list of JVMs to include more from Fedora & RHEL and the newer Gentoo variants. * NEWS: Updated. 2013-03-21 Michal Vyskocil PR1360: Check for /usr/lib64 JVMs and generic JPackage alternative * INSTALL: Add /etc/alternatives/java_sdk_openjdk. * acinclude.m4: Likewise. 2013-06-06 Andrew John Hughes * AUTHORS: Updated with Michal. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/3a9518e0/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu Jun 6 09:07:19 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 06 Jun 2013 16:07:19 +0000 Subject: [Bug 1360] [IcedTea7] Check for /usr/lib64 JVMs and generic JPackage alternative In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1360 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/149de4e3/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu Jun 6 09:07:20 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 06 Jun 2013 16:07:20 +0000 Subject: [Bug 1274] [TRACKER] IcedTea 2.4.0 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1274 Bug 1274 depends on bug 1360, which changed state. Bug 1360 Summary: [IcedTea7] Check for /usr/lib64 JVMs and generic JPackage alternative http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1360 What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/cfe583f0/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu Jun 6 09:07:39 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 06 Jun 2013 16:07:39 +0000 Subject: [Bug 1358] [IcedTea7] Make XRender mandatory In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1358 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/02351668/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu Jun 6 09:07:39 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 06 Jun 2013 16:07:39 +0000 Subject: [Bug 1274] [TRACKER] IcedTea 2.4.0 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1274 Bug 1274 depends on bug 1358, which changed state. Bug 1358 Summary: [IcedTea7] Make XRender mandatory http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1358 What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/a95d252c/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu Jun 6 10:30:24 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 06 Jun 2013 17:30:24 +0000 Subject: [Bug 1468] A fatal error when working with eclipse juno In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1468 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #1 from Andrew John Hughes --- This is a crash in native code (libsoup) and not part of IcedTea/OpenJDK. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/2a3749b7/attachment.html From andrew at icedtea.classpath.org Thu Jun 6 11:53:12 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 06 Jun 2013 18:53:12 +0000 Subject: /hg/icedtea7: S7191872: Xrender: No text displayed using 64 bit ... Message-ID: changeset 66008a8b7417 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=66008a8b7417 author: Andrew John Hughes date: Thu Jun 06 19:52:57 2013 +0100 S7191872: Xrender: No text displayed using 64 bit JDK on solaris11-sparc S8014469: (tz) Support tzdata2013c S8014618, RH962568: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement PR1435: OpenJDK 7 returns incorrect TrueType font metrics PR728: GTKLookAndFeel does not honor gtk-alternative-button-order 2013-06-06 Andrew John Hughes * Makefile.am, (CORBA_CHANGESET): Update to IcedTea7 forest head. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Mention S7191872, S8014469, S8014618/RH962568, PR1435 and PR728. * hotspot.map: Update to IcedTea7 forest head. diffstat: ChangeLog | 28 ++++++++++++++++++++++++++++ Makefile.am | 24 ++++++++++++------------ NEWS | 5 +++++ hotspot.map | 2 +- 4 files changed, 46 insertions(+), 13 deletions(-) diffs (108 lines): diff -r 070a86b396c8 -r 66008a8b7417 ChangeLog --- a/ChangeLog Thu Jun 06 17:06:23 2013 +0100 +++ b/ChangeLog Thu Jun 06 19:52:57 2013 +0100 @@ -1,3 +1,31 @@ +2013-06-06 Andrew John Hughes + + S7191872: Xrender: No text displayed using + 64 bit JDK on solaris11-sparc + S8014469: (tz) Support tzdata2013c + S8014618, RH962568: Need to strip leading zeros + in TlsPremasterSecret of DHKeyAgreement + PR1435: OpenJDK 7 returns incorrect TrueType + font metrics + PR728: GTKLookAndFeel does not honor + gtk-alternative-button-order + * Makefile.am, + (CORBA_CHANGESET): Update to IcedTea7 forest head. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + * NEWS: Mention S7191872, S8014469, S8014618/RH962568, + PR1435 and PR728. + * hotspot.map: Update to IcedTea7 forest head. + 2013-06-06 Andrew John Hughes * ChangeLog: Update my Red Hat e-mail address. diff -r 070a86b396c8 -r 66008a8b7417 Makefile.am --- a/Makefile.am Thu Jun 06 17:06:23 2013 +0100 +++ b/Makefile.am Thu Jun 06 19:52:57 2013 +0100 @@ -4,19 +4,19 @@ JDK_UPDATE_VERSION = 40 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = 4366e0fe59d5 -JAXP_CHANGESET = 5a11895b645d -JAXWS_CHANGESET = 29619865cc64 -JDK_CHANGESET = 5e20c1a72aa8 -LANGTOOLS_CHANGESET = 718a945bfdb9 -OPENJDK_CHANGESET = 6579f526e5e4 +CORBA_CHANGESET = fd00f67b65c4 +JAXP_CHANGESET = 7dc9a882c6f8 +JAXWS_CHANGESET = ea9a36dfd4ee +JDK_CHANGESET = 3f1f89553b54 +LANGTOOLS_CHANGESET = 68c60cde94a7 +OPENJDK_CHANGESET = 78c6b2167b94 -CORBA_SHA256SUM = b23b0980c704247a0a690f6fb663ec561f56e2fcdc5d69f13d9629d2c1937f32 -JAXP_SHA256SUM = a0f4516cdabb60bea73ce157db3c31c24634bc4058d35257b981b6b1be5114ba -JAXWS_SHA256SUM = 53e63c8b63380f4a34ae955f91455ece2f687dbe3dd47e4c14ac03761cb3daee -JDK_SHA256SUM = 5b9f736df39198eec25a697792783d361e4ea4a8289b4dc7f156bcb307278b0c -LANGTOOLS_SHA256SUM = c412b61b095154fee4c45dc133f2baca3100fecd48b742f80da49a52ec473b02 -OPENJDK_SHA256SUM = 44c3e4a130fe4b76c1ba977ae2251884cefa774b82a24c4415b64395aef9594c +CORBA_SHA256SUM = 57e71ca50c31456ef8a3086cfe81e6ff627ea207645bbd4dced1e73c51528c56 +JAXP_SHA256SUM = 293bcceac6557965c201437b123cef23c5855dbb22b25f487ba87ccdd1991355 +JAXWS_SHA256SUM = 814fc497356289efb153509837cd97d5a019c388f7f9b1ad98247cf445b9c11d +JDK_SHA256SUM = ca8ff71beba0303d2593f97706a8638ea1948d8387a533a16fce70d6bb85bf88 +LANGTOOLS_SHA256SUM = 807e8d5301dee8e0f532096237987f4b812c472e3d9182d349c1b3371676ec59 +OPENJDK_SHA256SUM = 8de6db8e7b249577f8cfbd343de3a76068200af5ead43255e8f77de3ac34a38f CACAO_VERSION = e215e36be9fc CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab diff -r 070a86b396c8 -r 66008a8b7417 NEWS --- a/NEWS Thu Jun 06 17:06:23 2013 +0100 +++ b/NEWS Thu Jun 06 19:52:57 2013 +0100 @@ -547,6 +547,7 @@ - S7191556: (fs) UnixNativeDispatcher.getextmntent should be moved into platform specific code - S7191587: (se) SelectionKey.interestOps does not defer changing the interest set to the next select [macosx] - S7191765: make jdk8 the default jprt release for hs24 + - S7191872: Xrender: No text displayed using 64 bit JDK on solaris11-sparc - S7191926: Remove MKS dependency in Hotspot regression tests - S7192128: G1: Extend fix for 6948537 to G1's BOT - S7192167: JSR 292: C1 has old broken code which needs to be removed @@ -789,8 +790,10 @@ - S8011745: Unknown CertificateChoices - S8011867: Accept unknown PKCS #9 attributes - S8012572: Exclude sun/tools/jmap/Basic.sh for short term + - S8014469: (tz) Support tzdata2013c * Backports - PR1197, S8003120, RH868136: ResourceManager.getApplicationResources() does not close InputStreams + - S8014618, RH962568: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement * Bug fixes - PR1212: IcedTea7 fails to build because Resources.getText() is no longer available for code to use - Add NSS (commented out) to other platforms. @@ -813,6 +816,8 @@ - RH513605, PR1280: Updating/Installing OpenJDK should recreate the shared class-data archive - PR1358: Make XRender mandatory - PR1360: Check for /usr/lib64 JVMs and generic JPackage alternative + - PR1435: OpenJDK 7 returns incorrect TrueType font metrics + - PR728: GTKLookAndFeel does not honor gtk-alternative-button-order * CACAO - src/vm/jit/x86_64/asmpart.S (asm_abstractmethoderror): Keep stack aligned. - src/native/jni.cpp (GetObjectClass): Remove null pointer check. diff -r 070a86b396c8 -r 66008a8b7417 hotspot.map --- a/hotspot.map Thu Jun 06 17:06:23 2013 +0100 +++ b/hotspot.map Thu Jun 06 19:52:57 2013 +0100 @@ -1,2 +1,2 @@ # version url changeset sha256sum -default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 2fc73bd48efa 1f4a059d6b25d05145a0f6313b24e36641a541dbf9ff33d6780143b1513a1946 +default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 25fe5bf8dee3 844c0c901bda689dd28f3e7846973431bf354bed1efc793d75b78844e21107ce From bugzilla-daemon at icedtea.classpath.org Thu Jun 6 11:53:46 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 06 Jun 2013 18:53:46 +0000 Subject: [Bug 1435] [IcedTea7] OpenJDK 7 returns incorrect TrueType font metrics In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1435 --- Comment #4 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7?cmd=changeset;node=66008a8b7417 author: Andrew John Hughes date: Thu Jun 06 19:52:57 2013 +0100 S7191872: Xrender: No text displayed using 64 bit JDK on solaris11-sparc S8014469: (tz) Support tzdata2013c S8014618, RH962568: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement PR1435: OpenJDK 7 returns incorrect TrueType font metrics PR728: GTKLookAndFeel does not honor gtk-alternative-button-order 2013-06-06 Andrew John Hughes * Makefile.am, (CORBA_CHANGESET): Update to IcedTea7 forest head. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Mention S7191872, S8014469, S8014618/RH962568, PR1435 and PR728. * hotspot.map: Update to IcedTea7 forest head. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/8193fbeb/attachment.html From aazores at redhat.com Thu Jun 6 12:01:55 2013 From: aazores at redhat.com (Andrew Azores) Date: Thu, 06 Jun 2013 15:01:55 -0400 Subject: [rfc][icedtea-web] Stripping semicolon tags from jar urls In-Reply-To: <51B0AFE2.3020204@redhat.com> References: <51ACCCFD.9080505@redhat.com> <51ADAA3A.8090809@redhat.com> <51ADEA27.1060501@redhat.com> <51ADFB00.2040009@redhat.com> <51B0A5C9.5050704@redhat.com> <51B0AFE2.3020204@redhat.com> Message-ID: <51B0DCA3.2040007@redhat.com> > Unittests do also have strange indentation. Are you using some > formatting tool? Both Netbens and Eclipse can do the job for you. In > icedtea-web is .settiings directory with config files for ITW if you > wont. > > After above is fixed, then I will push for you. > Ooh, I hadn't noticed that. Part of this was done in Eclipse and part of it was in Vim, and I guess my vimrc setup is not quite right. I'll go take a look at that. > Also one more nit. As separate changeset, can you please > > extract the: > > p = URLDecoder.decode(p, "UTF-8"); > p = p.replaceAll("\\?.*", ""); > p = (".".concat((p.endsWith("/")) ? > p.concat("index.html") : p)).replace('/', File.separatorChar); > p = stripHttpPathParams(p); > > (and maybe few more lines) Sure, I'll do that next. New patches attached are same changeset as last time, just cleaned up indentation and the rest of the things you mentioned. Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: fix.patch Type: text/x-patch Size: 1794 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/ebeabf4e/fix.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: reproducer.patch Type: text/x-patch Size: 10220 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/ebeabf4e/reproducer.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: unit_test.patch Type: text/x-patch Size: 1603 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/ebeabf4e/unit_test.patch From bugzilla-daemon at icedtea.classpath.org Thu Jun 6 13:17:30 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 06 Jun 2013 20:17:30 +0000 Subject: [Bug 1274] [TRACKER] IcedTea 2.4.0 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1274 Bug 1274 depends on bug 728, which changed state. Bug 728 Summary: GTKLookAndFeel does not honor gtk-alternative-button-order http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=728 What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/eb13faf3/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu Jun 6 13:17:27 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 06 Jun 2013 20:17:27 +0000 Subject: [Bug 729] GTKLookAndFeel should be the system look&feel on all GNU/Linux desktops In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=729 Bug 729 depends on bug 728, which changed state. Bug 728 Summary: GTKLookAndFeel does not honor gtk-alternative-button-order http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=728 What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/f58f1c27/attachment.html From thomas at m3y3r.de Thu Jun 6 13:18:11 2013 From: thomas at m3y3r.de (Thomas Meyer) Date: Thu, 6 Jun 2013 22:18:11 +0200 Subject: [rfc][icedtea-web] get rid of two unwanted exception - was Re: Fwd: Re: [rfc][icedtea-web] fix for PR1465 - java.io.FileNotFoundException while trying to download a JAR file In-Reply-To: <51B098A8.1070006@redhat.com> References: <51AE48CA.6060102@redhat.com> <51AE4A5F.6020902@redhat.com> <1370500831.24531.1.camel@localhost.localdomain> <51B098A8.1070006@redhat.com> Message-ID: Thanks. The patch works like a charm. With kind regards Thomas Am 06.06.2013 um 16:11 schrieb Jiri Vanek : > On 06/06/2013 08:40 AM, Thomas Meyer wrote: >> Am Dienstag, den 04.06.2013, 16:13 -0400 schrieb Adam Domurad: >>> Hi, this is re: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1465 >>> I would greatly appreciate if you could try this patch (apply to HEAD) >>> with the applet from the bug report. >>> >>> Thanks, >>> -Adam >>> >>> >>> -------- Original Message -------- >>> Subject: Re: [rfc][icedtea-web] fix for PR1465 - >>> java.io.FileNotFoundException while trying to download a JAR file >>> Date: Tue, 04 Jun 2013 16:06:34 -0400 >>> From: Adam Domurad >>> To: distro-pkg-dev at openjdk.java.net, Jiri Vanek >>> >>> >>> >>> On 06/04/2013 09:31 AM, Jiri Vanek wrote: >>>> Although not nice, not even bad. >>>> >>>> tbh this was known issue, and when sad was pushing his patch we >>>> decided to ignore %20 and + similarity under html encoding, and >>>> difference under RFC2396. >>>> Apearently, wrongly. >>>> >>>> J. >>> >>> I have done some research and I think I found a solution that should be >>> pleasing. See the unit tests in the patch, too. >>> >>> Basically new URI(url) will check RFC2396 validity. >>> See http://stackoverflow.com/questions/304806/encode-and-decode-rfc2396-urls >>> >>> This avoids the whole normalization mess if the URL is already valid. As >>> long as we create URLs in a manner that ensures they are correct, this >>> will be preserved. >>> This should reduce the future chance of unintended icedtea-web quirks, too. >> >> Hi, >> >> thanks for the patch. It works for me. > Thanx for test! >> Besides that I'm seeing these stacktraces on startup of icedtea-web: > > it loosk like your applet have width and height 0. Surprisingly It will not fail for "or". > The best fix is to enhance it to 1 x 1 on your side;) > - Actually - you really *should*. According to my knowledge chrome and chromium do not lunch zero area applets. > > nvm - the fix + reproducer is simple and is attached. > > Thanx for keeping in loop with us! > >> >> java version "1.7.0_19" >> OpenJDK Runtime Environment (fedora-2.3.9.9.fc19-x86_64) >> OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) >> Exception in thread "AWT-EventQueue-1" >> java.lang.IllegalArgumentException: Width (0) and height (0) cannot be >> <= 0 >> at >> java.awt.image.DirectColorModel.createCompatibleWritableRaster(DirectColorModel.java:1016) >> at >> sun.awt.X11GraphicsConfig.createAcceleratedImage(X11GraphicsConfig.java:384) >> at sun.awt.X11.XComponentPeer.createImage(XComponentPeer.java:769) >> at java.awt.Component.createImage(Component.java:3555) >> at sun.applet.PluginAppletViewer.paint(PluginAppletViewer.java:1550) >> at sun.applet.PluginAppletViewer.update(PluginAppletViewer.java:1566) >> at sun.awt.RepaintArea.updateComponent(RepaintArea.java:255) >> at sun.awt.X11.XRepaintArea.updateComponent(XRepaintArea.java:60) >> at sun.awt.RepaintArea.paint(RepaintArea.java:232) >> at sun.awt.X11.XComponentPeer.handleEvent(XComponentPeer.java:591) >> at java.awt.Component.dispatchEventImpl(Component.java:4937) >> at java.awt.Container.dispatchEventImpl(Container.java:2287) >> at java.awt.Window.dispatchEventImpl(Window.java:2719) >> at java.awt.Component.dispatchEvent(Component.java:4687) >> at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:729) >> at java.awt.EventQueue.access$200(EventQueue.java:103) >> at java.awt.EventQueue$3.run(EventQueue.java:688) >> at java.awt.EventQueue$3.run(EventQueue.java:686) >> at java.security.AccessController.doPrivileged(Native Method) >> at java.security.ProtectionDomain >> $1.doIntersectionPrivilege(ProtectionDomain.java:76) >> at java.security.ProtectionDomain >> $1.doIntersectionPrivilege(ProtectionDomain.java:87) >> at java.awt.EventQueue$4.run(EventQueue.java:702) >> at java.awt.EventQueue$4.run(EventQueue.java:700) >> at java.security.AccessController.doPrivileged(Native Method) >> at java.security.ProtectionDomain >> $1.doIntersectionPrivilege(ProtectionDomain.java:76) >> at java.awt.EventQueue.dispatchEvent(EventQueue.java:699) >> at >> java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:242) >> at >> java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:161) >> at >> java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:150) >> at >> java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:146) >> at >> java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:138) >> at java.awt.EventDispatchThread.run(EventDispatchThread.java:91) >> >> Exception in thread "Thread-6" java.lang.NullPointerException >> at sun.applet.PluginAppletViewer$8.run(PluginAppletViewer.java:1485) >> at java.lang.Thread.run(Thread.java:722) >> >> with kind regards >> thomas >> >>> >>> Happy hacking, >>> -Adam > > <2twoSilencedExceptions-fix.patch> > <2twoSilencedExceptions-test.patch> From bugzilla-daemon at icedtea.classpath.org Thu Jun 6 13:18:24 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 06 Jun 2013 20:18:24 +0000 Subject: [Bug 1435] [IcedTea7] OpenJDK 7 returns incorrect TrueType font metrics In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1435 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/78dd7917/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu Jun 6 13:18:24 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 06 Jun 2013 20:18:24 +0000 Subject: [Bug 1274] [TRACKER] IcedTea 2.4.0 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1274 Bug 1274 depends on bug 1435, which changed state. Bug 1435 Summary: [IcedTea7] OpenJDK 7 returns incorrect TrueType font metrics http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1435 What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130606/fb5183f0/attachment.html From jvanek at redhat.com Fri Jun 7 02:31:51 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 07 Jun 2013 11:31:51 +0200 Subject: [rfc][icedtea-web] Stripping semicolon tags from jar urls In-Reply-To: <51B0DCA3.2040007@redhat.com> References: <51ACCCFD.9080505@redhat.com> <51ADAA3A.8090809@redhat.com> <51ADEA27.1060501@redhat.com> <51ADFB00.2040009@redhat.com> <51B0A5C9.5050704@redhat.com> <51B0AFE2.3020204@redhat.com> <51B0DCA3.2040007@redhat.com> Message-ID: <51B1A887.1000808@redhat.com> On 06/06/2013 09:01 PM, Andrew Azores wrote: > >> Unittests do also have strange indentation. Are you using some formatting tool? Both Netbens and >> Eclipse can do the job for you. In icedtea-web is .settiings directory with config files for ITW >> if you wont. >> >> After above is fixed, then I will push for you. >> > Ooh, I hadn't noticed that. Part of this was done in Eclipse and part of it was in Vim, and I guess > my vimrc setup is not quite right. I'll go take a look at that. >> Also one more nit. As separate changeset, can you please >> >> extract the: >> >> p = URLDecoder.decode(p, "UTF-8"); >> p = p.replaceAll("\\?.*", ""); >> p = (".".concat((p.endsWith("/")) ? p.concat("index.html") : >> p)).replace('/', File.separatorChar); >> p = stripHttpPathParams(p); >> >> (and maybe few more lines) > Sure, I'll do that next. > > New patches attached are same changeset as last time, just cleaned up indentation and the rest of > the things you mentioned. > > Andrew A Hi! Would be pushed by now, but you made one regression against previous version In attempt to avoid usage of ** APPLET..*** consatnts, you removed it: By doing this you made the mistake which will cause to run your browser test apreox 20s instead of one two or three. The regression is in file tests/reproducers/simple/StripHttpPathParams/srcs/StripHttpPathParams.java And the reason of this is method public void testStripHttpPathParamsApplet() throws Exception I will let you figure out what and why have been broken, as it is crucial for you to understand the mechanism of (closing)listners in testsuite. But feel free to ping me or adam! Good luck, J. From jvanek at redhat.com Fri Jun 7 02:39:48 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 07 Jun 2013 11:39:48 +0200 Subject: [rfc][icedtea-web] Stripping semicolon tags from jar urls In-Reply-To: <51B0AFE2.3020204@redhat.com> References: <51ACCCFD.9080505@redhat.com> <51ADAA3A.8090809@redhat.com> <51ADEA27.1060501@redhat.com> <51ADFB00.2040009@redhat.com> <51B0A5C9.5050704@redhat.com> <51B0AFE2.3020204@redhat.com> Message-ID: <51B1AA64.4090009@redhat.com> On 06/06/2013 05:50 PM, Jiri Vanek wrote: > On 06/06/2013 05:07 PM, Andrew Azores wrote: >> Changelog: >> >> * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: added stripHttpPathParams method to >> remove semicolon-delimited "tags" from end of JAR URLs >> >> * tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java: added test case for new >> method in TinyHttpdImpl >> >> * tests/reproducers/simple/StripHttpPathParams/resources/StripHttpPathParams.html: browser-launched >> applet test case for reproducer >> * tests/reproducers/simple/StripHttpPathParams/resources/StripHttpPathParams.jnlp: JNLP test case >> for reproducer >> * tests/reproducers/simple/StripHttpPathParams/srcs/StripHttpPathParams.java: reproducer >> * tests/reproducers/simple/StripHttpPathParams/testcases/StripHttpPathParamsTest.java: reproducer >> >> >> Moved the semicolon-stripping logic out of Parser since it turns out it wasn't needed there anymore, >> but it was needed for TinyHttpdImpl. Changed unit testing to target this instead. Fixed existing >> reproducer and added HTML applet test case. >> > After discussion > > > > Nice work on this already ! > > > > FileInputStream f = new FileInputStream(pp); > f.read(b); > + f.close(); > String content = "" > > > Are you sure with this close? I'm not.... I'm actually against this line unless it is defended. > Before so - please run all reproducers and double check that this line have not caused any issues. > > > > rest is only cosmetic changes please: > > public static String stripHttpPathParams(String url) { > + if (url == null) > + return null; > + > > Brackets needed around condition body > > + public void testStripHttpPathParamsLaunch() throws Exception { > + ProcessResult pr = server.executeJavawsHeadless("/StripHttpPathParams.jnlp"); > + Assert.assertTrue("stdout should contain \"running\" but did not", > pr.stdout.contains("running")); > + } > > > Indentation issue > > + System.out.println("*** APPLET RUNNING ***"); > + System.exit(0); > > The exit is redundant for applets. Pelase remove > > + Assert.assertTrue("stdout should contain \"*** APPLET RUNNING ***\" but did not", > pr.stdout.contains("*** APPLET RUNNING ***")); > + Assert.assertTrue(pr.wasTerminated); > > Please do not copypaste - the *** APPLET RUNNING *** is known consatnt in test-extensions. > > > + Assert.assertTrue(pr.wasTerminated); > > I know this is wide spread across the tests, but I believe it is wrong. Unless you strongly desire > to keep it here, please remove. > > Unittests do also have strange indentation. Are you using some formatting tool? Both Netbens and > Eclipse can do the job for you. In icedtea-web is .settiings directory with config files for ITW if > you wont. > > After above is fixed, then I will push for you. > > Also one more nit. As separate changeset, can you please > > extract the: > > p = URLDecoder.decode(p, "UTF-8"); > p = p.replaceAll("\\?.*", ""); > p = (".".concat((p.endsWith("/")) ? p.concat("index.html") : > p)).replace('/', File.separatorChar); > p = stripHttpPathParams(p); > > (and maybe few more lines) > > To some method urlToFile or similar and - especially - with unittes in test-extensions-tests as you > are already skilled in. The future urlToFile have already grown a bit and it is not clear what is > is supposed to do :) > > > Good job! Thankx for your code! > J. One more nit - + pr.process.destroy(); is not needed. It is done by engine in correct time. (again, I know it was left in some older testcases) Sorry for this. J. From bugzilla-daemon at icedtea.classpath.org Fri Jun 7 03:13:03 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 07 Jun 2013 10:13:03 +0000 Subject: [Bug 1204] Archive URL wrongly resolved In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1204 --- Comment #7 from vigouroux.christophe at gmail.com --- Hi, Any progression made regarding this subject ? -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130607/961a4f5a/attachment.html From ptisnovs at icedtea.classpath.org Fri Jun 7 04:16:42 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 07 Jun 2013 11:16:42 +0000 Subject: /hg/gfx-test: Ten new tests added into BitBltBasicTests test suite. Message-ID: changeset 32d36d51bf47 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=32d36d51bf47 author: Pavel Tisnovsky date: Fri Jun 07 13:20:10 2013 +0200 Ten new tests added into BitBltBasicTests test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltBasicTests.java | 152 +++++++++++++++++++++++ 2 files changed, 157 insertions(+), 0 deletions(-) diffs (174 lines): diff -r ad011872d058 -r 32d36d51bf47 ChangeLog --- a/ChangeLog Wed Jun 05 15:38:12 2013 +0200 +++ b/ChangeLog Fri Jun 07 13:20:10 2013 +0200 @@ -1,3 +1,8 @@ +2013-06-07 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + Ten new tests added into BitBltBasicTests test suite. + 2013-06-06 Pavel Tisnovsky * src/org/gfxtest/framework/CommonBitmapOperations.java: diff -r ad011872d058 -r 32d36d51bf47 src/org/gfxtest/testsuites/BitBltBasicTests.java --- a/src/org/gfxtest/testsuites/BitBltBasicTests.java Wed Jun 05 15:38:12 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Fri Jun 07 13:20:10 2013 +0200 @@ -4398,6 +4398,158 @@ } /** + * Test basic BitBlt operation for vertical cyan gradient buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalCyanGradientBufferedImageType3ByteBGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR); + } + + /** + * Test basic BitBlt operation for vertical cyan gradient buffered image with type TYPE_4BYTE_ABGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalCyanGradientBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR); + } + + /** + * Test basic BitBlt operation for vertical cyan gradient buffered image with type TYPE_4BYTE_ABGR_PRE. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalCyanGradientBufferedImageType4ByteABGR_PRE(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE); + } + + /** + * Test basic BitBlt operation for vertical cyan gradient buffered image + * with type TYPE_BYTE_BINARY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalCyanGradientBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); + } + + /** + * Test basic BitBlt operation for vertical cyan gradient buffered image + * with type TYPE_BYTE_INDEXED. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalCyanGradientBufferedImageTypeByteIndexed(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED); + } + + /** + * Test basic BitBlt operation for vertical cyan gradient buffered image with type TYPE_BYTE_GRAY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalCyanGradientBufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY); + } + + /** + * Test basic BitBlt operation for vertical cyan gradient buffered image with type TYPE_INT_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalCyanGradientBufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_INT_BGR); + } + + /** + * Test basic BitBlt operation for vertical cyan gradient buffered image with type TYPE_INT_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalCyanGradientBufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_INT_RGB); + } + + /** + * Test basic BitBlt operation for vertical cyan gradient buffered image with type TYPE_INT_ARGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalCyanGradientBufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB); + } + + /** + * Test basic BitBlt operation for vertical cyan gradient buffered image with type TYPE_INT_ARGB_PRE. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalCyanGradientBufferedImageTypeIntARGB_Pre(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE); + } + + /** * Entry point to the test suite. * * @param args not used in this case From ptisnovs at icedtea.classpath.org Fri Jun 7 04:35:15 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 07 Jun 2013 11:35:15 +0000 Subject: /hg/rhino-tests: Updated four tests in ScriptEngineClassTest for... Message-ID: changeset 7a2365e86a6d in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=7a2365e86a6d author: Pavel Tisnovsky date: Fri Jun 07 13:38:43 2013 +0200 Updated four tests in ScriptEngineClassTest for (Open)JDK8 API: getMethod, getMethods, getDeclaredMethod and getDeclaredMethods. diffstat: ChangeLog | 6 + src/org/RhinoTests/ScriptEngineClassTest.java | 122 +++++++++++++++++++++++++- 2 files changed, 124 insertions(+), 4 deletions(-) diffs (180 lines): diff -r 55a3c2780d77 -r 7a2365e86a6d ChangeLog --- a/ChangeLog Thu Jun 06 09:40:50 2013 +0200 +++ b/ChangeLog Fri Jun 07 13:38:43 2013 +0200 @@ -1,3 +1,9 @@ +2013-06-07 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptEngineClassTest.java: + Updated four tests in ScriptEngineClassTest for (Open)JDK8 API: + getMethod, getMethods, getDeclaredMethod and getDeclaredMethods. + 2013-06-06 Pavel Tisnovsky * src/org/RhinoTests/ScriptEngineClassTest.java: diff -r 55a3c2780d77 -r 7a2365e86a6d src/org/RhinoTests/ScriptEngineClassTest.java --- a/src/org/RhinoTests/ScriptEngineClassTest.java Thu Jun 06 09:40:50 2013 +0200 +++ b/src/org/RhinoTests/ScriptEngineClassTest.java Fri Jun 07 13:38:43 2013 +0200 @@ -717,6 +717,23 @@ "public abstract void javax.script.ScriptEngine.setContext(javax.script.ScriptContext)", }; + final String[] methodsThatShouldExist_jdk8 = { + "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.io.Reader) throws javax.script.ScriptException", + "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.io.Reader,javax.script.Bindings) throws javax.script.ScriptException", + "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.io.Reader,javax.script.ScriptContext) throws javax.script.ScriptException", + "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.lang.String) throws javax.script.ScriptException", + "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.lang.String,javax.script.Bindings) throws javax.script.ScriptException", + "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.lang.String,javax.script.ScriptContext) throws javax.script.ScriptException", + "public abstract java.lang.Object javax.script.ScriptEngine.get(java.lang.String)", + "public abstract javax.script.Bindings javax.script.ScriptEngine.createBindings()", + "public abstract javax.script.Bindings javax.script.ScriptEngine.getBindings(int)", + "public abstract javax.script.ScriptContext javax.script.ScriptEngine.getContext()", + "public abstract javax.script.ScriptEngineFactory javax.script.ScriptEngine.getFactory()", + "public abstract void javax.script.ScriptEngine.put(java.lang.String,java.lang.Object)", + "public abstract void javax.script.ScriptEngine.setBindings(javax.script.Bindings,int)", + "public abstract void javax.script.ScriptEngine.setContext(javax.script.ScriptContext)", + }; + // get all inherited methods Method[] methods = this.scriptEngineClass.getMethods(); // and transform the array into a list of method names @@ -724,7 +741,20 @@ for (Method method : methods) { methodsAsString.add(method.toString()); } - String[] methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + + String[] methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } + // check if all required methods really exists for (String methodThatShouldExists : methodsThatShouldExist) { assertTrue(methodsAsString.contains(methodThatShouldExists), @@ -771,6 +801,23 @@ "public abstract void javax.script.ScriptEngine.setContext(javax.script.ScriptContext)", }; + final String[] declaredMethodsThatShouldExist_jdk8 = { + "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.io.Reader) throws javax.script.ScriptException", + "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.io.Reader,javax.script.Bindings) throws javax.script.ScriptException", + "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.io.Reader,javax.script.ScriptContext) throws javax.script.ScriptException", + "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.lang.String) throws javax.script.ScriptException", + "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.lang.String,javax.script.Bindings) throws javax.script.ScriptException", + "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.lang.String,javax.script.ScriptContext) throws javax.script.ScriptException", + "public abstract java.lang.Object javax.script.ScriptEngine.get(java.lang.String)", + "public abstract javax.script.Bindings javax.script.ScriptEngine.createBindings()", + "public abstract javax.script.Bindings javax.script.ScriptEngine.getBindings(int)", + "public abstract javax.script.ScriptContext javax.script.ScriptEngine.getContext()", + "public abstract javax.script.ScriptEngineFactory javax.script.ScriptEngine.getFactory()", + "public abstract void javax.script.ScriptEngine.put(java.lang.String,java.lang.Object)", + "public abstract void javax.script.ScriptEngine.setBindings(javax.script.Bindings,int)", + "public abstract void javax.script.ScriptEngine.setContext(javax.script.ScriptContext)", + }; + // get all declared methods Method[] declaredMethods = this.scriptEngineClass.getDeclaredMethods(); // and transform the array into a list of method names @@ -778,7 +825,20 @@ for (Method method : declaredMethods) { methodsAsString.add(method.toString()); } - String[] declaredMethodsThatShouldExist = getJavaVersion() < 7 ? declaredMethodsThatShouldExist_jdk6 : declaredMethodsThatShouldExist_jdk7; + + String[] declaredMethodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk6; + break; + case 7: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk7; + break; + case 8: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk8; + break; + } + // check if all required methods really exists for (String methodThatShouldExists : declaredMethodsThatShouldExist) { assertTrue(methodsAsString.contains(methodThatShouldExists), @@ -823,7 +883,34 @@ methodsThatShouldExist_jdk7.put("createBindings", new Class[] {}); methodsThatShouldExist_jdk7.put("setContext", new Class[] {javax.script.ScriptContext.class}); - Map methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + Map methodsThatShouldExist_jdk8 = new TreeMap(); + methodsThatShouldExist_jdk8.put("eval", new Class[] {java.io.Reader.class, javax.script.Bindings.class}); + methodsThatShouldExist_jdk8.put("eval", new Class[] {java.lang.String.class, javax.script.Bindings.class}); + methodsThatShouldExist_jdk8.put("eval", new Class[] {java.io.Reader.class}); + methodsThatShouldExist_jdk8.put("eval", new Class[] {java.lang.String.class, javax.script.ScriptContext.class}); + methodsThatShouldExist_jdk8.put("eval", new Class[] {java.io.Reader.class, javax.script.ScriptContext.class}); + methodsThatShouldExist_jdk8.put("eval", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("setBindings", new Class[] {javax.script.Bindings.class, int.class}); + methodsThatShouldExist_jdk8.put("getBindings", new Class[] {int.class}); + methodsThatShouldExist_jdk8.put("createBindings", new Class[] {}); + methodsThatShouldExist_jdk8.put("setContext", new Class[] {javax.script.ScriptContext.class}); + methodsThatShouldExist_jdk8.put("get", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("put", new Class[] {java.lang.String.class, java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("getFactory", new Class[] {}); + methodsThatShouldExist_jdk8.put("getContext", new Class[] {}); + + Map methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } // check if all required methods really exist for (Map.Entry methodThatShouldExists : methodsThatShouldExist.entrySet()) { @@ -881,7 +968,34 @@ methodsThatShouldExist_jdk7.put("createBindings", new Class[] {}); methodsThatShouldExist_jdk7.put("setContext", new Class[] {javax.script.ScriptContext.class}); - Map methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + Map methodsThatShouldExist_jdk8 = new TreeMap(); + methodsThatShouldExist_jdk8.put("eval", new Class[] {java.io.Reader.class, javax.script.Bindings.class}); + methodsThatShouldExist_jdk8.put("eval", new Class[] {java.lang.String.class, javax.script.Bindings.class}); + methodsThatShouldExist_jdk8.put("eval", new Class[] {java.io.Reader.class}); + methodsThatShouldExist_jdk8.put("eval", new Class[] {java.lang.String.class, javax.script.ScriptContext.class}); + methodsThatShouldExist_jdk8.put("eval", new Class[] {java.io.Reader.class, javax.script.ScriptContext.class}); + methodsThatShouldExist_jdk8.put("eval", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("setBindings", new Class[] {javax.script.Bindings.class, int.class}); + methodsThatShouldExist_jdk8.put("getBindings", new Class[] {int.class}); + methodsThatShouldExist_jdk8.put("createBindings", new Class[] {}); + methodsThatShouldExist_jdk8.put("setContext", new Class[] {javax.script.ScriptContext.class}); + methodsThatShouldExist_jdk8.put("get", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("put", new Class[] {java.lang.String.class, java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("getFactory", new Class[] {}); + methodsThatShouldExist_jdk8.put("getContext", new Class[] {}); + + Map methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } // check if all required methods really exist for (Map.Entry methodThatShouldExists : methodsThatShouldExist.entrySet()) { From helpcrypto at gmail.com Fri Jun 7 05:16:40 2013 From: helpcrypto at gmail.com (helpcrypto helpcrypto) Date: Fri, 7 Jun 2013 14:16:40 +0200 Subject: [OT?] Get current firefox profile In-Reply-To: <51ADEDE9.1030503@redhat.com> References: <51ADEDE9.1030503@redhat.com> Message-ID: anyone? On 06/04/2013 03:14 PM, helpcrypto helpcrypto wrote: > >> Hi. >> >> >> Any of you know an easy way of getting firefox current profile from my >> applet? >> >> I found, but Component.classes gives permission denied: >> >> http://stackoverflow.com/**questions/5695230/how-to-get-** >> the-current-firefox-profile-**path-from-within-my-applet >> >> Thanks! >> >> >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130607/e5bb416c/attachment.html From jvanek at redhat.com Fri Jun 7 08:03:58 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 07 Jun 2013 17:03:58 +0200 Subject: [rfc][icedtea-web] fix for RH947647, following the XDG basedir specification Message-ID: <51B1F65E.9070907@redhat.com> https://bugzilla.redhat.com/show_bug.cgi?id=947647 Hi! This fix is migrating us to ?/.config/icedtea-web and ?/.cache/icedtea-web instead of ~/.icedtea. IO have already tested this a bit, and looks ok. Under normal circumstances the migration should be painless, I'm thinking about recursive copy in case that ~/.config .cache/icedtea-web will already exist, as as it is now, the user will see the moving error for ethernity (until he remove old ~/.icedta) After the flame on irc after "voting" I'm sure the mooving is good thing to do. And everywhere. Best regards, J. -------------- next part -------------- A non-text attachment was scrubbed... Name: followTheXdgSpecification.diff Type: text/x-patch Size: 27382 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130607/dad32650/followTheXdgSpecification.diff From aazores at redhat.com Fri Jun 7 08:16:30 2013 From: aazores at redhat.com (Andrew Azores) Date: Fri, 07 Jun 2013 11:16:30 -0400 Subject: [rfc][icedtea-web] Stripping semicolon tags from jar urls In-Reply-To: <51B1A887.1000808@redhat.com> References: <51ACCCFD.9080505@redhat.com> <51ADAA3A.8090809@redhat.com> <51ADEA27.1060501@redhat.com> <51ADFB00.2040009@redhat.com> <51B0A5C9.5050704@redhat.com> <51B0AFE2.3020204@redhat.com> <51B0DCA3.2040007@redhat.com> <51B1A887.1000808@redhat.com> Message-ID: <51B1F94E.9030703@redhat.com> > > Hi! Would be pushed by now, but you made one regression against > previous version > > In attempt to avoid usage of ** APPLET..*** consatnts, you removed it: > By doing this you made the mistake which will cause to run your > browser test apreox 20s instead of one two or three. > > The regression is in file > tests/reproducers/simple/StripHttpPathParams/srcs/StripHttpPathParams.java > > And the reason of this is method public void > testStripHttpPathParamsApplet() throws Exception > > I will let you figure out what and why have been broken, as it is > crucial for you to understand the mechanism of (closing)listners in > testsuite. > > But feel free to ping me or adam! > > > Good luck, J. Okay, I think this new set of patches wraps it up. Hopefully. Thanks, Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: fix.patch Type: text/x-patch Size: 1794 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130607/6eced69c/fix.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: reproducer.patch Type: text/x-patch Size: 10430 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130607/6eced69c/reproducer.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: unit_test.patch Type: text/x-patch Size: 1603 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130607/6eced69c/unit_test.patch From thomas at m3y3r.de Fri Jun 7 09:22:40 2013 From: thomas at m3y3r.de (Thomas Meyer) Date: Fri, 07 Jun 2013 18:22:40 +0200 Subject: [rfc][icedtea-web] get rid of two unwanted exception - was Re: Fwd: Re: [rfc][icedtea-web] fix for PR1465 - java.io.FileNotFoundException while trying to download a JAR file In-Reply-To: <51B09DB2.4050807@redhat.com> References: <51AE48CA.6060102@redhat.com> <51AE4A5F.6020902@redhat.com> <1370500831.24531.1.camel@localhost.localdomain> <51B098A8.1070006@redhat.com> <51B09DB2.4050807@redhat.com> Message-ID: <1370622160.24531.4.camel@localhost.localdomain> Am Donnerstag, den 06.06.2013, 10:33 -0400 schrieb Adam Domurad: > > it loosk like your applet have width and height 0. Surprisingly It > > will not fail for "or". > > The best fix is to enhance it to 1 x 1 on your side;) > > - Actually - you really *should*. According to my knowledge chrome > > and chromium do not lunch zero area applets. > > btw. I still see this exception, when loading the Juniper applet: java version "1.7.0_19" OpenJDK Runtime Environment (fedora-2.3.9.9.fc19-x86_64) OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) Exception in thread "Thread-6" java.lang.NullPointerException at sun.applet.PluginAppletViewer$8.run(PluginAppletViewer.java:1485) at java.lang.Thread.run(Thread.java:722) Java Vendor: Oracle Corporation Java Version: 1.7.0_19 Run Level:1, read timeout:90000 Applet is signed and trusted From adomurad at redhat.com Fri Jun 7 11:11:55 2013 From: adomurad at redhat.com (Adam Domurad) Date: Fri, 07 Jun 2013 14:11:55 -0400 Subject: [rfc][icedtea-web] Make 'getvalue' nonblocking to reduce hanging chance & improve responsivity Message-ID: <51B2226B.7080100@redhat.com> Hi all. I am very happy to present this patch! All Firefox hanging bugs had a common theme, Firefox waits for the result of some function to finish from the plugin, and IcedTea-Web plugin-side waits as well for the java-side. This patch should reduce the chance of Firefox outright hanging, by making the most frequent site of these occurences nonblocking. This will also improve responsivity, eg Firefox no longer 'hangs' while waiting for you to accept or deny a confirmation message. The patch delays waiting for initialization of the applet until its absolutely needed - which is only when the applet is communicated with using liveconnect. This especially benefits the majority of applets that do not use liveconnect. Eg the applets at http://www.walter-fendt.de/ph14e/resultant.htm no longer presents a blank page for a while, for me. The patch introduces (with tests) a helper class, NPObjectRef. This was done to make this patch easier to reason about. It should be far easier to know now when to retain/release an object (almost always automatic, only call raw_retain() when returning raw NPObject* to browser). It also introduces a wrapper around g_strdup_printf with a (very) simple test. I have done testing on the patch and it looks OK, but I will still test it more. Cheers, -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: Non-blocking-npapi-getvalue.patch Type: text/x-patch Size: 36196 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130607/a6d49022/Non-blocking-npapi-getvalue.patch From andrew at icedtea.classpath.org Fri Jun 7 11:46:18 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 07 Jun 2013 18:46:18 +0000 Subject: /hg/release/icedtea7-forest-2.4/jdk: 8 new changesets Message-ID: changeset fdd98e50f1df in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=fdd98e50f1df author: andrew date: Fri May 31 23:03:47 2013 +0100 PR1435: OpenJDK 7 returns incorrect TrueType font metrics changeset 083cb3631cb8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=083cb3631cb8 author: andrew date: Wed Jun 05 16:26:32 2013 +0100 PR728: GTKLookAndFeel does not honor gtk-alternative-button-order changeset 50467fb717f8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=50467fb717f8 author: simonis date: Mon May 06 12:57:42 2013 -0700 7191872: Xrender: No text displayed using 64 bit JDK on solaris11-sparc Reviewed-by: prr, ceisserer changeset 3b009d41bc31 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3b009d41bc31 author: peytoia date: Thu May 30 14:34:18 2013 +0900 8014469: (tz) Support tzdata2013c 8015570: Use long comparison in Rule.getRules(). Reviewed-by: okutsu changeset 5a7678b3a250 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5a7678b3a250 author: andrew date: Wed Jun 05 16:34:26 2013 +0100 9001039: DHKeyAgreement calculates wrong TlsPremasterSecret 1 out of 256 times changeset 12756cb85ec1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=12756cb85ec1 author: andrew date: Thu Jun 06 17:58:10 2013 +0100 8014618: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement Reviewed-by: xuelei Contributed-by: Pasi Eronen changeset 3f1f89553b54 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3f1f89553b54 author: andrew date: Thu Jun 06 18:29:16 2013 +0100 Remove changes accidentally included in jcheck removal. changeset d1563025e086 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d1563025e086 author: andrew date: Fri Jun 07 19:44:57 2013 +0100 Merge diffstat: make/java/text/base/Makefile | 1 - make/sun/javazic/tzdata/VERSION | 2 +- make/sun/javazic/tzdata/antarctica | 42 +- make/sun/javazic/tzdata/asia | 62 +- make/sun/javazic/tzdata/australasia | 23 +- make/sun/javazic/tzdata/southamerica | 10 +- make/sun/javazic/tzdata/zone.tab | 2 +- make/sun/text/Makefile | 1 - make/tools/src/build/tools/javazic/Rule.java | 2 +- src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java | 6 +- src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java | 3 +- src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java | 10 +- src/share/classes/sun/font/FileFontStrike.java | 11 +- src/share/classes/sun/font/GlyphList.java | 12 +- src/share/classes/sun/security/pkcs11/P11KeyAgreement.java | 4 +- src/share/classes/sun/security/pkcs11/P11Signature.java | 7 +- src/share/classes/sun/security/pkcs11/P11Util.java | 16 +- src/share/classes/sun/security/util/KeyUtil.java | 21 +- src/share/native/sun/font/freetypeScaler.c | 7 +- src/solaris/classes/sun/font/XRGlyphCacheEntry.java | 30 +- src/solaris/native/sun/awt/gtk2_interface.c | 10 + src/solaris/native/sun/awt/gtk2_interface.h | 3 +- src/solaris/native/sun/java2d/x11/XRBackendNative.c | 7 +- test/Makefile | 6 + test/com/sun/crypto/provider/TLS/TestLeadingZeroes.java | 420 ++++++++++ test/sun/security/pkcs11/tls/TestLeadingZeroesP11.java | 410 +++++++++ 26 files changed, 989 insertions(+), 139 deletions(-) diffs (truncated from 1498 to 500 lines): diff -r 883a1fbc5c1a -r d1563025e086 make/java/text/base/Makefile --- a/make/java/text/base/Makefile Wed May 22 16:12:05 2013 +0100 +++ b/make/java/text/base/Makefile Fri Jun 07 19:44:57 2013 +0100 @@ -81,7 +81,6 @@ $(TEXT_SOURCES) $(MKDIR) -p $(TEXT_CLASSDIR) $(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \ - -Xbootclasspath/a:$(ABS_OUTPUTDIR)/classes \ -jar $(GENERATEBREAKITERATORDATA_JARFILE) \ -o $(TEXT_CLASSDIR) \ -spec $(UNICODEDATA)/UnicodeData.txt diff -r 883a1fbc5c1a -r d1563025e086 make/sun/javazic/tzdata/VERSION --- a/make/sun/javazic/tzdata/VERSION Wed May 22 16:12:05 2013 +0100 +++ b/make/sun/javazic/tzdata/VERSION Fri Jun 07 19:44:57 2013 +0100 @@ -21,4 +21,4 @@ # or visit www.oracle.com if you need additional information or have any # questions. # -tzdata2013b +tzdata2013c diff -r 883a1fbc5c1a -r d1563025e086 make/sun/javazic/tzdata/antarctica --- a/make/sun/javazic/tzdata/antarctica Wed May 22 16:12:05 2013 +0100 +++ b/make/sun/javazic/tzdata/antarctica Fri Jun 07 19:44:57 2013 +0100 @@ -76,34 +76,6 @@ Rule ChileAQ 2012 max - Apr Sun>=23 3:00u 0 - Rule ChileAQ 2012 max - Sep Sun>=2 4:00u 1:00 S -# These rules are stolen from the `australasia' file. -Rule AusAQ 1917 only - Jan 1 0:01 1:00 - -Rule AusAQ 1917 only - Mar 25 2:00 0 - -Rule AusAQ 1942 only - Jan 1 2:00 1:00 - -Rule AusAQ 1942 only - Mar 29 2:00 0 - -Rule AusAQ 1942 only - Sep 27 2:00 1:00 - -Rule AusAQ 1943 1944 - Mar lastSun 2:00 0 - -Rule AusAQ 1943 only - Oct 3 2:00 1:00 - -Rule ATAQ 1967 only - Oct Sun>=1 2:00s 1:00 - -Rule ATAQ 1968 only - Mar lastSun 2:00s 0 - -Rule ATAQ 1968 1985 - Oct lastSun 2:00s 1:00 - -Rule ATAQ 1969 1971 - Mar Sun>=8 2:00s 0 - -Rule ATAQ 1972 only - Feb lastSun 2:00s 0 - -Rule ATAQ 1973 1981 - Mar Sun>=1 2:00s 0 - -Rule ATAQ 1982 1983 - Mar lastSun 2:00s 0 - -Rule ATAQ 1984 1986 - Mar Sun>=1 2:00s 0 - -Rule ATAQ 1986 only - Oct Sun>=15 2:00s 1:00 - -Rule ATAQ 1987 1990 - Mar Sun>=15 2:00s 0 - -Rule ATAQ 1987 only - Oct Sun>=22 2:00s 1:00 - -Rule ATAQ 1988 1990 - Oct lastSun 2:00s 1:00 - -Rule ATAQ 1991 1999 - Oct Sun>=1 2:00s 1:00 - -Rule ATAQ 1991 2005 - Mar lastSun 2:00s 0 - -Rule ATAQ 2000 only - Aug lastSun 2:00s 1:00 - -Rule ATAQ 2001 max - Oct Sun>=1 2:00s 1:00 - -Rule ATAQ 2006 only - Apr Sun>=1 2:00s 0 - -Rule ATAQ 2007 only - Mar lastSun 2:00s 0 - -Rule ATAQ 2008 max - Apr Sun>=1 2:00s 0 - - # Argentina - year-round bases # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05 # Esperanza, San Martin Land, -6323-05659, since 1952-12-17 @@ -145,10 +117,7 @@ # # From Steffen Thorsen (2010-03-10): -# We got these changes from the Australian Antarctic Division: -# - Macquarie Island will stay on UTC+11 for winter and therefore not -# switch back from daylight savings time when other parts of Australia do -# on 4 April. +# We got these changes from the Australian Antarctic Division: ... # # - Casey station reverted to its normal time of UTC+8 on 5 March 2010. # The change to UTC+11 is being considered as a regular summer thing but @@ -159,9 +128,6 @@ # # - Mawson station stays on UTC+5. # -# In addition to the Rule changes for Casey/Davis, it means that Macquarie -# will no longer be like Hobart and will have to have its own Zone created. -# # Background: # # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html @@ -188,12 +154,6 @@ 6:00 - MAWT 2009 Oct 18 2:00 # Mawson Time 5:00 - MAWT -Zone Antarctica/Macquarie 0 - zzz 1911 - 10:00 - EST 1916 Oct 1 2:00 - 10:00 1:00 EST 1917 Feb - 10:00 AusAQ EST 1967 - 10:00 ATAQ EST 2010 Apr 4 3:00 - 11:00 - MIST # Macquarie Island Time # References: # # Casey Weather (1998-02-26) diff -r 883a1fbc5c1a -r d1563025e086 make/sun/javazic/tzdata/asia --- a/make/sun/javazic/tzdata/asia Wed May 22 16:12:05 2013 +0100 +++ b/make/sun/javazic/tzdata/asia Fri Jun 07 19:44:57 2013 +0100 @@ -2314,11 +2314,20 @@ # http://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html # -# From Arthur David Olson (2012-03-27): -# The timeanddate article for 2012 says that "the end date has not yet been -# announced" and that "Last year, both...paused daylight saving time during... -# Ramadan. It is not yet known [for] 2012." -# For now, assume both switch back on the last Friday in September. XXX +# From Steffen Thorsen (2013-03-26): +# The following news sources tells that Palestine will "start daylight saving +# time from midnight on Friday, March 29, 2013" (translated). +# [These are in Arabic and are for Gaza and for Ramallah, respectively.] +# http://www.samanews.com/index.php?act=Show&id=154120 +# http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html + +# From Paul Eggert (2013-04-15): +# For future dates, guess the last Thursday in March at 24:00 through +# the first Friday on or after September 21 at 01:00. This is consistent with +# the predictions in today's editions of the following URLs, +# which are for Gaza and Hebron respectively: +# http://www.timeanddate.com/worldclock/timezone.html?n=702 +# http://www.timeanddate.com/worldclock/timezone.html?n=2364 # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule EgyptAsia 1957 only - May 10 0:00 1:00 S @@ -2332,19 +2341,20 @@ Rule Palestine 1999 2003 - Oct Fri>=15 0:00 0 - Rule Palestine 2004 only - Oct 1 1:00 0 - Rule Palestine 2005 only - Oct 4 2:00 0 - -Rule Palestine 2006 2008 - Apr 1 0:00 1:00 S +Rule Palestine 2006 2007 - Apr 1 0:00 1:00 S Rule Palestine 2006 only - Sep 22 0:00 0 - Rule Palestine 2007 only - Sep Thu>=8 2:00 0 - -Rule Palestine 2008 only - Aug lastFri 0:00 0 - -Rule Palestine 2009 only - Mar lastFri 0:00 1:00 S -Rule Palestine 2009 only - Sep Fri>=1 2:00 0 - -Rule Palestine 2010 only - Mar lastSat 0:01 1:00 S +Rule Palestine 2008 2009 - Mar lastFri 0:00 1:00 S +Rule Palestine 2008 only - Sep 1 0:00 0 - +Rule Palestine 2009 only - Sep Fri>=1 1:00 0 - +Rule Palestine 2010 only - Mar 26 0:00 1:00 S Rule Palestine 2010 only - Aug 11 0:00 0 - - -# From Arthur David Olson (2011-09-20): -# 2011 transitions per http://www.timeanddate.com as of 2011-09-20. -# From Paul Eggert (2012-10-12): -# 2012 transitions per http://www.timeanddate.com as of 2012-10-12. +Rule Palestine 2011 only - Apr 1 0:01 1:00 S +Rule Palestine 2011 only - Aug 1 0:00 0 - +Rule Palestine 2011 only - Aug 30 0:00 1:00 S +Rule Palestine 2011 only - Sep 30 0:00 0 - +Rule Palestine 2012 max - Mar lastThu 24:00 1:00 S +Rule Palestine 2012 max - Sep Fri>=21 1:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct @@ -2352,26 +2362,20 @@ 2:00 EgyptAsia EE%sT 1967 Jun 5 2:00 Zion I%sT 1996 2:00 Jordan EE%sT 1999 - 2:00 Palestine EE%sT 2011 Apr 2 12:01 - 2:00 1:00 EEST 2011 Aug 1 - 2:00 - EET 2012 Mar 30 - 2:00 1:00 EEST 2012 Sep 21 1:00 - 2:00 - EET + 2:00 Palestine EE%sT 2008 Aug 29 0:00 + 2:00 - EET 2008 Sep + 2:00 Palestine EE%sT 2010 + 2:00 - EET 2010 Mar 27 0:01 + 2:00 Palestine EE%sT 2011 Aug 1 + 2:00 - EET 2012 + 2:00 Palestine EE%sT Zone Asia/Hebron 2:20:23 - LMT 1900 Oct 2:00 Zion EET 1948 May 15 2:00 EgyptAsia EE%sT 1967 Jun 5 2:00 Zion I%sT 1996 2:00 Jordan EE%sT 1999 - 2:00 Palestine EE%sT 2008 Aug - 2:00 1:00 EEST 2008 Sep - 2:00 Palestine EE%sT 2011 Apr 1 12:01 - 2:00 1:00 EEST 2011 Aug 1 - 2:00 - EET 2011 Aug 30 - 2:00 1:00 EEST 2011 Sep 30 3:00 - 2:00 - EET 2012 Mar 30 - 2:00 1:00 EEST 2012 Sep 21 1:00 - 2:00 - EET + 2:00 Palestine EE%sT # Paracel Is # no information diff -r 883a1fbc5c1a -r d1563025e086 make/sun/javazic/tzdata/australasia --- a/make/sun/javazic/tzdata/australasia Wed May 22 16:12:05 2013 +0100 +++ b/make/sun/javazic/tzdata/australasia Fri Jun 07 19:44:57 2013 +0100 @@ -241,9 +241,26 @@ # no times are set # # Macquarie -# permanent occupation (scientific station) since 1948; -# sealing and penguin oil station operated 1888/1917 -# like Australia/Hobart +# Permanent occupation (scientific station) 1911-1915 and since 25 March 1948; +# sealing and penguin oil station operated Nov 1899 to Apr 1919. See the +# Tasmania Parks & Wildlife Service history of sealing at Macquarie Island +# +# . +# Guess that it was like Australia/Hobart while inhabited before 2010. +# +# From Steffen Thorsen (2010-03-10): +# We got these changes from the Australian Antarctic Division: +# - Macquarie Island will stay on UTC+11 for winter and therefore not +# switch back from daylight savings time when other parts of Australia do +# on 4 April. +Zone Antarctica/Macquarie 0 - zzz 1899 Nov + 10:00 - EST 1916 Oct 1 2:00 + 10:00 1:00 EST 1917 Feb + 10:00 Aus EST 1919 Apr + 0 - zzz 1948 Mar 25 + 10:00 Aus EST 1967 + 10:00 AT EST 2010 Apr 4 3:00 + 11:00 - MIST # Macquarie I Standard Time # Christmas # Zone NAME GMTOFF RULES FORMAT [UNTIL] diff -r 883a1fbc5c1a -r d1563025e086 make/sun/javazic/tzdata/southamerica --- a/make/sun/javazic/tzdata/southamerica Wed May 22 16:12:05 2013 +0100 +++ b/make/sun/javazic/tzdata/southamerica Fri Jun 07 19:44:57 2013 +0100 @@ -1589,16 +1589,16 @@ # forward 60 minutes, in all the territory of the Paraguayan Republic. # ... Rule Para 2010 max - Oct Sun>=1 0:00 1:00 S -Rule Para 2010 max - Apr Sun>=8 0:00 0 - +Rule Para 2010 2012 - Apr Sun>=8 0:00 0 - # # From Steffen Thorsen (2013-03-07): # Paraguay will end DST on 2013-03-24 00:00.... -# They do not tell if this will be a permanent change or just this year.... # http://www.ande.gov.py/interna.php?id=1075 # -# From Paul Eggert (2013-03-07): -# For now, assume it's just this year. -Rule Para 2013 only - Mar 24 0:00 0 - +# From Carlos Raul Perasso (2013-03-15): +# The change in Paraguay is now final. Decree number 10780 +# http://www.presidencia.gov.py/uploads/pdf/presidencia-3b86ff4b691c79d4f5927ca964922ec74772ce857c02ca054a52a37b49afc7fb.pdf +Rule Para 2013 max - Mar Sun>=22 0:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Asuncion -3:50:40 - LMT 1890 diff -r 883a1fbc5c1a -r d1563025e086 make/sun/javazic/tzdata/zone.tab --- a/make/sun/javazic/tzdata/zone.tab Wed May 22 16:12:05 2013 +0100 +++ b/make/sun/javazic/tzdata/zone.tab Fri Jun 07 19:44:57 2013 +0100 @@ -65,7 +65,6 @@ AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I -AQ -5430+15857 Antarctica/Macquarie Macquarie Island Station, Macquarie Island AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF) AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, MN, SE, SF) AR -2447-06525 America/Argentina/Salta (SA, LP, NQ, RN) @@ -81,6 +80,7 @@ AS -1416-17042 Pacific/Pago_Pago AT +4813+01620 Europe/Vienna AU -3133+15905 Australia/Lord_Howe Lord Howe Island +AU -5430+15857 Antarctica/Macquarie Macquarie Island AU -4253+14719 Australia/Hobart Tasmania - most locations AU -3956+14352 Australia/Currie Tasmania - King Island AU -3749+14458 Australia/Melbourne Victoria diff -r 883a1fbc5c1a -r d1563025e086 make/sun/text/Makefile --- a/make/sun/text/Makefile Wed May 22 16:12:05 2013 +0100 +++ b/make/sun/text/Makefile Fri Jun 07 19:44:57 2013 +0100 @@ -86,7 +86,6 @@ -sourcepath $(TEXT_SRCDIR) \ $(BIRULES) $(BIINFO) $(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \ - -Xbootclasspath/a:$(ABS_OUTPUTDIR)/classes \ -jar $(GENERATEBREAKITERATORDATA_JARFILE) \ -o $(CLASSDESTDIR)/sun/text/resources \ -spec $(UNICODEDATA)/UnicodeData.txt \ diff -r 883a1fbc5c1a -r d1563025e086 make/tools/src/build/tools/javazic/Rule.java --- a/make/tools/src/build/tools/javazic/Rule.java Wed May 22 16:12:05 2013 +0100 +++ b/make/tools/src/build/tools/javazic/Rule.java Fri Jun 07 19:44:57 2013 +0100 @@ -119,7 +119,7 @@ r1.getDay(), r1.getTime().getTime()); long t2 = Time.getLocalTime(y, r2.getMonth(), r2.getDay(), r2.getTime().getTime()); - return (int)(t1 - t2); + return (t1 > t2) ? 1 : (t1 < t2) ? -1 : 0; } public boolean equals(Object o) { return this == o; diff -r 883a1fbc5c1a -r d1563025e086 src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java --- a/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java Wed May 22 16:12:05 2013 +0100 +++ b/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java Fri Jun 07 19:44:57 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -404,8 +404,8 @@ } return skey; } else if (algorithm.equals("TlsPremasterSecret")) { - // return entire secret - return new SecretKeySpec(secret, "TlsPremasterSecret"); + // remove leading zero bytes per RFC 5246 Section 8.1.2 + return new SecretKeySpec(KeyUtil.trimZeroes(secret), "TlsPremasterSecret"); } else { throw new NoSuchAlgorithmException("Unsupported secret key " + "algorithm: "+ algorithm); diff -r 883a1fbc5c1a -r d1563025e086 src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java --- a/src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java Wed May 22 16:12:05 2013 +0100 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java Fri Jun 07 19:44:57 2013 +0100 @@ -93,7 +93,8 @@ */ static enum Settings { GTK_FONT_NAME, - GTK_ICON_SIZES + GTK_ICON_SIZES, + GTK_BUTTON_ORDER } /* Custom regions are needed for representing regions that don't exist diff -r 883a1fbc5c1a -r d1563025e086 src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java --- a/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Wed May 22 16:12:05 2013 +0100 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Fri Jun 07 19:44:57 2013 +0100 @@ -539,6 +539,14 @@ } } + /* If gtk-alternative-button-order is set to true, isYesLast needs to be false */ + Boolean buttonOrder = Boolean.TRUE; + Object orderSetting = GTKEngine.INSTANCE.getSetting(GTKEngine.Settings.GTK_BUTTON_ORDER); + if (orderSetting instanceof Boolean) { + Boolean order = (Boolean) orderSetting; + if (Boolean.TRUE.equals(order)) + buttonOrder = Boolean.FALSE; + } Object[] defaults = new Object[] { "ArrowButton.size", Integer.valueOf(13), @@ -818,7 +826,7 @@ "OptionPane.windowBindings", new Object[] { "ESCAPE", "close" }, "OptionPane.buttonClickThreshhold", new Integer(500), - "OptionPane.isYesLast", Boolean.TRUE, + "OptionPane.isYesLast", buttonOrder, "OptionPane.font", new FontLazyValue(Region.OPTION_PANE), "Panel.font", new FontLazyValue(Region.PANEL), diff -r 883a1fbc5c1a -r d1563025e086 src/share/classes/sun/font/FileFontStrike.java --- a/src/share/classes/sun/font/FileFontStrike.java Wed May 22 16:12:05 2013 +0100 +++ b/src/share/classes/sun/font/FileFontStrike.java Fri Jun 07 19:44:57 2013 +0100 @@ -747,14 +747,9 @@ return origMinX; } - long pixelData; - if (StrikeCache.nativeAddressSize == 4) { - pixelData = 0xffffffff & - StrikeCache.unsafe.getInt(ptr + StrikeCache.pixelDataOffset); - } else { - pixelData = - StrikeCache.unsafe.getLong(ptr + StrikeCache.pixelDataOffset); - } + long pixelData = + StrikeCache.unsafe.getAddress(ptr + StrikeCache.pixelDataOffset); + if (pixelData == 0L) { return origMinX; } diff -r 883a1fbc5c1a -r d1563025e086 src/share/classes/sun/font/GlyphList.java --- a/src/share/classes/sun/font/GlyphList.java Wed May 22 16:12:05 2013 +0100 +++ b/src/share/classes/sun/font/GlyphList.java Fri Jun 07 19:44:57 2013 +0100 @@ -361,16 +361,10 @@ graybits = new byte[len]; } } - long pixelDataAddress; - if (StrikeCache.nativeAddressSize == 4) { - pixelDataAddress = 0xffffffff & - StrikeCache.unsafe.getInt(images[glyphindex] + + long pixelDataAddress = + StrikeCache.unsafe.getAddress(images[glyphindex] + StrikeCache.pixelDataOffset); - } else { - pixelDataAddress = - StrikeCache.unsafe.getLong(images[glyphindex] + - StrikeCache.pixelDataOffset); - } + if (pixelDataAddress == 0L) { return graybits; } diff -r 883a1fbc5c1a -r d1563025e086 src/share/classes/sun/security/pkcs11/P11KeyAgreement.java --- a/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java Wed May 22 16:12:05 2013 +0100 +++ b/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java Fri Jun 07 19:44:57 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -330,7 +330,7 @@ // as here we always retrieve the CKA_VALUE even for tokens // that do not have that bug. byte[] keyBytes = key.getEncoded(); - byte[] newBytes = P11Util.trimZeroes(keyBytes); + byte[] newBytes = KeyUtil.trimZeroes(keyBytes); if (keyBytes != newBytes) { key = new SecretKeySpec(newBytes, algorithm); } diff -r 883a1fbc5c1a -r d1563025e086 src/share/classes/sun/security/pkcs11/P11Signature.java --- a/src/share/classes/sun/security/pkcs11/P11Signature.java Wed May 22 16:12:05 2013 +0100 +++ b/src/share/classes/sun/security/pkcs11/P11Signature.java Fri Jun 07 19:44:57 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -41,6 +41,7 @@ import sun.security.pkcs11.wrapper.*; import static sun.security.pkcs11.wrapper.PKCS11Constants.*; +import sun.security.util.KeyUtil; /** * Signature implementation class. This class currently supports the @@ -687,8 +688,8 @@ BigInteger r = values[0].getPositiveBigInteger(); BigInteger s = values[1].getPositiveBigInteger(); // trim leading zeroes - byte[] br = P11Util.trimZeroes(r.toByteArray()); - byte[] bs = P11Util.trimZeroes(s.toByteArray()); + byte[] br = KeyUtil.trimZeroes(r.toByteArray()); + byte[] bs = KeyUtil.trimZeroes(s.toByteArray()); int k = Math.max(br.length, bs.length); // r and s each occupy half the array byte[] res = new byte[k << 1]; diff -r 883a1fbc5c1a -r d1563025e086 src/share/classes/sun/security/pkcs11/P11Util.java --- a/src/share/classes/sun/security/pkcs11/P11Util.java Wed May 22 16:12:05 2013 +0100 +++ b/src/share/classes/sun/security/pkcs11/P11Util.java Fri Jun 07 19:44:57 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -131,20 +131,6 @@ return b; } - // trim leading (most significant) zeroes from the result - static byte[] trimZeroes(byte[] b) { - int i = 0; - while ((i < b.length - 1) && (b[i] == 0)) { - i++; - } - if (i == 0) { - return b; - } - byte[] t = new byte[b.length - i]; - System.arraycopy(b, i, t, 0, t.length); - return t; - } - public static byte[] getMagnitude(BigInteger bi) { byte[] b = bi.toByteArray(); if ((b.length > 1) && (b[0] == 0)) { diff -r 883a1fbc5c1a -r d1563025e086 src/share/classes/sun/security/util/KeyUtil.java --- a/src/share/classes/sun/security/util/KeyUtil.java Wed May 22 16:12:05 2013 +0100 +++ b/src/share/classes/sun/security/util/KeyUtil.java Fri Jun 07 19:44:57 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -200,5 +200,24 @@ // Don't bother to check against the y^q mod p if safe primes are used. } + + /** + * Trim leading (most significant) zeroes from the result. + * + * @throws NullPointerException if {@code b} is null + */ + public static byte[] trimZeroes(byte[] b) { + int i = 0; + while ((i < b.length - 1) && (b[i] == 0)) { + i++; + } + if (i == 0) { + return b; + } From andrew at icedtea.classpath.org Fri Jun 7 11:49:09 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 07 Jun 2013 18:49:09 +0000 Subject: /hg/release/icedtea7-forest-2.4: Added tag icedtea-2.4.0 for cha... Message-ID: changeset 9c74cb4a3ae8 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=9c74cb4a3ae8 author: andrew date: Fri Jun 07 19:48:34 2013 +0100 Added tag icedtea-2.4.0 for changeset 30065a72715f diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 30065a72715f -r 9c74cb4a3ae8 .hgtags --- a/.hgtags Wed May 22 17:02:40 2013 +0100 +++ b/.hgtags Fri Jun 07 19:48:34 2013 +0100 @@ -303,3 +303,4 @@ d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19 b4b7795ef8047e3d2b2ba48a70c08d9184073100 jdk7u14-b19 f413e7a22c198559af5aca28309356e6d4edd78f jdk7u14-b20 +30065a72715f046e4a4bdec1c0cc7d65153c9d99 icedtea-2.4.0 From andrew at icedtea.classpath.org Fri Jun 7 11:49:16 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 07 Jun 2013 18:49:16 +0000 Subject: /hg/release/icedtea7-forest-2.4/corba: Added tag icedtea-2.4.0 f... Message-ID: changeset 71d5ec2f3dfb in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=71d5ec2f3dfb author: andrew date: Fri Jun 07 19:48:35 2013 +0100 Added tag icedtea-2.4.0 for changeset 47084105fe83 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 47084105fe83 -r 71d5ec2f3dfb .hgtags --- a/.hgtags Wed May 22 17:02:40 2013 +0100 +++ b/.hgtags Fri Jun 07 19:48:35 2013 +0100 @@ -303,3 +303,4 @@ bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19 a921b45a1f9086a7d598a76f920639050386f996 jdk7u14-b19 54320e5d9da60df24f0e2c57c011809911dc06e1 jdk7u14-b20 +47084105fe834aa1c6f2ee2bbea01deaa05059dd icedtea-2.4.0 From andrew at icedtea.classpath.org Fri Jun 7 11:49:23 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 07 Jun 2013 18:49:23 +0000 Subject: /hg/release/icedtea7-forest-2.4/jaxp: Added tag icedtea-2.4.0 fo... Message-ID: changeset 5eaf3bca7f68 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=5eaf3bca7f68 author: andrew date: Fri Jun 07 19:48:37 2013 +0100 Added tag icedtea-2.4.0 for changeset 7f04ed6cb0c3 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 7f04ed6cb0c3 -r 5eaf3bca7f68 .hgtags --- a/.hgtags Wed May 22 17:02:40 2013 +0100 +++ b/.hgtags Fri Jun 07 19:48:37 2013 +0100 @@ -303,3 +303,4 @@ 331e489ecb7b19fa98c60324f7ce5d168284a8c8 jdk7u14-b19 c3c9f04cf10c2fe576b208f6a8ca3777b1d31145 jdk7u14-b19 5e1fee011646b4a3ff29b7b9cdc208e0a0577cb4 jdk7u14-b20 +7f04ed6cb0c382a16c2ffaad05c6122482e03b2e icedtea-2.4.0 From andrew at icedtea.classpath.org Fri Jun 7 11:49:29 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 07 Jun 2013 18:49:29 +0000 Subject: /hg/release/icedtea7-forest-2.4/jaxws: Added tag icedtea-2.4.0 f... Message-ID: changeset 9d2007a13c02 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=9d2007a13c02 author: andrew date: Fri Jun 07 19:48:37 2013 +0100 Added tag icedtea-2.4.0 for changeset 426b7a73ab43 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 426b7a73ab43 -r 9d2007a13c02 .hgtags --- a/.hgtags Wed May 22 17:02:40 2013 +0100 +++ b/.hgtags Fri Jun 07 19:48:37 2013 +0100 @@ -303,3 +303,4 @@ 82be38857de3b2f6d8def98034f3e7b0827fd9f0 jdk7u14-b19 d63b21e6c3d29305400dbfc1500090cab89f25d1 jdk7u14-b19 dd695ad6c5ec797fe61db31600a3fd2dbc62247b jdk7u14-b20 +426b7a73ab43aca754c19dc21497ae90c147f91a icedtea-2.4.0 From andrew at icedtea.classpath.org Fri Jun 7 11:49:34 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 07 Jun 2013 18:49:34 +0000 Subject: /hg/release/icedtea7-forest-2.4/langtools: Added tag icedtea-2.4... Message-ID: changeset ffb1b6bc4750 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=ffb1b6bc4750 author: andrew date: Fri Jun 07 19:48:40 2013 +0100 Added tag icedtea-2.4.0 for changeset cbb9be4fb46d diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r cbb9be4fb46d -r ffb1b6bc4750 .hgtags --- a/.hgtags Wed May 22 17:02:41 2013 +0100 +++ b/.hgtags Fri Jun 07 19:48:40 2013 +0100 @@ -303,3 +303,4 @@ 5168a2c7af619364ddb342674ff880874c3b7897 jdk7u14-b19 e8c876a77def120b5eeb26535d0777c9b9f842f8 jdk7u14-b19 86ae75a68cc375cfc0559699b5270951aab09eb0 jdk7u14-b20 +cbb9be4fb46d8dfd3a8c32dc693f9501a64b9a47 icedtea-2.4.0 From andrew at icedtea.classpath.org Fri Jun 7 11:49:41 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 07 Jun 2013 18:49:41 +0000 Subject: /hg/release/icedtea7-forest-2.4/hotspot: Added tag icedtea-2.4.0... Message-ID: changeset c67fd7874b1a in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c67fd7874b1a author: andrew date: Fri Jun 07 19:48:41 2013 +0100 Added tag icedtea-2.4.0 for changeset ed247f9fb4fe diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r ed247f9fb4fe -r c67fd7874b1a .hgtags --- a/.hgtags Wed May 22 17:02:41 2013 +0100 +++ b/.hgtags Fri Jun 07 19:48:41 2013 +0100 @@ -497,3 +497,4 @@ c23596bfe3b8a21076f8454a3cd6606ee7e928a5 jdk7u14-b20 d6cf0e0eee29e173b8446455991e22249da0e860 hs24-b39 3295faa5b5cc4f165c0e6798fd40ab4f5c17dd6d hs24-b40 +ed247f9fb4fee475dd6334d20e91779807522bb3 icedtea-2.4.0 From andrew at icedtea.classpath.org Fri Jun 7 11:49:50 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 07 Jun 2013 18:49:50 +0000 Subject: /hg/release/icedtea7-forest-2.4/jdk: Added tag icedtea-2.4.0 for... Message-ID: changeset 29ce11184945 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=29ce11184945 author: andrew date: Fri Jun 07 19:48:43 2013 +0100 Added tag icedtea-2.4.0 for changeset d1563025e086 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r d1563025e086 -r 29ce11184945 .hgtags --- a/.hgtags Fri Jun 07 19:44:57 2013 +0100 +++ b/.hgtags Fri Jun 07 19:48:43 2013 +0100 @@ -299,3 +299,4 @@ eb4807b899c84c92959b66f888f8cc8b028c7665 jdk7u14-b19 a249c45148c51dc53250c5d0c3d506ec5f9b88ab jdk7u14-b19 bb8764ec11c2c4ca318bcf6aabdabd29c70b2cd1 jdk7u14-b20 +d1563025e086a464f05414267b84a6408f7b377d icedtea-2.4.0 From andrew at icedtea.classpath.org Fri Jun 7 12:29:01 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 07 Jun 2013 19:29:01 +0000 Subject: /hg/icedtea7: PR1276: Synchronise CACAO rules between IcedTea6/7... Message-ID: changeset d0b14be8cbf8 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=d0b14be8cbf8 author: Andrew John Hughes date: Fri Jun 07 20:28:52 2013 +0100 PR1276: Synchronise CACAO rules between IcedTea6/7/8 where possible 2013-06-07 Andrew John Hughes PR1276: Synchronise CACAO rules between IcedTea6/7/8 where possible * NEWS: Updated. 2011-02-23 Andrew John Hughes * acinclude.m4: (IT_WITH_CACAO_SRC_DIR): Renamed from IT_CHECK_WITH_CACAO_SRC_DIR. * configure.ac: Synchronise naming. 2011-02-21 Andrew John Hughes Ensure all our macros have an IT_ prefix. * acinclude.m4: (IT_CHECK_WITH_CACAO_SRC_DIR): Renamed from AC_CHECK_WITH_CACAO_SRC_DIR. * configure.ac: Synchronise naming. 2010-01-16 Andrew John Hughes * acinclude.m4: (AC_CHECK_WITH_CACAO_SRC_DIR): Quote checking output. 2009-10-01 Robert Schuster * configure.ac: Added --with-cacao-src-dir option. * acinclude: New macro AC_CHECK_WITH_CACAO_SRC_DIR. * Makefile.am: Copy Cacao sources when USE_ALT_CACAO_SRC_DIR is used. diffstat: ChangeLog | 35 +++++++++++++++++++++++++++++++++++ Makefile.am | 11 +++++++++++ NEWS | 2 ++ acinclude.m4 | 17 +++++++++++++++++ configure.ac | 1 + 5 files changed, 66 insertions(+), 0 deletions(-) diffs (141 lines): diff -r 66008a8b7417 -r d0b14be8cbf8 ChangeLog --- a/ChangeLog Thu Jun 06 19:52:57 2013 +0100 +++ b/ChangeLog Fri Jun 07 20:28:52 2013 +0100 @@ -1,3 +1,36 @@ +2013-06-07 Andrew John Hughes + + PR1276: Synchronise CACAO rules between IcedTea6/7/8 + where possible + * NEWS: Updated. + +2011-02-23 Andrew John Hughes + + * acinclude.m4: + (IT_WITH_CACAO_SRC_DIR): Renamed from + IT_CHECK_WITH_CACAO_SRC_DIR. + * configure.ac: Synchronise naming. + +2011-02-21 Andrew John Hughes + + Ensure all our macros have an IT_ prefix. + * acinclude.m4: + (IT_CHECK_WITH_CACAO_SRC_DIR): Renamed from + AC_CHECK_WITH_CACAO_SRC_DIR. + * configure.ac: Synchronise naming. + +2010-01-16 Andrew John Hughes + + * acinclude.m4: + (AC_CHECK_WITH_CACAO_SRC_DIR): Quote checking + output. + +2009-10-01 Robert Schuster + + * configure.ac: Added --with-cacao-src-dir option. + * acinclude: New macro AC_CHECK_WITH_CACAO_SRC_DIR. + * Makefile.am: Copy Cacao sources when USE_ALT_CACAO_SRC_DIR is used. + 2013-06-06 Andrew John Hughes S7191872: Xrender: No text displayed using @@ -251,6 +284,8 @@ 2013-04-24 Andrew John Hughes + PR1278: Synchronise CACAO versions between IcedTea6/7/8 + where possible * patches/cacao/jsig.patch: Removed. * Makefile.am: diff -r 66008a8b7417 -r d0b14be8cbf8 Makefile.am --- a/Makefile.am Thu Jun 06 19:52:57 2013 +0100 +++ b/Makefile.am Fri Jun 07 20:28:52 2013 +0100 @@ -1088,6 +1088,8 @@ stamps/download-cacao.stamp: if BUILD_CACAO if !USE_SYSTEM_CACAO +if USE_ALT_CACAO_SRC_DIR +else if USE_ALT_CACAO_SRC_ZIP ln -sf $(ALT_CACAO_SRC_ZIP) $(CACAO_SRC_ZIP) endif @@ -1109,6 +1111,7 @@ fi endif endif +endif mkdir -p stamps touch $@ @@ -1288,6 +1291,13 @@ stamps/extract-cacao.stamp: stamps/download-cacao.stamp if BUILD_CACAO if !USE_SYSTEM_CACAO +if USE_ALT_CACAO_SRC_DIR + if ! test -d cacao ; \ + then \ + mkdir -p cacao/cacao ; \ + cp -r $(ALT_CACAO_SRC_DIR)/* cacao/cacao/ ; \ + fi +else set -e ; \ if ! test -d cacao/cacao ; \ then \ @@ -1300,6 +1310,7 @@ fi endif endif +endif mkdir -p stamps touch $@ diff -r 66008a8b7417 -r d0b14be8cbf8 NEWS --- a/NEWS Thu Jun 06 19:52:57 2013 +0100 +++ b/NEWS Fri Jun 07 20:28:52 2013 +0100 @@ -843,6 +843,8 @@ - Clang fix for the i386 backend - Fix rt-timing - Moved rt-timing.{c,h} to C++ + - PR1278: Synchronise CACAO versions between IcedTea6/7/8 where possible + - PR1276: Synchronise CACAO rules between IcedTea6/7/8 where possible * JamVM - JSR 335: (lambda expressions) initial hack - JEP 171: Implement fence methods in sun.misc.Unsafe diff -r 66008a8b7417 -r d0b14be8cbf8 acinclude.m4 --- a/acinclude.m4 Thu Jun 06 19:52:57 2013 +0100 +++ b/acinclude.m4 Fri Jun 07 20:28:52 2013 +0100 @@ -815,6 +815,23 @@ AC_SUBST(ALT_CACAO_SRC_ZIP) ]) +AC_DEFUN([IT_WITH_CACAO_SRC_DIR], +[ + AC_MSG_CHECKING([for a CACAO source directory]) + AC_ARG_WITH([cacao-src-dir], + [AS_HELP_STRING(--with-cacao-src-dir,specify the location of the Cacao sources)], + [ + ALT_CACAO_SRC_DIR=${withval} + AM_CONDITIONAL(USE_ALT_CACAO_SRC_DIR, test x = x) + ], + [ + ALT_CACAO_SRC_DIR="not specified" + AM_CONDITIONAL(USE_ALT_CACAO_SRC_DIR, test x != x) + ]) + AC_MSG_RESULT(${ALT_CACAO_SRC_DIR}) + AC_SUBST(ALT_CACAO_SRC_DIR) +]) + AC_DEFUN([IT_ENABLE_HG], [ AC_REQUIRE([IT_WITH_PROJECT]) diff -r 66008a8b7417 -r d0b14be8cbf8 configure.ac --- a/configure.ac Thu Jun 06 19:52:57 2013 +0100 +++ b/configure.ac Fri Jun 07 20:28:52 2013 +0100 @@ -167,6 +167,7 @@ IT_ENABLE_CACAO IT_WITH_CACAO_HOME IT_WITH_CACAO_SRC_ZIP +IT_WITH_CACAO_SRC_DIR IT_ENABLE_JAMVM IT_WITH_JAMVM_SRC_ZIP From bugzilla-daemon at icedtea.classpath.org Fri Jun 7 12:29:10 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 07 Jun 2013 19:29:10 +0000 Subject: [Bug 1276] [IcedTea7] Synchronise CACAO rules between IcedTea6/7/8 where possible In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1276 --- Comment #3 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7?cmd=changeset;node=d0b14be8cbf8 author: Andrew John Hughes date: Fri Jun 07 20:28:52 2013 +0100 PR1276: Synchronise CACAO rules between IcedTea6/7/8 where possible 2013-06-07 Andrew John Hughes PR1276: Synchronise CACAO rules between IcedTea6/7/8 where possible * NEWS: Updated. 2011-02-23 Andrew John Hughes * acinclude.m4: (IT_WITH_CACAO_SRC_DIR): Renamed from IT_CHECK_WITH_CACAO_SRC_DIR. * configure.ac: Synchronise naming. 2011-02-21 Andrew John Hughes Ensure all our macros have an IT_ prefix. * acinclude.m4: (IT_CHECK_WITH_CACAO_SRC_DIR): Renamed from AC_CHECK_WITH_CACAO_SRC_DIR. * configure.ac: Synchronise naming. 2010-01-16 Andrew John Hughes * acinclude.m4: (AC_CHECK_WITH_CACAO_SRC_DIR): Quote checking output. 2009-10-01 Robert Schuster * configure.ac: Added --with-cacao-src-dir option. * acinclude: New macro AC_CHECK_WITH_CACAO_SRC_DIR. * Makefile.am: Copy Cacao sources when USE_ALT_CACAO_SRC_DIR is used. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130607/51583c80/attachment.html From adomurad at icedtea.classpath.org Fri Jun 7 13:05:28 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Fri, 07 Jun 2013 20:05:28 +0000 Subject: /hg/release/icedtea-web-1.4: Fix PR1465 - java.io.FileNotFoundEx... Message-ID: changeset adaba1e22d66 in /hg/release/icedtea-web-1.4 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=adaba1e22d66 author: Adam Domurad date: Fri Jun 07 16:05:13 2013 -0400 Fix PR1465 - java.io.FileNotFoundException while trying to download a JAR file diffstat: ChangeLog | 13 +++++ NEWS | 2 + netx/net/sourceforge/jnlp/util/UrlUtils.java | 15 +++++- tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java | 4 +- tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java | 26 +++++++++- 5 files changed, 56 insertions(+), 4 deletions(-) diffs (139 lines): diff -r f9a77057c524 -r adaba1e22d66 ChangeLog --- a/ChangeLog Thu Jun 06 17:08:19 2013 +0200 +++ b/ChangeLog Fri Jun 07 16:05:13 2013 -0400 @@ -1,3 +1,16 @@ +2013-06-07 Adam Domurad + + Fix PR1465 + * NEWS: Bug fix note + * netx/net/sourceforge/jnlp/util/UrlUtils.java + (isValidRFC2396Url): New, tests if valid URL by RFC2396 rules + (normalizeUrl): Don't normalize if valid by RFC2396 + * tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java: + Adapt which URLs we expect to change when normalizing URLs + * tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java: + (testIsValidRFC2396Url): New, tests isValidRFC2396Url + (testNormalizeUrl): Add new test with valid RFC2396 URL + 2013-06-06 Jiri Vanek Made all tests running wit junit4.10 and higher diff -r f9a77057c524 -r adaba1e22d66 NEWS --- a/NEWS Thu Jun 06 17:08:19 2013 +0200 +++ b/NEWS Fri Jun 07 16:05:13 2013 -0400 @@ -9,6 +9,8 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY New in release 1.4.1 (2013-XX-YY): +* NetX + - PR1465 - java.io.FileNotFoundException while trying to download a JAR file * Plugin - PR854: Resizing an applet several times causes 100% CPU load diff -r f9a77057c524 -r adaba1e22d66 netx/net/sourceforge/jnlp/util/UrlUtils.java --- a/netx/net/sourceforge/jnlp/util/UrlUtils.java Thu Jun 06 17:08:19 2013 +0200 +++ b/netx/net/sourceforge/jnlp/util/UrlUtils.java Fri Jun 07 16:05:13 2013 -0400 @@ -86,16 +86,29 @@ } } + /* Use the URI syntax check of 'toURI' to see if it matches RFC2396. + * See http://www.ietf.org/rfc/rfc2396.txt */ + public static boolean isValidRFC2396Url(URL url) { + try { + url.toURI(); + return true; + } catch (URISyntaxException e) { + return false; + } + } + /* Ensure a URL is properly percent-encoded. * Certain usages require local-file URLs to be encoded, eg for code-base & document-base. */ public static URL normalizeUrl(URL url, boolean encodeFileUrls) throws MalformedURLException, UnsupportedEncodingException, URISyntaxException { if (url == null) { return null; } + String protocol = url.getProtocol(); boolean shouldEncode = (encodeFileUrls || !"file".equals(protocol)); - if (protocol == null || !shouldEncode || url.getPath() == null) { + // PR1465: We should not call 'URLDecoder.decode' on RFC2396-compliant URLs + if (protocol == null || !shouldEncode || url.getPath() == null || isValidRFC2396Url(url)) { return url; } diff -r f9a77057c524 -r adaba1e22d66 tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java --- a/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java Thu Jun 06 17:08:19 2013 +0200 +++ b/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java Fri Jun 07 16:05:13 2013 -0400 @@ -80,7 +80,7 @@ Assert.assertFalse("url " + i + " must be normalized (and so not equals) too normalized url " + i, u[i].equals(n[i])); } } - public static final int CHANGE_BORDER = 6; + public static final int CHANGE_BORDER = 8; public static URL[] getUrls() throws MalformedURLException { URL[] u = { @@ -91,9 +91,9 @@ new URL("http:///SpacesCanBeEverywhere1.jnlp"), new URL("file://localhost/home/jvanek/Desktop/icedtea-web/tests.build/jnlp_test_server/Spaces can be everywhere2.jnlp"), new URL("http://localhost:44321/testpage.jnlp?applicationID=25"), - /*changing*/ new URL("http://localhost:44321/Spaces%20Can%20Be%20Everyw%2Fhere1.jnlp"), new URL("http://localhost/Spaces+Can+Be+Everywhere1.jnlp"), + /*changing*/ new URL("http://localhost/SpacesC anBeEverywhere1.jnlp?a=5&b=10#df"), new URL("http:///oook.jnlp?a=5&b=ahoj ???? dd#df"), new URL("http://localhost/Spaces?????????????????????? can !@^*(){}[].jnlp?a=5&ahoj ???? dd#df"), diff -r f9a77057c524 -r adaba1e22d66 tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java --- a/tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java Thu Jun 06 17:08:19 2013 +0200 +++ b/tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java Fri Jun 07 16:05:13 2013 -0400 @@ -39,8 +39,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.io.File; +import java.net.MalformedURLException; +import java.net.URISyntaxException; import java.net.URL; import org.junit.Test; @@ -95,6 +98,27 @@ // Test file URL with file URL encoding turned on assertEquals("file://example/%20test", UrlUtils.normalizeUrl(new URL("file://example/ test"), true).toString()); + + // PR1465: Test that RFC2396-compliant URLs are not touched + // Example taken from bug report: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1465 + String rfc2396Valid = "https://example.com/,DSID=64c19c5b657df383835706571a7c7216,DanaInfo=example.com,CT=java+JICAComponents/JICA-sicaN.jar"; + assertEquals(rfc2396Valid, + UrlUtils.normalizeUrl(new URL(rfc2396Valid)).toString()); + } + + @Test + public void testIsValidRFC2396Url() throws Exception { + String rfc2396Valid = "https://example.com/,foo=bar+baz/JICA-sicaN.jar"; + assertTrue(UrlUtils.isValidRFC2396Url(new URL(rfc2396Valid))); + + // These should invalidate the URL + // See http://www.ietf.org/rfc/rfc2396.txt (2.4.3. Excluded US-ASCII Characters) + char[] invalidCharacters = {'<', '>', '%', '"', }; + for (char chr : invalidCharacters) { + assertFalse("validation failed with '" + chr + "'",UrlUtils.isValidRFC2396Url(new URL(rfc2396Valid + chr))); + } + //special test for space inisde. Space at the end can be trimmed + assertFalse("validation failed with '" + ' ' + "'",UrlUtils.isValidRFC2396Url(new URL("https://example.com/,foo=bar+ba z/JICA-sicaN.jar"))); } @Test @@ -116,4 +140,4 @@ assertEquals(testFile, UrlUtils.decodeUrlAsFile(encodedUrl)); } } -} \ No newline at end of file +} From bugzilla-daemon at icedtea.classpath.org Fri Jun 7 13:05:36 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 07 Jun 2013 20:05:36 +0000 Subject: [Bug 1465] java.io.FileNotFoundException while trying to download a JAR file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1465 --- Comment #11 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea-web-1.4?cmd=changeset;node=adaba1e22d66 author: Adam Domurad date: Fri Jun 07 16:05:13 2013 -0400 Fix PR1465 - java.io.FileNotFoundException while trying to download a JAR file -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130607/d68d0713/attachment.html From andrew at icedtea.classpath.org Fri Jun 7 14:22:09 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 07 Jun 2013 21:22:09 +0000 Subject: /hg/icedtea7: 2 new changesets Message-ID: changeset c80657a5e6e4 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=c80657a5e6e4 author: Andrew John Hughes date: Fri Jun 07 21:57:24 2013 +0100 Added tag icedtea-2.4-branchpoint for changeset d0b14be8cbf8 changeset a0b3e77af9d3 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=a0b3e77af9d3 author: Andrew John Hughes date: Fri Jun 07 22:22:02 2013 +0100 Start 2.5 release series. 2013-06-07 Andrew John Hughes * configure.ac: Set to 2.5pre. * NEWS: Add 2.5.0 section. diffstat: .hgtags | 1 + ChangeLog | 5 +++++ NEWS | 2 ++ configure.ac | 2 +- 4 files changed, 9 insertions(+), 1 deletions(-) diffs (41 lines): diff -r d0b14be8cbf8 -r a0b3e77af9d3 .hgtags --- a/.hgtags Fri Jun 07 20:28:52 2013 +0100 +++ b/.hgtags Fri Jun 07 22:22:02 2013 +0100 @@ -34,3 +34,4 @@ d35c742babc02eb874684ea7cb647ef5eda55c75 icedtea-2.1-branchpoint 2917541bbda4f6745b157f39d7bd39472cae5235 icedtea-2.2-branchpoint 60c41b88775a8043ff4922278eb0e801c330e8fe icedtea-2.3-branchpoint +d0b14be8cbf8a705a3bec6cf8828b982405b059c icedtea-2.4-branchpoint diff -r d0b14be8cbf8 -r a0b3e77af9d3 ChangeLog --- a/ChangeLog Fri Jun 07 20:28:52 2013 +0100 +++ b/ChangeLog Fri Jun 07 22:22:02 2013 +0100 @@ -1,3 +1,8 @@ +2013-06-07 Andrew John Hughes + + * configure.ac: Set to 2.5pre. + * NEWS: Add 2.5.0 section. + 2013-06-07 Andrew John Hughes PR1276: Synchronise CACAO rules between IcedTea6/7/8 diff -r d0b14be8cbf8 -r a0b3e77af9d3 NEWS --- a/NEWS Fri Jun 07 20:28:52 2013 +0100 +++ b/NEWS Fri Jun 07 22:22:02 2013 +0100 @@ -10,6 +10,8 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release 2.5.0 (2012-XX-XX): + New in release 2.4.0 (2012-XX-XX): OpenJDK diff -r d0b14be8cbf8 -r a0b3e77af9d3 configure.ac --- a/configure.ac Fri Jun 07 20:28:52 2013 +0100 +++ b/configure.ac Fri Jun 07 22:22:02 2013 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.4pre], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea], [2.5pre], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From jvanek at redhat.com Mon Jun 10 08:24:24 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 10 Jun 2013 17:24:24 +0200 Subject: [rfc][icedtea-web] fix (And tests) for PR1473 In-Reply-To: <51B5B02E.7020001@redhat.com> References: <51B5B02E.7020001@redhat.com> Message-ID: <51B5EFA8.1010601@redhat.com> This patch is removing the redownloading of jnlp file - both from local file and form network, and so fixing the http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1473 The unhappy redownloading was added during one of inital pushes - http://icedtea.classpath.org/hg/icedtea-web/rev/1d604ccd9b6b And I'm wondering why:) J. -------------- next part -------------- A non-text attachment was scrubbed... Name: fixedLocalFilesLaunching2.diff Type: text/x-patch Size: 10164 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130610/c409f698/fixedLocalFilesLaunching2.diff From jvanek at icedtea.classpath.org Mon Jun 10 04:23:11 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Mon, 10 Jun 2013 11:23:11 +0000 Subject: /hg/icedtea-web: Handled semicolon in internal server (with repr... Message-ID: changeset 1a327a09262e in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=1a327a09262e author: Jiri Vanek date: Mon Jun 10 13:22:53 2013 +0200 Handled semicolon in internal server (with reproducers) diffstat: ChangeLog | 18 ++ tests/reproducers/simple/StripHttpPathParams/resources/StripHttpPathParams.html | 48 +++++++ tests/reproducers/simple/StripHttpPathParams/resources/StripHttpPathParams.jnlp | 53 +++++++ tests/reproducers/simple/StripHttpPathParams/srcs/StripHttpPathParams.java | 51 +++++++ tests/reproducers/simple/StripHttpPathParams/testcases/StripHttpPathParamsTest.java | 68 ++++++++++ tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java | 28 ++++ tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java | 24 +++ 7 files changed, 290 insertions(+), 0 deletions(-) diffs (338 lines): diff -r e8341834febd -r 1a327a09262e ChangeLog --- a/ChangeLog Thu Jun 06 17:07:28 2013 +0200 +++ b/ChangeLog Mon Jun 10 13:22:53 2013 +0200 @@ -1,3 +1,21 @@ +2013-06-06 Jiri Vanek + Andrew Azores + + Handled semicolon in internal server + * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: + added stripHttpPathParams method to remove semicolon-delimited "tags" + from end of JAR URLs + * tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java: + added test case for new method in TinyHttpdImpl + * tests/reproducers/simple/StripHttpPathParams/resources/StripHttpPathParams.html: + browser-launched applet test case for reproducer + * tests/reproducers/simple/StripHttpPathParams/resources/StripHttpPathParams.jnlp: + JNLP test case for reproducer + * tests/reproducers/simple/StripHttpPathParams/srcs/StripHttpPathParams.java: + reproducer + * tests/reproducers/simple/StripHttpPathParams/testcases/StripHttpPathParamsTest.java: + Testcase to above reproducer + 2013-06-06 Jiri Vanek Made all tests running wit junit4.10 and higher diff -r e8341834febd -r 1a327a09262e tests/reproducers/simple/StripHttpPathParams/resources/StripHttpPathParams.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/StripHttpPathParams/resources/StripHttpPathParams.html Mon Jun 10 13:22:53 2013 +0200 @@ -0,0 +1,48 @@ + + + + + + + + diff -r e8341834febd -r 1a327a09262e tests/reproducers/simple/StripHttpPathParams/resources/StripHttpPathParams.jnlp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/StripHttpPathParams/resources/StripHttpPathParams.jnlp Mon Jun 10 13:22:53 2013 +0200 @@ -0,0 +1,53 @@ + + + + + StripHttpPathParams + IcedTea + + Remove HTTP Path Parameters from JAR URLs + + + + + + + + + diff -r e8341834febd -r 1a327a09262e tests/reproducers/simple/StripHttpPathParams/srcs/StripHttpPathParams.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/StripHttpPathParams/srcs/StripHttpPathParams.java Mon Jun 10 13:22:53 2013 +0200 @@ -0,0 +1,51 @@ +/* StripHttpPathParams.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; + +public class StripHttpPathParams extends Applet { + private static final String appletCloseString = "*** APPLET FINISHED ***"; + + public static void main(String[] args) { + System.out.println("running"); + } + + @Override + public void init() { + System.out.println(appletCloseString); + } +} diff -r e8341834febd -r 1a327a09262e tests/reproducers/simple/StripHttpPathParams/testcases/StripHttpPathParamsTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/StripHttpPathParams/testcases/StripHttpPathParamsTest.java Mon Jun 10 13:22:53 2013 +0200 @@ -0,0 +1,68 @@ +/* StripHttpPathParamsTest.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 net.sourceforge.jnlp.ProcessResult; +import net.sourceforge.jnlp.ServerAccess.AutoClose; +import net.sourceforge.jnlp.annotations.KnownToFail; +import net.sourceforge.jnlp.annotations.NeedsDisplay; +import net.sourceforge.jnlp.annotations.TestInBrowsers; +import net.sourceforge.jnlp.browsertesting.BrowserTest; +import net.sourceforge.jnlp.browsertesting.Browsers; +import net.sourceforge.jnlp.closinglisteners.AutoOkClosingListener; + +import org.junit.Assert; +import org.junit.Test; + +public class StripHttpPathParamsTest extends BrowserTest { + + private static final String appletCloseString = AutoOkClosingListener.MAGICAL_OK_CLOSING_STRING; + + @Test + public void testStripHttpPathParamsLaunch() throws Exception { + ProcessResult pr = server.executeJavawsHeadless("/StripHttpPathParams.jnlp"); + Assert.assertTrue("stdout should contain \"running\" but did not", pr.stdout.contains("running")); + } + + @NeedsDisplay + @Test + @TestInBrowsers(testIn={Browsers.one}) + public void testStripHttpPathParamsApplet() throws Exception { + ProcessResult pr = server.executeBrowser("/StripHttpPathParams.html", AutoClose.CLOSE_ON_BOTH); + Assert.assertTrue("stdout should contain " + appletCloseString + " but did not", pr.stdout.contains(appletCloseString)); + } + +} diff -r e8341834febd -r 1a327a09262e tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java --- a/tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java Thu Jun 06 17:07:28 2013 +0200 +++ b/tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java Mon Jun 10 13:22:53 2013 +0200 @@ -217,6 +217,34 @@ Assert.assertArrayEquals(b2, bb[1]); Assert.assertArrayEquals(b3, bb[2]); } + + @Test + public void stripHttpPathParamTest() { + String[] testBaseUrls = { + "http://foo.com/bar", + "localhost:8080", + "https://bar.co.uk/site;para/baz?u=param1&v=param2" + }; + + String[] testJarNames = { + "jar", + "foo.jar", + "bar;baz.jar", + "nom.jar;", + "rhat.jar.pack.gz;tag" + }; + + for (String url : testBaseUrls) { + for (String jar : testJarNames) { + String newUrl = TinyHttpdImpl.stripHttpPathParams(url), + newJar = TinyHttpdImpl.stripHttpPathParams(jar), + path = newUrl + "/" + newJar; + Assert.assertTrue("Base URL should not have been modified: " + url + " => " + newUrl, newUrl.equals(url)); + Assert.assertTrue("JAR name should not be altered other than removing path param: " + jar + " => " + newJar, jar.startsWith(newJar)); + Assert.assertTrue("New path should be a substring of old path: " + path + " => " + url + "/" + jar, (url + "/" + jar).startsWith(path)); + } + } + } private void printArrays(byte[][] bb) { System.out.println("[][] l=" + bb.length); diff -r e8341834febd -r 1a327a09262e tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java --- a/tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java Thu Jun 06 17:07:28 2013 +0200 +++ b/tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java Mon Jun 10 13:22:53 2013 +0200 @@ -127,6 +127,7 @@ p = URLDecoder.decode(p, "UTF-8"); p = p.replaceAll("\\?.*", ""); p = (".".concat((p.endsWith("/")) ? p.concat("index.html") : p)).replace('/', File.separatorChar); + p = stripHttpPathParams(p); ServerAccess.logNoReprint("Serving: " + p); File pp = new File(dir, p); int l = (int) pp.length(); @@ -203,4 +204,27 @@ } return array; } + + /** + * This function removes the HTTP Path Parameter from a given JAR URL, assuming that the + * path param delimiter is a semicolon + * @param url - the URL from which to remove the path parameter + * @return the URL with the path parameter removed + */ + public static String stripHttpPathParams(String url) { + if (url == null) { + return null; + } + + // If JNLP specifies JAR URL with .JAR extension (as it should), then look for any semicolons + // after this position. If one is found, remove it and any following characters. + int fileExtension = url.toUpperCase().lastIndexOf(".JAR"); + if (fileExtension != -1) { + int firstSemiColon = url.indexOf(';', fileExtension); + if (firstSemiColon != -1) { + url = url.substring(0, firstSemiColon); + } + } + return url; + } } From bugzilla-daemon at icedtea.classpath.org Mon Jun 10 07:37:22 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 10 Jun 2013 14:37:22 +0000 Subject: [Bug 900] Fatal: Application Error: Unknown Main-Class. Could not determine the main class for this application. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=900 Adam Domurad changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |adomurad at redhat.com Resolution|--- |FIXED --- Comment #1 from Adam Domurad --- This appears to be fixed in 1.4 and possibly earlier. Thanks. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130610/e6c68d1b/attachment.html From ptisnovs at icedtea.classpath.org Mon Jun 10 00:29:54 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 10 Jun 2013 07:29:54 +0000 Subject: /hg/rhino-tests: Small updates in getAnnotation and getAnnotatio... Message-ID: changeset f05207753755 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=f05207753755 author: Pavel Tisnovsky date: Mon Jun 10 09:33:25 2013 +0200 Small updates in getAnnotation and getAnnotations tests. diffstat: ChangeLog | 5 +++ src/org/RhinoTests/ScriptEngineClassTest.java | 36 +++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diffs (79 lines): diff -r 7a2365e86a6d -r f05207753755 ChangeLog --- a/ChangeLog Fri Jun 07 13:38:43 2013 +0200 +++ b/ChangeLog Mon Jun 10 09:33:25 2013 +0200 @@ -1,3 +1,8 @@ +2013-06-10 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptEngineClassTest.java: + Small updates in getAnnotation and getAnnotations tests. + 2013-06-07 Pavel Tisnovsky * src/org/RhinoTests/ScriptEngineClassTest.java: diff -r 7a2365e86a6d -r f05207753755 src/org/RhinoTests/ScriptEngineClassTest.java --- a/src/org/RhinoTests/ScriptEngineClassTest.java Fri Jun 07 13:38:43 2013 +0200 +++ b/src/org/RhinoTests/ScriptEngineClassTest.java Mon Jun 10 09:33:25 2013 +0200 @@ -1027,6 +1027,9 @@ final String[] annotationsThatShouldExists_jdk7 = { }; + final String[] annotationsThatShouldExists_jdk8 = { + }; + // get all annotations Annotation[] annotations = this.scriptEngineClass.getAnnotations(); // and transform the array into a list of annotation names @@ -1034,7 +1037,20 @@ for (Annotation annotation : annotations) { annotationsAsString.add(annotation.toString()); } - String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + + String[] annotationsThatShouldExists = null; + switch (getJavaVersion()) { + case 6: + annotationsThatShouldExists = annotationsThatShouldExists_jdk6; + break; + case 7: + annotationsThatShouldExists = annotationsThatShouldExists_jdk7; + break; + case 8: + annotationsThatShouldExists = annotationsThatShouldExists_jdk8; + break; + } + // check if all required annotations really exists for (String annotationThatShouldExists : annotationsThatShouldExists) { assertTrue(annotationsAsString.contains(annotationThatShouldExists), @@ -1053,6 +1069,9 @@ final String[] annotationsThatShouldExists_jdk7 = { }; + final String[] annotationsThatShouldExists_jdk8 = { + }; + // get all annotations Annotation[] annotations = this.scriptEngineClass.getDeclaredAnnotations(); // and transform the array into a list of annotation names @@ -1060,7 +1079,20 @@ for (Annotation annotation : annotations) { annotationsAsString.add(annotation.toString()); } - String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + + String[] annotationsThatShouldExists = null; + switch (getJavaVersion()) { + case 6: + annotationsThatShouldExists = annotationsThatShouldExists_jdk6; + break; + case 7: + annotationsThatShouldExists = annotationsThatShouldExists_jdk7; + break; + case 8: + annotationsThatShouldExists = annotationsThatShouldExists_jdk8; + break; + } + // check if all required annotations really exists for (String annotationThatShouldExists : annotationsThatShouldExists) { assertTrue(annotationsAsString.contains(annotationThatShouldExists), From ptisnovs at icedtea.classpath.org Mon Jun 10 00:24:36 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 10 Jun 2013 07:24:36 +0000 Subject: /hg/gfx-test: Ten new tests added into BitBltUsingBgColor test s... Message-ID: changeset f9f7b283f2df in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=f9f7b283f2df author: Pavel Tisnovsky date: Mon Jun 10 09:28:04 2013 +0200 Ten new tests added into BitBltUsingBgColor test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 170 +++++++++++++++++++++ 2 files changed, 175 insertions(+), 0 deletions(-) diffs (192 lines): diff -r 32d36d51bf47 -r f9f7b283f2df ChangeLog --- a/ChangeLog Fri Jun 07 13:20:10 2013 +0200 +++ b/ChangeLog Mon Jun 10 09:28:04 2013 +0200 @@ -1,3 +1,8 @@ +2013-06-10 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Ten new tests added into BitBltUsingBgColor test suite. + 2013-06-07 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBasicTests.java: diff -r 32d36d51bf47 -r f9f7b283f2df src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Fri Jun 07 13:20:10 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Mon Jun 10 09:28:04 2013 +0200 @@ -524,6 +524,176 @@ } /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_3BYTE_BGR + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltDiagonalCheckerBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_4BYTE_ABGR + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltDiagonalCheckerBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_4BYTE_ABGR + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltDiagonalCheckerBufferedImageType4ByteABGRPre(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_INT_ARGB + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltDiagonalCheckerBufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_INT_ARGB_PRE + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltDiagonalCheckerBufferedImageTypeIntARGBPre(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_INT_BGR + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltDiagonalCheckerBufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_INT_BGR, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_INT_RGB + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltDiagonalCheckerBufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_INT_RGB, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_BYTE_BINARY + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltDiagonalCheckerBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_BYTE_GRAY + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltDiagonalCheckerBufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_BYTE_INDEXED + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltDiagonalCheckerBufferedImageTypeByteIndexed(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED, backgroundColor); + } + + /** * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. * Background color is set to Color.black. * From bugzilla-daemon at icedtea.classpath.org Sun Jun 9 16:20:56 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 09 Jun 2013 23:20:56 +0000 Subject: [Bug 1274] [TRACKER] IcedTea 2.4.0 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1274 Bug 1274 depends on bug 1278, which changed state. Bug 1278 Summary: [IcedTea7] Synchronise CACAO versions between IcedTea6/7/8 where possible http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1278 What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130609/36c75f84/attachment.html From bugzilla-daemon at icedtea.classpath.org Sun Jun 9 16:20:56 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 09 Jun 2013 23:20:56 +0000 Subject: [Bug 806] CACAO doesn't work with OpenJDK7 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=806 Bug 806 depends on bug 1278, which changed state. Bug 1278 Summary: [IcedTea7] Synchronise CACAO versions between IcedTea6/7/8 where possible http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1278 What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130609/432c8176/attachment.html From bugzilla-daemon at icedtea.classpath.org Sun Jun 9 16:20:55 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 09 Jun 2013 23:20:55 +0000 Subject: [Bug 1278] [IcedTea7] Synchronise CACAO versions between IcedTea6/7/8 where possible In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1278 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED --- Comment #2 from Andrew John Hughes --- http://icedtea.classpath.org/hg/release/icedtea7-2.4/rev/e562523c5037 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130609/28ad1ff9/attachment.html From bugzilla-daemon at icedtea.classpath.org Sun Jun 9 16:17:01 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 09 Jun 2013 23:17:01 +0000 Subject: [Bug 1274] [TRACKER] IcedTea 2.4.0 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1274 Bug 1274 depends on bug 1276, which changed state. Bug 1276 Summary: [IcedTea7] Synchronise CACAO rules between IcedTea6/7/8 where possible http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1276 What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130609/6b018987/attachment.html From bugzilla-daemon at icedtea.classpath.org Sun Jun 9 16:17:01 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 09 Jun 2013 23:17:01 +0000 Subject: [Bug 1276] [IcedTea7] Synchronise CACAO rules between IcedTea6/7/8 where possible In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1276 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130609/c08fdba7/attachment.html From bugzilla-daemon at icedtea.classpath.org Sun Jun 9 15:00:02 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 09 Jun 2013 22:00:02 +0000 Subject: [Bug 1435] [IcedTea7] OpenJDK 7 returns incorrect TrueType font metrics In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1435 --- Comment #5 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-2.4?cmd=changeset;node=40b63423b460 author: Andrew John Hughes date: Sun Jun 09 18:51:53 2013 +0100 Add Debian bug ID for PR1435. 2013-06-09 Andrew John Hughes * NEWS: Add Debian bug ID for PR1435. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130609/326484fc/attachment.html From andrew at icedtea.classpath.org Sun Jun 9 14:59:52 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Sun, 09 Jun 2013 21:59:52 +0000 Subject: /hg/release/icedtea7-2.4: 8 new changesets Message-ID: changeset c80657a5e6e4 in /hg/release/icedtea7-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=c80657a5e6e4 author: Andrew John Hughes date: Fri Jun 07 21:57:24 2013 +0100 Added tag icedtea-2.4-branchpoint for changeset d0b14be8cbf8 changeset 49b6622d207d in /hg/release/icedtea7-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=49b6622d207d author: Andrew John Hughes date: Fri Jun 07 22:20:58 2013 +0100 Prepare for 2.4.0 release. 2013-06-07 Andrew John Hughes * configure.ac: Set to 2.4.0. * NEWS: Set release date. changeset 40b63423b460 in /hg/release/icedtea7-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=40b63423b460 author: Andrew John Hughes date: Sun Jun 09 18:51:53 2013 +0100 Add Debian bug ID for PR1435. 2013-06-09 Andrew John Hughes * NEWS: Add Debian bug ID for PR1435. changeset 7878af901e02 in /hg/release/icedtea7-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=7878af901e02 author: Andrew John Hughes date: Sun Jun 09 18:54:26 2013 +0100 Remove jconsole directory from GENERATED_FILES. 2013-06-09 Andrew John Hughes * Makefile.am: Remove jconsole directory from GENERATED_FILES. changeset bf68125e04a1 in /hg/release/icedtea7-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=bf68125e04a1 author: Andrew John Hughes date: Sun Jun 09 18:58:29 2013 +0100 Remove non-existent JamVM patch directory. 2013-06-09 Andrew John Hughes * Makefile.am: (EXTRA_DIST): Remove non-existent JamVM patch directory. changeset 19d5e254d347 in /hg/release/icedtea7-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=19d5e254d347 author: Andrew John Hughes date: Sun Jun 09 19:14:13 2013 +0100 Use the 2.4 release branch. 2013-06-09 Andrew John Hughes * Makefile.am, (CORBA_CHANGESET): Update to IcedTea 2.4 forest head. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. (ICEDTEA_PREFIX): Set to icedtea7-forest-2.4 (ICEDTEA_HG_URL): Set to release forest. * hotspot.map: Update default to head of IcedTea7 2.4 forest HotSpot. changeset c753600d9acf in /hg/release/icedtea7-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=c753600d9acf author: Andrew John Hughes date: Sun Jun 09 21:52:45 2013 +0100 Use 'IcedTea' as ICEDTEA_NAME. 2013-04-21 Andrew John Hughes * Makefile.am: (ICEDTEA_NAME): Make same across all versions. changeset 3d670ce98cfa in /hg/release/icedtea7-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=3d670ce98cfa author: Andrew John Hughes date: Sun Jun 09 22:59:18 2013 +0100 Added tag icedtea-2.4.0 for changeset c753600d9acf diffstat: .hgtags | 2 ++ ChangeLog | 46 ++++++++++++++++++++++++++++++++++++++++++++++ Makefile.am | 32 +++++++++++++++----------------- NEWS | 4 ++-- configure.ac | 2 +- hotspot.map | 2 +- 6 files changed, 67 insertions(+), 21 deletions(-) diffs (170 lines): diff -r d0b14be8cbf8 -r 3d670ce98cfa .hgtags --- a/.hgtags Fri Jun 07 20:28:52 2013 +0100 +++ b/.hgtags Sun Jun 09 22:59:18 2013 +0100 @@ -34,3 +34,5 @@ d35c742babc02eb874684ea7cb647ef5eda55c75 icedtea-2.1-branchpoint 2917541bbda4f6745b157f39d7bd39472cae5235 icedtea-2.2-branchpoint 60c41b88775a8043ff4922278eb0e801c330e8fe icedtea-2.3-branchpoint +d0b14be8cbf8a705a3bec6cf8828b982405b059c icedtea-2.4-branchpoint +c753600d9acfbbf87a5b201dde78068fb43f54d4 icedtea-2.4.0 diff -r d0b14be8cbf8 -r 3d670ce98cfa ChangeLog --- a/ChangeLog Fri Jun 07 20:28:52 2013 +0100 +++ b/ChangeLog Sun Jun 09 22:59:18 2013 +0100 @@ -1,3 +1,49 @@ +2013-04-21 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_NAME): Make same across all versions. + +2013-06-09 Andrew John Hughes + + * Makefile.am, + (CORBA_CHANGESET): Update to IcedTea 2.4 forest head. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + (ICEDTEA_PREFIX): Set to icedtea7-forest-2.4 + (ICEDTEA_HG_URL): Set to release forest. + * hotspot.map: Update default to head of IcedTea7 2.4 + forest HotSpot. + +2013-06-09 Andrew John Hughes + + * Makefile.am: + (EXTRA_DIST): Remove non-existent JamVM patch + directory. + +2013-06-09 Andrew John Hughes + + * Makefile.am: + (GENERATED_FILES): Remove non-existent jconsole + directory. + +2013-06-09 Andrew John Hughes + + * NEWS: Add Debian bug ID for PR1435. + +2013-06-07 Andrew John Hughes + + * configure.ac: Set to 2.4.0. + * NEWS: Set release date. + 2013-06-07 Andrew John Hughes PR1276: Synchronise CACAO rules between IcedTea6/7/8 diff -r d0b14be8cbf8 -r 3d670ce98cfa Makefile.am --- a/Makefile.am Fri Jun 07 20:28:52 2013 +0100 +++ b/Makefile.am Sun Jun 09 22:59:18 2013 +0100 @@ -4,19 +4,19 @@ JDK_UPDATE_VERSION = 40 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = fd00f67b65c4 -JAXP_CHANGESET = 7dc9a882c6f8 -JAXWS_CHANGESET = ea9a36dfd4ee -JDK_CHANGESET = 3f1f89553b54 -LANGTOOLS_CHANGESET = 68c60cde94a7 -OPENJDK_CHANGESET = 78c6b2167b94 +CORBA_CHANGESET = 71d5ec2f3dfb +JAXP_CHANGESET = 5eaf3bca7f68 +JAXWS_CHANGESET = 9d2007a13c02 +JDK_CHANGESET = 29ce11184945 +LANGTOOLS_CHANGESET = ffb1b6bc4750 +OPENJDK_CHANGESET = 9c74cb4a3ae8 -CORBA_SHA256SUM = 57e71ca50c31456ef8a3086cfe81e6ff627ea207645bbd4dced1e73c51528c56 -JAXP_SHA256SUM = 293bcceac6557965c201437b123cef23c5855dbb22b25f487ba87ccdd1991355 -JAXWS_SHA256SUM = 814fc497356289efb153509837cd97d5a019c388f7f9b1ad98247cf445b9c11d -JDK_SHA256SUM = ca8ff71beba0303d2593f97706a8638ea1948d8387a533a16fce70d6bb85bf88 -LANGTOOLS_SHA256SUM = 807e8d5301dee8e0f532096237987f4b812c472e3d9182d349c1b3371676ec59 -OPENJDK_SHA256SUM = 8de6db8e7b249577f8cfbd343de3a76068200af5ead43255e8f77de3ac34a38f +CORBA_SHA256SUM = 0191c678935dac77c0ad085bedb59e6bcc93e0712c3a4ef2b7171562e129807c +JAXP_SHA256SUM = 25bb13db8a426c2d84e13eed0d598c88c447af41de3f678a70680897c38083fd +JAXWS_SHA256SUM = 4cff8300b4c23e9327607f7c09295a99ef7d1032d8397429c7879ba489d14456 +JDK_SHA256SUM = 13024c623bb37c4d44cb3b724876d7827924868fb8f94428faa87ddb11492352 +LANGTOOLS_SHA256SUM = 80cbe75f7c268e97619e8007f8d29ecbbb7584062c1286c8b470f875526028f3 +OPENJDK_SHA256SUM = 4adfde4b056ea8f35b639156c7cad8bac140ba7957ea8ce49b440089babc6579 CACAO_VERSION = e215e36be9fc CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab @@ -30,8 +30,8 @@ JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz -ICEDTEA_PREFIX = icedtea7-forest -ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/$(ICEDTEA_PREFIX) +ICEDTEA_PREFIX = icedtea7-forest-2.4 +ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/release/$(ICEDTEA_PREFIX) OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7 CVMI_HG_URL = http://hg.openjdk.java.net/cvmi/cvmi/ CLOSURES_HG_URL = http://hg.openjdk.java.net/closures/closures/ @@ -416,7 +416,7 @@ ICEDTEA_SHARK_BUILD = true endif -ICEDTEA_NAME = IcedTea7 +ICEDTEA_NAME = IcedTea if HAS_ICEDTEA_REVISION ICEDTEA_REV = +${ICEDTEA_REVISION} endif @@ -657,7 +657,6 @@ $(top_srcdir)/generated/sun/util/resources/*.java \ $(top_srcdir)/generated/sun/print/resources/serviceui*.java \ $(top_srcdir)/generated/sun/tools/jar/resources/jar*.java \ - $(top_srcdir)/generated/sun/tools/jconsole/*.java \ $(top_srcdir)/generated/sun/management/resources/agent*.java \ $(top_srcdir)/generated/java/nio/*.java \ $(top_srcdir)/generated/java/nio/channels/*.java \ @@ -760,7 +759,6 @@ EXTRA_DIST = $(GENERATED_FILES) $(top_srcdir)/patches/*.patch \ $(top_srcdir)/patches/boot/*.patch \ $(top_srcdir)/patches/cacao/*.patch \ - $(top_srcdir)/patches/jamvm/*.patch \ $(top_srcdir)/patches/boot/hotspot/*/*.patch \ tools-copy contrib overlays \ javaws.png javaws.desktop \ diff -r d0b14be8cbf8 -r 3d670ce98cfa NEWS --- a/NEWS Fri Jun 07 20:28:52 2013 +0100 +++ b/NEWS Sun Jun 09 22:59:18 2013 +0100 @@ -10,7 +10,7 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 2.4.0 (2012-XX-XX): +New in release 2.4.0 (2012-06-09): OpenJDK - PR1209, S7170638: Use DTRACE_PROBE[N] in JNI Set and SetStatic Field. @@ -816,7 +816,7 @@ - RH513605, PR1280: Updating/Installing OpenJDK should recreate the shared class-data archive - PR1358: Make XRender mandatory - PR1360: Check for /usr/lib64 JVMs and generic JPackage alternative - - PR1435: OpenJDK 7 returns incorrect TrueType font metrics + - PR1435, D657854: OpenJDK 7 returns incorrect TrueType font metrics - PR728: GTKLookAndFeel does not honor gtk-alternative-button-order * CACAO - src/vm/jit/x86_64/asmpart.S (asm_abstractmethoderror): Keep stack aligned. diff -r d0b14be8cbf8 -r 3d670ce98cfa configure.ac --- a/configure.ac Fri Jun 07 20:28:52 2013 +0100 +++ b/configure.ac Sun Jun 09 22:59:18 2013 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.4pre], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea], [2.4.0], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) diff -r d0b14be8cbf8 -r 3d670ce98cfa hotspot.map --- a/hotspot.map Fri Jun 07 20:28:52 2013 +0100 +++ b/hotspot.map Sun Jun 09 22:59:18 2013 +0100 @@ -1,2 +1,2 @@ # version url changeset sha256sum -default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 25fe5bf8dee3 844c0c901bda689dd28f3e7846973431bf354bed1efc793d75b78844e21107ce +default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot c67fd7874b1a 34e60aba6db2f7a5cac7861058db283bd1edcdd9194a5490114cf76edd71696d From adomurad at redhat.com Mon Jun 10 08:39:50 2013 From: adomurad at redhat.com (Adam Domurad) Date: Mon, 10 Jun 2013 11:39:50 -0400 Subject: Fwd: [rfc][icedtea-web] renewed tagsoup In-Reply-To: <51ADE9CB.2090709@redhat.com> References: <51ADE9CB.2090709@redhat.com> Message-ID: <51B5F346.4070106@redhat.com> On 06/04/2013 09:21 AM, Jiri Vanek wrote: > attached missing attachment > > -------- Original Message -------- > Subject: [rfc][icedtea-web] renewed tagsoup > Date: Tue, 04 Jun 2013 15:18:40 +0200 > From: Jiri Vanek > To: IcedTea Distro List > > Again, I'm trying to reincarnate old Omair's tagsoup patch. > As this was developed by Omair, then rewritten by Adam, and now by Me, I I wouldn't say I rewrote it. > think it is quite reviwed :) > tests are adapted, and few added > > Ok for head? Some tests included. > > Also do not forget taht the results of this patch are visible only with > tagsoup installed. Without it, or with -xml it behaves as normlay. > (note, this will need to go to wiki) > By the way the PR1026 is fixed by this, and there can come more > > I have already made quite deep testing, and some more testing will come, > so please do not halt this for tests. Soem reproducers are in row. > > J. Thank you very much for doing this! We should collect what we could be fixed by this: 1. Mario noticed invalid XML warnings here: javaws http://docs.oracle.com/javase/tutorialJWS/uiswing/misc/ex7/GradientTranslucentWindowDemo.jnlp Status: Still broken. Unfortunately tagsoup cannot fix this unclosed string. I wonder what if anything we should do about this ? 2. From PR1026, applet at http://www.knuddels.de:8080/index.html?v=90aez&c=7 Status: Now works (as you have noted) Actually I'm having trouble finding more. We should aim to support as much broken XML as there is out there, so hopefully we have more than one confirmed fixed case before deciding to go this route. Comments inline: > diff -r 6209aba5fa14 NEWS > --- a/NEWS Tue Jun 04 13:22:38 2013 +0200 > +++ b/NEWS Tue Jun 04 14:46:38 2013 +0200 > @@ -9,8 +9,10 @@ > CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY > > New in release 1.5 (2013-XX-XX): > +* IcedTea-Web now using tagsoup as default (tagsoup depndence) sanitizer for input [typo] depndence -> dependence > * NetX > - Netx can now parse malformed jnlp files using tagsoup Huh, why is this already in the diff ? This is a better message, IMO. 'for input' is pretty vague. > + - PR1026 - Apps fail to run because of the nanoxml parser's strict XML validation > * Plugin > - PR854: Resizing an applet several times causes 100% CPU load > > diff -r 01b48fc84f85 -r 6209aba5fa14 Makefile.am > --- a/Makefile.am Mon Jun 03 14:16:42 2013 +0200 > +++ b/Makefile.am Tue Jun 04 13:22:38 2013 +0200 > @@ -119,9 +119,9 @@ > # IllegalAccessException > # - we want full privileges > # > -export LAUNCHER_BOOTCLASSPATH="-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar$(RHINO_RUNTIME)" > -export PLUGIN_BOOTCLASSPATH='"-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar:$(datadir)/$(PACKAGE_NAME)/plugin.jar$(RHINO_RUNTIME)"' > -export PLUGIN_COVERAGE_BOOTCLASSPATH='"-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar:$(datadir)/$(PACKAGE_NAME)/plugin.jar$(RHINO_RUNTIME):$(JACOCO_CLASSPATH)"' > +export LAUNCHER_BOOTCLASSPATH="-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar$(RHINO_RUNTIME):$(TAGSOUP_JAR)" > +export PLUGIN_BOOTCLASSPATH='"-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar:$(datadir)/$(PACKAGE_NAME)/plugin.jar$(RHINO_RUNTIME):$(TAGSOUP_JAR)"' > +export PLUGIN_COVERAGE_BOOTCLASSPATH='"-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar:$(datadir)/$(PACKAGE_NAME)/plugin.jar$(RHINO_RUNTIME):$(JACOCO_CLASSPATH):$(TAGSOUP_JAR)"' > > # Fake update version to work with the Deployment Toolkit script used by Oracle > # http://download.oracle.com/javase/tutorial/deployment/deploymentInDepth/depltoolkit_index.html > @@ -138,7 +138,15 @@ > net.sourceforge.jnlp.security.viewer net.sourceforge.jnlp.services \ > net.sourceforge.jnlp.tools net.sourceforge.jnlp.util > > +NETX_EXCLUDE_SRCS= > + > # Conditional defintions > +if HAVE_TAGSOUP > +NETX_CLASSPATH_ARG=-classpath $(TAGSOUP_JAR) > +else > +NETX_EXCLUDE_SRCS+=net.sourceforge.jnlp.MalformedXMLParser.java > +endif > + > if ENABLE_PLUGIN > export ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin > export LIVECONNECT_DIR = netscape sun/applet > @@ -415,6 +423,7 @@ > $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ > -d $(abs_top_builddir)/liveconnect \ > -bootclasspath $(NETX_DIR):$(RUNTIME) \ > + $(NETX_CLASSPATH_ARG) \ > -sourcepath $(LIVECONNECT_SRCS) \ > @liveconnect-source-files.txt ; \ > fi > @@ -445,7 +454,11 @@ > # a patch applied to sun.plugin.AppletViewerPanel and generated sources > > netx-source-files.txt: > - find $(NETX_SRCDIR) -name '*.java' | sort > $@ > + find $(NETX_SRCDIR) -name '*.java' | sort > $@ ; \ > + for src in $(NETX_EXCLUDE_SRCS) ; \ > + do \ > + sed -i "/$${src}/ d" $@ ; \ > + done > if !WITH_RHINO > sed -i '/RhinoBasedPacEvaluator/ d' $@ > endif > @@ -459,6 +472,7 @@ > -d $(NETX_DIR) \ > -sourcepath $(NETX_SRCDIR) \ > -bootclasspath $(RUNTIME) \ > + $(NETX_CLASSPATH_ARG) \ > @netx-source-files.txt > (cd $(NETX_RESOURCE_DIR); \ > for files in $$(find . -type f); \ > @@ -472,6 +486,10 @@ > mkdir -p stamps > touch $@ > > +netx-dummy.jar: > + echo "Manifest-Version: 1.0" > netx-dummy-manifest.mf > + jar cfm $@ netx-dummy-manifest.mf > + What is this used for ? > stamps/netx-dist.stamp: stamps/netx.stamp $(abs_top_builddir)/netx.manifest > (cd $(NETX_DIR) ; \ > mkdir -p lib ; \ > @@ -486,6 +504,7 @@ > > clean-netx: > rm -rf $(NETX_DIR) > + rm -f netx-dummy.jar > rm -f stamps/netx-dist.stamp > rm -f netx-source-files.txt > rm -f stamps/netx.stamp > @@ -1006,7 +1025,7 @@ > mkdir -p $(NETX_UNIT_TEST_DIR) && \ > $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ > -d $(NETX_UNIT_TEST_DIR) \ > - -classpath $(JUNIT_JAR):$(abs_top_builddir)/liveconnect/lib/classes.jar:$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR) \ > + -classpath $(JUNIT_JAR):$(abs_top_builddir)/liveconnect/lib/classes.jar:$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR):$(TAGSOUP_JAR) \ > @netx-unit-tests-source-files.txt && \ > mkdir -p stamps && \ > touch $@ > @@ -1036,7 +1055,7 @@ > done ; \ > cd $(NETX_UNIT_TEST_DIR) ; \ > class_names=`cat $(UNIT_CLASS_NAMES)` ; \ > - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR) \ > + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR):$(TAGSOUP_JAR) \ > $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names > if WITH_XSLTPROC > -$(XSLTPROC) --stringparam logs logs_unit.html $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(NETX_UNIT_TEST_DIR)/tests-output.xml > $(TESTS_DIR)/index_unit.html > @@ -1073,6 +1092,9 @@ > -cp $(RHINO_RUNTIME) \ > -cp $(TEST_EXTENSIONS_DIR) \ > -cp $(TEST_EXTENSIONS_SRCDIR) \ > +if HAVE_TAGSOUP > + -cp $(TAGSOUP_JAR) \ > +endif > -cp . \ > -ix "-org.junit.*" \ > -ix "-junit.*" \ > @@ -1117,7 +1139,7 @@ > mv $(NETX_UNIT_TEST_DIR)/$$file $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)" ; \ > done ;\ > class_names=`cat $(UNIT_CLASS_NAMES)` ; \ > - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):.:$(TEST_EXTENSIONS_SRCDIR) \ > + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):.:$(TEST_EXTENSIONS_SRCDIR):$(TAGSOUP_JAR) \ > $(BOOT_DIR)/bin/java $(JACOCO_AGENT_SWITCH) -Xbootclasspath:$(RUNTIME) CommandLine $$class_names ; \ > for file in $(EMMA_MODIFIED_FILES) ; do \ > mv $(NETX_UNIT_TEST_DIR)/$$file $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_SUFFIX)" ; \ > diff -r 01b48fc84f85 -r 6209aba5fa14 NEWS > --- a/NEWS Mon Jun 03 14:16:42 2013 +0200 > +++ b/NEWS Tue Jun 04 13:22:38 2013 +0200 Two diffs to the same file ? How'd that happen :-) > @@ -9,6 +9,8 @@ > CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY > > New in release 1.5 (2013-XX-XX): > +* NetX > + - Netx can now parse malformed jnlp files using tagsoup > * Plugin > - PR854: Resizing an applet several times causes 100% CPU load > > diff -r 01b48fc84f85 -r 6209aba5fa14 acinclude.m4 > --- a/acinclude.m4 Mon Jun 03 14:16:42 2013 +0200 > +++ b/acinclude.m4 Tue Jun 04 13:22:38 2013 +0200 > @@ -403,6 +403,31 @@ > fi > ]) > > +AC_DEFUN_ONCE([IT_CHECK_FOR_TAGSOUP], > +[ > + AC_MSG_CHECKING([for tagsoup]) > + AC_ARG_WITH([tagsoup], > + [AS_HELP_STRING([--with-tagsoup], > + [tagsoup.jar])], > + [ > + TAGSOUP_JAR=${withval} > + ], > + [ > + TAGSOUP_JAR= > + ]) > + if test -z "${TAGSOUP_JAR}"; then > + for dir in /usr/share/java /usr/local/share/java ; do > + if test -f $dir/tagsoup.jar; then > + TAGSOUP_JAR=$dir/tagsoup.jar > + break > + fi > + done > + fi > + AC_MSG_RESULT(${TAGSOUP_JAR}) > + AC_SUBST(TAGSOUP_JAR) > + AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != xno]) > +]) > + > dnl Generic macro to check for a Java class > dnl Takes the name of the class as an argument. The macro name > dnl is usually the name of the class with '.' > diff -r 01b48fc84f85 -r 6209aba5fa14 configure.ac > --- a/configure.ac Mon Jun 03 14:16:42 2013 +0200 > +++ b/configure.ac Tue Jun 04 13:22:38 2013 +0200 > @@ -111,6 +111,8 @@ > IT_FIND_OPTIONAL_JAR([asm], ASM, > [/usr/share/java/objectweb-asm4/asm-all.jar /usr/share/java/objectweb-asm4/asm-all-4.0.jar /usr/share/java/objectweb-asm/asm-all.jar]) > > +IT_CHECK_FOR_TAGSOUP > + > AC_CONFIG_FILES([jrunscript], [chmod u+x jrunscript]) > AC_CONFIG_FILES([build.properties]) > > diff -r 01b48fc84f85 -r 6209aba5fa14 netx/net/sourceforge/jnlp/JNLPCreator.java > --- a/netx/net/sourceforge/jnlp/JNLPCreator.java Mon Jun 03 14:16:42 2013 +0200 > +++ b/netx/net/sourceforge/jnlp/JNLPCreator.java Tue Jun 04 13:22:38 2013 +0200 > @@ -28,8 +28,8 @@ > import net.sourceforge.jnlp.cache.UpdatePolicy; > > public class JNLPCreator { > - public JNLPFile create(URL location, Version version, boolean strict, > + public JNLPFile create(URL location, Version version, ParserSettings settings, > UpdatePolicy policy, URL forceCodebase) throws IOException, ParseException { > - return new JNLPFile(location, version, strict, policy, forceCodebase); > + return new JNLPFile(location, version, settings, policy, forceCodebase); > } > } > diff -r 01b48fc84f85 -r 6209aba5fa14 netx/net/sourceforge/jnlp/JNLPFile.java > --- a/netx/net/sourceforge/jnlp/JNLPFile.java Mon Jun 03 14:16:42 2013 +0200 > +++ b/netx/net/sourceforge/jnlp/JNLPFile.java Tue Jun 04 13:22:38 2013 +0200 > @@ -67,6 +67,9 @@ > /** the network location of this JNLP file */ > protected URL fileLocation; > > + /** the ParserSettings which were used to parse this file */ > + protected ParserSettings parserSettings = null; > + > /** A key that uniquely identifies connected instances (main jnlp+ext) */ > protected String uniqueKey = null; > > @@ -145,7 +148,7 @@ > * @throws ParseException if the JNLP file was invalid > */ > public JNLPFile(URL location) throws IOException, ParseException { > - this(location, false); // not strict > + this(location, new ParserSettings()); > } > > /** > @@ -153,12 +156,12 @@ > * default policy. > * > * @param location the location of the JNLP file > - * @param strict whether to enforce the spec when > + * @param settings the parser settings to use while parsing the file > * @throws IOException if an IO exception occurred > * @throws ParseException if the JNLP file was invalid > */ > - public JNLPFile(URL location, boolean strict) throws IOException, ParseException { > - this(location, (Version) null, strict); > + public JNLPFile(URL location, ParserSettings settings) throws IOException, ParseException { > + this(location, (Version) null, settings); > } > > /** > @@ -167,12 +170,12 @@ > * > * @param location the location of the JNLP file > * @param version the version of the JNLP file > - * @param strict whether to enforce the spec when > + * @param settings the parser settings to use while parsing the file > * @throws IOException if an IO exception occurred > * @throws ParseException if the JNLP file was invalid > */ > - public JNLPFile(URL location, Version version, boolean strict) throws IOException, ParseException { > - this(location, version, strict, JNLPRuntime.getDefaultUpdatePolicy()); > + public JNLPFile(URL location, Version version, ParserSettings settings) throws IOException, ParseException { > + this(location, version, settings, JNLPRuntime.getDefaultUpdatePolicy()); > } > > /** > @@ -186,8 +189,8 @@ > * @throws IOException if an IO exception occurred > * @throws ParseException if the JNLP file was invalid > */ > - public JNLPFile(URL location, Version version, boolean strict, UpdatePolicy policy) throws IOException, ParseException { > - this(location, version, strict, policy, null); > + public JNLPFile(URL location, Version version, ParserSettings settings, UpdatePolicy policy) throws IOException, ParseException { > + this(location, version, settings, policy, null); > } > > /** > @@ -196,15 +199,16 @@ > * > * @param location the location of the JNLP file > * @param version the version of the JNLP file > - * @param strict whether to enforce the spec when > + * @param settings the parser settings to use while parsing the file > * @param policy the update policy > * @param forceCodebase codebase to use if not specified in JNLP file. > * @throws IOException if an IO exception occurred > * @throws ParseException if the JNLP file was invalid > */ > - protected JNLPFile(URL location, Version version, boolean strict, UpdatePolicy policy, URL forceCodebase) throws IOException, ParseException { > - Node root = Parser.getRootNode(openURL(location, version, policy)); > - parse(root, strict, location, forceCodebase); > + protected JNLPFile(URL location, Version version, ParserSettings settings, UpdatePolicy policy, URL forceCodebase) throws IOException, ParseException { > + InputStream input = openURL(location, version, policy); > + this.parserSettings = settings; > + parse(input, location, forceCodebase); > > //Downloads the original jnlp file into the cache if possible > //(i.e. If the jnlp file being launched exist locally, but it > @@ -231,13 +235,13 @@ > * @param location the location of the JNLP file > * @param uniqueKey A string that uniquely identifies connected instances > * @param version the version of the JNLP file > - * @param strict whether to enforce the spec when > + * @param settings the parser settings to use while parsing the file > * @param policy the update policy > * @throws IOException if an IO exception occurred > * @throws ParseException if the JNLP file was invalid > */ > - public JNLPFile(URL location, String uniqueKey, Version version, boolean strict, UpdatePolicy policy) throws IOException, ParseException { > - this(location, version, strict, policy); > + public JNLPFile(URL location, String uniqueKey, Version version, ParserSettings settings, UpdatePolicy policy) throws IOException, ParseException { > + this(location, version, settings, policy); > this.uniqueKey = uniqueKey; > > if (JNLPRuntime.isDebug()) > @@ -250,8 +254,9 @@ > * @throws IOException if an IO exception occurred > * @throws ParseException if the JNLP file was invalid > */ > - public JNLPFile(InputStream input, boolean strict) throws ParseException { > - this(input, null, strict); > + public JNLPFile(InputStream input, ParserSettings settings) throws ParseException { > + this.parserSettings = settings; > + parse(input, null, null); > } > > /** > @@ -263,22 +268,23 @@ > * @throws IOException if an IO exception occurred > * @throws ParseException if the JNLP file was invalid > */ > - public JNLPFile(InputStream input, URL codebase, boolean strict) throws ParseException { > - parse(Parser.getRootNode(input), strict, null, codebase); > + public JNLPFile(InputStream input, URL codebase, ParserSettings settings) throws ParseException { > + this.parserSettings = settings; > + parse(input, null, codebase); > } > > /** > * Create a JNLPFile from a character stream. > * > * @param input the stream > - * @param strict whether to enforce the spec when > + * @param settings the parser settings to use while parsing the file > * @throws IOException if an IO exception occurred > * @throws ParseException if the JNLP file was invalid > */ > - private JNLPFile(Reader input, boolean strict) throws ParseException { > - // todo: now that we are using NanoXML we can use a Reader > - //parse(Parser.getRootNode(input), strict, null); > - } > +// private JNLPFile(Reader input, ParserSettings settings) throws ParseException { > +// todo: now that we are using NanoXML we can use a Reader > +// parse(Parser.getRootNode(input), settings, null); > +// } I'm in favour of just axing this. [..snip..] > diff -r 01b48fc84f85 -r 6209aba5fa14 netx/net/sourceforge/jnlp/MalformedXMLParser.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/netx/net/sourceforge/jnlp/MalformedXMLParser.java Tue Jun 04 13:22:38 2013 +0200 > @@ -0,0 +1,121 @@ > +/* > + Copyright (C) 2013 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. > + */ > +package net.sourceforge.jnlp; > + > +import static net.sourceforge.jnlp.runtime.Translator.R; > + > +import java.io.ByteArrayInputStream; > +import java.io.ByteArrayOutputStream; > +import java.io.IOException; > +import java.io.InputStream; > +import java.io.OutputStreamWriter; > +import java.io.Writer; > + > +import net.sourceforge.jnlp.runtime.JNLPRuntime; > + > +import org.ccil.cowan.tagsoup.HTMLSchema; > +import org.ccil.cowan.tagsoup.Parser; > +import org.ccil.cowan.tagsoup.XMLWriter; > +import org.xml.sax.InputSource; > +import org.xml.sax.SAXException; > +import org.xml.sax.XMLReader; > + > +/** > + * An specialized {@link XMLParser} that uses TagSoup[1] to parse > + * malformed XML > + * > + * Used by net.sourceforge.jnlp.Parser > + * > + * [1] http://home.ccil.org/~cowan/XML/tagsoup/ > + */ > +public class MalformedXMLParser extends XMLParser { > + > + /** > + * Parses the data from an {@link InputStream} to create a XML tree. > + * Returns a {@link Node} representing the root of the tree. > + * > + * @param input the {@link InputStream} to read data from > + * @throws ParseException if an exception occurs while parsing the input > + */ > + @Override > + public Node getRootNode(InputStream input) throws ParseException { > + if (JNLPRuntime.isDebug()) { > + System.out.println("Using MalformedXMLParser"); > + } > + InputStream xmlInput = xmlizeInputStream(input); > + return super.getRootNode(xmlInput); > + } > + > + /** > + * Reads malformed XML from the InputStream original and returns a new > + * InputStream which can be used to read a well-formed version of the input > + * > + * @param original > + * @return an {@link InputStream} which can be used to read a well-formed > + * version of the input XML > + * @throws ParseException > + */ > + private InputStream xmlizeInputStream(InputStream original) throws ParseException { > + try { > + ByteArrayOutputStream out = new ByteArrayOutputStream(); > + > + HTMLSchema schema = new HTMLSchema(); > + XMLReader reader = new Parser(); > + > + reader.setProperty(Parser.schemaProperty, schema); > + reader.setFeature(Parser.bogonsEmptyFeature, false); > + reader.setFeature(Parser.ignorableWhitespaceFeature, true); > + reader.setFeature(Parser.ignoreBogonsFeature, false); It'd be nice to get some comments here about why these are chosen. [..snip..] > diff -r 01b48fc84f85 -r 6209aba5fa14 netx/net/sourceforge/jnlp/XmlParser.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/netx/net/sourceforge/jnlp/XmlParser.java Tue Jun 04 13:22:38 2013 +0200 > @@ -0,0 +1,183 @@ > +/* > + Copyright (C) 2013 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. > + */ > + > +package net.sourceforge.jnlp; > + > +import static net.sourceforge.jnlp.runtime.Translator.R; > + > +import java.io.BufferedInputStream; > +import java.io.IOException; > +import java.io.InputStream; > +import java.io.InputStreamReader; > +import java.io.PipedInputStream; > +import java.io.PipedOutputStream; > + > +import net.sourceforge.nanoxml.XMLElement; > + > +//import javax.xml.parsers.*; // commented to use right Node > +//import org.w3c.dom.*; // class for using Tiny XML | NanoXML > +//import org.xml.sax.*; > +//import gd.xml.tiny.*; [nit] Hm can we remove these ? I don't insist but they aren't clarifying anything for me, they're just confusing. [..snip..] > diff -r 01b48fc84f85 -r 6209aba5fa14 netx/net/sourceforge/jnlp/resources/Messages.properties > --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Mon Jun 03 14:16:42 2013 +0200 > +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Tue Jun 04 13:22:38 2013 +0200 > @@ -189,6 +189,7 @@ > BOHeadless = Disables download window, other UIs. > BOStrict = Enables strict checking of JNLP file format. > BOViewer = Shows the trusted certificate viewer. > +BOXml = Uses an strict XML parser to parse the JNLP file. [typo] 'Uses an strict' -> 'Uses a strict' [..snip..] Overall looks good to me. Cheers, -Adam From jvanek at redhat.com Mon Jun 10 04:24:28 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 10 Jun 2013 13:24:28 +0200 Subject: [rfc][icedtea-web] Stripping semicolon tags from jar urls In-Reply-To: <51B1F94E.9030703@redhat.com> References: <51ACCCFD.9080505@redhat.com> <51ADAA3A.8090809@redhat.com> <51ADEA27.1060501@redhat.com> <51ADFB00.2040009@redhat.com> <51B0A5C9.5050704@redhat.com> <51B0AFE2.3020204@redhat.com> <51B0DCA3.2040007@redhat.com> <51B1A887.1000808@redhat.com> <51B1F94E.9030703@redhat.com> Message-ID: <51B5B76C.5090804@redhat.com> On 06/07/2013 05:16 PM, Andrew Azores wrote: > >> >> Hi! Would be pushed by now, but you made one regression against previous version >> >> In attempt to avoid usage of ** APPLET..*** consatnts, you removed it: By doing this you made the >> mistake which will cause to run your browser test apreox 20s instead of one two or three. >> >> The regression is in file tests/reproducers/simple/StripHttpPathParams/srcs/StripHttpPathParams.java >> >> And the reason of this is method public void testStripHttpPathParamsApplet() throws Exception >> >> I will let you figure out what and why have been broken, as it is crucial for you to understand >> the mechanism of (closing)listners in testsuite. >> >> But feel free to ping me or adam! >> >> >> Good luck, J. > > Okay, I think this new set of patches wraps it up. Hopefully. > Thanx! Pushed - http://icedtea.classpath.org/hg/icedtea-web/rev/1a327a09262e Please check my commit if I have not messewd it up at the uttermost end :) J. From jvanek at redhat.com Mon Jun 10 03:53:34 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 10 Jun 2013 12:53:34 +0200 Subject: [rfc][icedtea-web] fix (And tests) for PR1473 Message-ID: <51B5B02E.7020001@redhat.com> This patch is removing the redownloading of jnlp file - both from local file and form network, and so fixing the http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1473 The unhappy redownloading was added during one of inital pushes - http://icedtea.classpath.org/hg/icedtea-web/rev/1d604ccd9b6b And I'm wondering why:) J. -------------- next part -------------- A non-text attachment was scrubbed... Name: fixedLocalFilesLaunching2.diff Type: text/x-patch Size: 10163 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130610/a67a9310/fixedLocalFilesLaunching2.diff From andrew at icedtea.classpath.org Mon Jun 10 09:02:24 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 10 Jun 2013 16:02:24 +0000 Subject: /hg/release/icedtea7-2.4: Sync NEWS with final release announcem... Message-ID: changeset 465798b717c9 in /hg/release/icedtea7-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=465798b717c9 author: Andrew John Hughes date: Mon Jun 10 15:57:07 2013 +0100 Sync NEWS with final release announcement: http://blog.fuseyism.com/index.php/2013/06/10/icedtea-2-4-0-released/ 2013-06-10 Andrew John Hughes * NEWS: Update following release annoucement. diffstat: ChangeLog | 5 +++++ NEWS | 16 ++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diffs (73 lines): diff -r 3d670ce98cfa -r 465798b717c9 ChangeLog --- a/ChangeLog Sun Jun 09 22:59:18 2013 +0100 +++ b/ChangeLog Mon Jun 10 15:57:07 2013 +0100 @@ -1,3 +1,8 @@ +2013-06-10 Andrew John Hughes + + * NEWS: Update following release + annoucement. + 2013-04-21 Andrew John Hughes * Makefile.am: diff -r 3d670ce98cfa -r 465798b717c9 NEWS --- a/NEWS Sun Jun 09 22:59:18 2013 +0100 +++ b/NEWS Mon Jun 10 15:57:07 2013 +0100 @@ -7,10 +7,12 @@ GX - http://bugs.gentoo.org/show_bug.cgi?id=X CAX - http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=X LPX - https://bugs.launchpad.net/bugs/X +JSRX - http://jcp.org/en/jsr/detail?id=X +JEPX - http://openjdk.java.net/jeps/X CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 2.4.0 (2012-06-09): +New in release 2.4.0 (2013-06-09): OpenJDK - PR1209, S7170638: Use DTRACE_PROBE[N] in JNI Set and SetStatic Field. @@ -791,6 +793,7 @@ - S8011867: Accept unknown PKCS #9 attributes - S8012572: Exclude sun/tools/jmap/Basic.sh for short term - S8014469: (tz) Support tzdata2013c + - S8015275: Resolve ambiguity in OCSPChecker & CrlRevocationChecker * Backports - PR1197, S8003120, RH868136: ResourceManager.getApplicationResources() does not close InputStreams - S8014618, RH962568: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement @@ -802,13 +805,12 @@ - Include defs.make in buildtree.make so ZERO_BUILD is recognised and JVM_VARIANT_ZERO set. - Provide support for using PKCS11 provider with NSS - Remove file apparently removed as part of upstreaming of Zero. - - Revert 7060849 + - Revert S7060849 - Set UNLIMITED_CRYPTO=true to ensure we use the unlimited policy. - PR473: Set handleStartupErrors to ignoreMultipleInitialisation in nss.cfg - PR716: IcedTea7 should bootstrap with IcedTea6 - - Expand java.security.cert.* imports to avoid conflict when building with OpenJDK 6. - Fix indentation on Makefile block not executed when STRIP_POLICY=no_strip is set - - Fix invalid XSL stylesheets and DTD introduced as part of JEP 167. + - JEP167: Fix invalid XSL stylesheets and DTD. - Include defs.make in buildtree.make so ZERO_BUILD is recognised and JVM_VARIANT_ZERO set. - Make sure libffi cflags and libs are used. - PR1378: Add AArch64 support to Zero @@ -846,8 +848,8 @@ - PR1278: Synchronise CACAO versions between IcedTea6/7/8 where possible - PR1276: Synchronise CACAO rules between IcedTea6/7/8 where possible * JamVM - - JSR 335: (lambda expressions) initial hack - - JEP 171: Implement fence methods in sun.misc.Unsafe + - JSR335: (lambda expressions) initial hack + - JEP171: Implement fence methods in sun.misc.Unsafe - Fix invokesuper check in invokespecial opcode - Fix non-direct interpreter invokespecial super-class check - When GC'ing a native method don't try to free code @@ -855,6 +857,8 @@ - Set anonymous class protection domain - JVM_IsVMGeneratedMethodIx stub - Dummy implementation of sun.misc.Perf natives +* SystemTap + - Add garbage collection probes New in release 2.1.8 (2013-05-02): From bugzilla-daemon at icedtea.classpath.org Mon Jun 10 09:05:08 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 10 Jun 2013 16:05:08 +0000 Subject: [Bug 806] CACAO doesn't work with OpenJDK7 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=806 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |FIXED Target Milestone|--- |2.4.0 -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130610/18bb232c/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jun 10 09:06:11 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 10 Jun 2013 16:06:11 +0000 Subject: [Bug 824] problems with memory allocation with -Xms option In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=824 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |WONTFIX --- Comment #4 from Andrew John Hughes --- This version is no longer supported. Please reopen if this issue can be reproduced with 2.1.x, 2.2.x, 2.3.x or 2.4.x. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130610/ac857135/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jun 10 09:07:45 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 10 Jun 2013 16:07:45 +0000 Subject: [Bug 1274] [TRACKER] IcedTea 2.4.0 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1274 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED --- Comment #2 from Andrew John Hughes --- http://blog.fuseyism.com/index.php/2013/06/10/icedtea-2-4-0-released/ -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130610/614cfc8c/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jun 10 09:08:58 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 10 Jun 2013 16:08:58 +0000 Subject: [Bug 826] compile failing due to gawk, head, test, wc, egrep, and grep being in different directories. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=826 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu.andrew at redhat.com Assignee|unassigned at icedtea.classpat |gnu.andrew at redhat.com |h.org | -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130610/c6840025/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jun 10 09:09:16 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 10 Jun 2013 16:09:16 +0000 Subject: [Bug 1274] [TRACKER] IcedTea 2.4.0 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1274 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |806 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130610/75be621a/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jun 10 09:09:16 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 10 Jun 2013 16:09:16 +0000 Subject: [Bug 806] CACAO doesn't work with OpenJDK7 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=806 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |1274 -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130610/3dd53999/attachment.html From gnu.andrew at redhat.com Mon Jun 10 03:45:22 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Mon, 10 Jun 2013 06:45:22 -0400 (EDT) Subject: Support Status of IcedTea 2.x Releases In-Reply-To: <1160740609.692850.1370860780833.JavaMail.root@redhat.com> Message-ID: <627510639.694027.1370861122215.JavaMail.root@redhat.com> This is an update on the status of the various IcedTea 2.x releases, following the release of 2.4.0 (http://bitly.com/11Bzajd). * The 2.1.x series will remain supported until the ARM32 JIT is available in a later release. This should be true of at least the 2.3.x series by the end of the year. * The 2.2.x series will be updated as part of the next security update (due in just over a week on the 18th/19th of June, 2013, depending on what timezone you're in). After that, it will no longer be supported. * The 2.3.x and 2.4.x series will be supported until the release of 2.5.0 and 2.6.0 respectively. This information has now been included on our release policy page: http://icedtea.classpath.org/wiki/ReleasePolicy Thanks, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From aazores at redhat.com Mon Jun 10 09:00:13 2013 From: aazores at redhat.com (Andrew Azores) Date: Mon, 10 Jun 2013 12:00:13 -0400 Subject: [rfc][icedtea-web] Extract URL processing in TinyHttpdImpl Message-ID: <51B5F80D.1040706@redhat.com> Changelog: * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: extracted some lines out of run() into new method urlToFilePath() * tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java: unit tests added for new urlToFilePath() As per Jiri's request/suggestion a few days ago. -------------- next part -------------- A non-text attachment was scrubbed... Name: fix.patch Type: text/x-patch Size: 2678 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130610/02149733/fix.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: unit_test.patch Type: text/x-patch Size: 2052 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130610/02149733/unit_test.patch From gnu_andrew at member.fsf.org Sun Jun 9 15:33:36 2013 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Sun, 9 Jun 2013 23:33:36 +0100 Subject: IcedTea 2.4.0 Released! Message-ID: <20130609223335.GA24215@carrie.middle-earth.co.uk> The IcedTea project provides a harness to build the source code from OpenJDK using Free Software build tools, along with additional features such as a PulseAudio sound driver and support for alternative virtual machines. This release is the next major release supporting OpenJDK 7. It is based on what will eventually become the upstream u40 release. As u40 is not yet final, a later release in the 2.4.x series will bring in the remaining changes from upstream. However, we are releasing 2.4.0 now as we feel that a major release is already long overdue (2.3.0 was released on the 15th of August, 2012) and the myriad of bug fixes listed below should be made more widely available. In addition to OpenJDK, IcedTea includes the usual IcedTea patches to allow builds against system libraries and to support more estoric architectures. If you find an issue with one of these releases, please report it at http://icedtea.classpath.org/bugzilla under the appropriate component. Development discussion takes place on distro-pkg-dev at openjdk.java.net and patches are always welcome. Full details of the releases can be found below. What's New ========== New in release 2.4.0 (2012-06-09): OpenJDK - PR1209, S7170638: Use DTRACE_PROBE[N] in JNI Set and SetStatic Field. - PR1206, S7201205: Add Makefile configuration option to build with unlimited crypto in OpenJDK - S2202276: Swing HTML parser can't properly decode codepoints outside the Unicode Plane 0 into a surrogate pair - S2223196: [macosx] Situation when KeyEventDispatcher doesn't work on AWT but does on Swing - S4310381: Text in multi-row/col JTabbedPane tabs can be truncated/clipped - S4631925: JColor Chooser is not fully accessible - S4988100: oop_verify_old_oop appears to be dead - S6183404: Many eudc characters are incorrectly mapped in MS936 and GBK converter - S6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K - S6310967: SA: jstack -m produce failures in output - S6340864: Implement vectorization optimizations in hotspot-server - S6444286: Possible naked oop related to biased locking revocation safepoint in jni_exit() - S6512101: Incorrect encoding in NetworkInterface.getDisplayName() - S6550588: java.awt.Desktop cannot open file with Windows UNC filename - S6610897: New constructor in sun.tools.java.ClassPath builds a path using File.separator instead of File.pathSeparator - S6625113: Add the normalize and rmkw perl script to the openjdk repository or openjdk site? - S6633549: (dc) Include-mode filtering of IPv6 sources does not block datagrams on Linux - S6658428: C2 doesn't inline java method if corresponding intrinsic failed to inline. - S6671481: NPE at javax.swing.plaf.basic.BasicTreeUI$Handler.handleSelection - S6677625: Move platform specific flags from globals.hpp to globals_.hpp - S6711908: JVM needs direct access to some annotations - S6720349: (ch) Channels tests depending on hosts inside Sun - S6736316: Timeout value in java/util/concurrent/locks/Lock/FlakyMutex.java is insufficient - S6776144: java/lang/ThreadGroup/NullThreadName.java fails with Thread group is not destroyed ,fastdebug LINUX - S6789984: JPasswordField can not receive keyboard input - S6818464: TEST_BUG: java/util/Timer/KillThread.java failing intermittently - S6818524: G1: use ergonomic resizing of PLABs - S6860309: TEST_BUG: Insufficient sleep time in java/lang/Runtime/exec/StreamsSurviveDestroy.java - S6871190: Don't terminate JVM if it is running in a non-interactive session - S6877495: JTextField and JTextArea does not support supplementary characters - S6910461: Register allocator may insert spill code at wrong insertion index - S6910464: Lookupswitch and Tableswitch default branches not recognized as safepoints - S6921087: G1: remove per-GC-thread expansion tables from the fine-grain remembered sets - S6924259: Remove String.count/String.offset - S6938583: Unexpected NullPointerException by InputContext.endComposition() - S6948101: java/rmi/transport/pinLastArguments/PinLastArguments.java failing intermittently - S6952814: sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/InterruptedIO.java failing in PIT - S6953455: CookieStore.add() cannot handle null URI parameter, contrary to the API - S6957683: test/java/util/concurrent/ThreadPoolExecutor/Custom.java failing - S6963102: Testcase failures sun/tools/jstatd/jstatdExternalRegistry.sh and sun/tools/jstatd/jstatdDefaults.sh - S6963841: java/util/concurrent/Phaser/Basic.java fails intermittently - S6965150: TEST_BUG: java/nio/channels/AsynchronousSocketChannel/Basic.java takes too long - S6983728: JSR 292 remove argument count limitations - S6983966: remove lzma and upx from repository JDK7u - S6984705: JSR 292 method handle creation should not go through JNI - S6988099: jvmti demos missing Publisher (COMPANY resource) in dlls/exes on windows - S6995781: Native Memory Tracking (Phase 1) - S6997116: The case automatically failed due to java.lang.ClassCastException. - S7017818: NLS: JConsoleResources.java cannot be handled by translation team - S7021010: java/lang/Thread/ThreadStateTest.java fails intermittently - S7023639: JSR 292 method handle invocation needs a fast path for compiled code - S7023898: Intrinsify AtomicLongFieldUpdater.getAndIncrement() - S7024118: possible hardcoded mnemonic for JFileChooser metal and motif l&f - S7025938: Add bitmap mime type to content-types.properties - S7030573: test/java/io/FileInputStream/LargeFileAvailable.java fails when there is insufficient disk space - S7032018: The file list in JFileChooser does not have an accessible name - S7032247: java/net/InetAddress/GetLocalHostWithSM.java fails if hostname resolves to loopback address - S7032436: When running with the Nimbus look and feel, the JFileChooser does not display mnemonics - S7041879: G1: introduce stress testing parameter to cause frequent evacuation failures - S7042126: (alt-rt) HashMap.clone implementation should be re-examined - S7044870: java/nio/channels/DatagramChannel/SelectWhenRefused.java failed on SUSE Linux 10 - S7049024: DnD fails with JTextArea and JTextField - S7053586: TEST: runtime/7020373/Test7020373.sh fails on 64-bit platforms - S7054918: jdk_security1 test target cleanup - S7055065: NullPointerException when sorting JTable with empty cell - S7055362: jdk_security2 test target cleanup - S7055363: jdk_security3 test target cleanup - S7056731: Race condition in CORBA code causes re-use of ABORTed connections - S7057320: test/java/util/concurrent/Executors/AutoShutdown.java failing intermittently - S7058630: JSR 292 method handle proxy violates contract for Object methods - S7058651: JSR 292 unit tests need a refresh - S7063674: Wrong results from basic comparisons after calls to Long.bitCount(long) - S7068471: NPE in sun.font.FontConfigManager.getFontConfigFont() when libfontconfig.so is not installed - S7068625: Testing 8 bytes of card table entries at a time speeds up card-scanning - S7072120: No mac os x support in several regression tests - S7073295: TEST_BUG: test/java/lang/instrument/ManifestTest.sh causing havoc (win) - S7076756: TEST_BUG: com/sun/jdi/BreakpointWithFullGC.sh fails to cleanup in Cygwin - S7076791: closed/javax/swing/JColorChooser/Test6827032.java failed on windows - S7077259: [TEST_BUG] [macosx] Test work correctly only when default L&F is Metal - S7078386: NetworkInterface.getNetworkInterfaces() may return corrupted results on linux - S7081476: test/java/net/InetSocketAddress/B6469803.java failing intermittently - S7083664: TEST_BUG: test hard code of using c:/temp but this dir might not exist - S7084033: TEST_BUG: test/java/lang/ThreadGroup/Stop.java fails intermittently - S7084560: Crash in net.dll - S7087357: JSR 292: remove obsolete code after 7085860 - S7087658: MethodHandles.Lookup.findVirtual is confused by interface methods that are multiply inherited - S7087969: GarbageCollectorMXBean notification contains ticks vs millis - S7089131: test/java/lang/invoke/InvokeGenericTest.java does not compile - S7089914: Focus on image icons are not visible in javaws cache with high contrast mode - S7092905: C2: Keep track of the number of dead nodes - S7093328: JVMTI: jvmtiPrimitiveFieldCallback always report 0's for static primitives - S7094176: (tz) Incorrect TimeZone display name when DST not applicable / disabled - S7100054: (porting) Native code should include fcntl.h and unistd.h rather than sys/fcntl.h and sys/unistd.h - S7102106: TEST_BUG: sun/security/util/Oid/S11N.sh should be modified - S7102300: performance warnings cause results diff failure in Test6890943 - S7103665: HeapWord*ParallelScavengeHeap::failed_mem_allocate(unsigned long,bool)+0x97 - S7103957: NegativeArraySizeException while initializing class IntegerCache - S7104161: test/sun/tools/jinfo/Basic.sh fails on Ubuntu - S7104209: Cleanup and remove librmi (native library) - S7104577: Changes for 7104209 cause many RMI tests to fail - S7104594: [macosx] Test closed/javax/swing/JFrame/4962534/bug4962534 expects Metal L&F by default - S7105640: Unix printing does not check the result of exec'd lpr/lp command - S7105929: java/util/concurrent/FutureTask/BlockingTaskExecutor.java fails on solaris sparc - S7107135: Stack guard pages are no more protected after loading a shared library with executable stack - S7107613: scalability blocker in javax.crypto.CryptoPermissions - S7107616: scalability blocker in javax.crypto.JceSecurityManager - S7107957: AWT: Native code should include fcntl.h and unistd.h rather than sys/fcntl.h and sys/unistd.h - S7109096: keytool -genkeypair needn't call -selfcert - S7109274: Restrict the use of certificates with RSA keys less than 1024 bits - S7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field. - S7110104: It should be possible to stop and start JMX Agent at runtime - S7110151: Use underlying platform's zlib library for Java zlib support - S7110720: Issue with vm config file loadingIssue with vm config file loading - S7113017: Use POSIX compliant include file headers in sun/awt/medialib/mlib_types.h - S7114678: G1: various small fixes, code cleanup, and refactoring - S7115070: (fs) lookupPrincipalByName/lookupPrincipalByGroupName should treat ESRCH as not found - S7116786: RFE: Detailed information on VerifyErrors - S7117167: Misc warnings in java.lang.invoke and sun.invoke.* - S7118280: The gbyc00102 JCK7 test causes an assert in JVM 7.0 fastdebug mode - S7118907: InetAddress.isReachable() should return false if sendto fails with EHOSTUNREACH - S7119644: Increase superword's vector size up to 256 bits - S7120481: storeStore barrier in constructor with final field - S7121314: Behavior mismatch between AbstractCollection.toArray(T[] ) and its spec - S7123170: JCK vm/jvmti/ResourceExhausted/resexh001/resexh00101/ tests fails since 7u4 b02 - S7123767: Wrong tooltip location in Multi-Monitor configurations - S7123926: Some CTW test crash: !_control.contains(ctrl) - S7124209: [macosx] SpringLayout issue. BASELINE is not in the range: [NORTH, SOUTH] - S7124242: [macosx] Test doesn't work because of the frame round corners in the LaF - S7124244: [macosx] Shaped windows support - S7124347: [macosx] java.lang.InternalError: not implemented yet on call Graphics2D.drawRenderedImage - S7124375: [macosx] Focus isn't transfered as expected between components - S7124513: [macosx] Support NSTexturedBackgroundWindowMask/different titlebar styles to create unified toolbar - S7124525: [macosx] No animation on certain Swing components in Aqua LaF - S7127687: MethodType leaks memory due to interning - S7127697: G1: remove dead code after recent concurrent mark changes - S7127792: Add the ability to change an existing PeriodicTask's execution interval - S7128512: Javadoc typo in java.lang.invoke.MethodHandle - S7129029: (fs) Unix file system provider should be buildable on platforms that don't support O_NOFOLLOW - S7129034: VM crash with a field setter method with a filterArguments - S7129401: PPC: runtime/7100935/TestShortArraycopy.java fails - S7129715: MAC: SIGBUS in nsk stress test - S7129723: MAC: Some regression tests need to recognize Mac OS X platform - S7129724: MAC: Core file location is wrong in crash report - S7129742: Unable to view focus in Non-Editable TextArea - S7129800: [macosx] Regression test OverrideRedirectWindowActivationTest fails due to timing issue - S7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6 - S7130915: File.equals does not give expected results when path contains Non-English characters on Mac OS X - S7130974: G1: Remove G1ParCopyHelper - S7131629: Generalize the CMS free list code - S7132070: Use a mach_port_t as the OSThread thread_id rather than pthread_t on BSD/OSX - S7132247: java/rmi/registry/readTest/readTest.sh failing with Cygwin - S7132385: [macosx] IconifyTest of RepaintManager could use some delay - S7132889: (se) AbstractSelectableChannel.register and configureBlocking not safe from asynchronous close - S7132924: (dc) DatagramChannel.disconnect throws SocketException with IPv4 socket and IPv6 enabled [macosx] - S7133111: libsaproc debug print should be printed as unsigned long to fit large numbers on 64bit platform - S7133857: exp() and pow() should use the x87 ISA on x86 - S7140868: TEST_BUG: jcmd tests need to use -XX:+UsePerfData - S7141244: build-infra merge: Include $(SPEC) in makefiles and make variables overridable - S7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built - S7142596: RMI JPRT tests are failing - S7142641: -Xshared:on fails on ARM - S7143490: G1: Remove HeapRegion::_top_at_conc_mark_count - S7143511: G1: Another instance of high GC Worker Other time (50ms) - S7143858: G1: Back to back young GCs with the second GC having a minimally sized eden - S7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages - S7144833: sun/tools/jcmd/jcmd-Defaults.sh failing intermittently - S7144861: speed up RMI activation tests - S7145024: Crashes in ucrypto related to C2 - S7145358: SA throws ClassCastException for partially loaded ConstantPool - S7145441: G1: collection set chooser-related cleanup - S7146246: G1: expose some of the -XX flags that drive which old regions to collect during mixed GCs - S7146424: Wildcard expansion for single entry classpath - S7146442: assert(false) failed: bad AD file - S7146506: (fc) Add EACCES check to the return of fcntl native method - S7146572: enableInputMethod(false) does not work in the TextArea and TextField on the linux platform - S7146636: compiler/6865265/StackOverflowBug.java fails due to changed stack minimum - S7146700: new hotspot build - hs24-b01 - S7146763: Warnings cleanup in the sun.rmi and related packages - S7147064: assert(allocates2(pc)) failed: not in CodeBuffer memory: 0xffffffff778d9d60 <= 0xffffffff778da69c - S7147075: JTextField doesn't get focus or loses focus forever - S7147408: [macosx] Add autodelay to fix a regression test - S7147416: LogCompilation tool does not work with post parse inlining - S7147464: Java crashed while executing method with over 8k of dneg operations - S7147724: G1: hang in SurrogateLockerThread::manipulatePLL - S7147740: add assertions to check stack alignment on VM entry from generated code (x64) - S7147744: CTW: assert(false) failed: infinite EA connection graph build - S7147806: G1: Crash in vm bootstrap when running with -XX:+UseG1GC -XX:-UsePerfData - S7148109: C2 compiler consumes too much heap resources - S7148126: ConstantPoolCacheEntry::print prints to wrong stream - S7148152: Add whitebox testing API to HotSpot - S7148486: At a method handle call returning with an exception may call the runtime with misaligned stack (x64) - S7148488: Whitebox tests for the Diagnostic Framework Parser - S7148664: new hotspot build - hs24-b02 - S7149068: java/awt/Window/Grab/GrabTest.java failed - S7150046: SIGILL on sparcv9 fastdebug - S7150051: incorrect oopmap in critical native - S7150058: Allocate symbols from null boot loader to an arena for NMT - S7150327: new hotspot build - hs24-b03 - S7150390: JFR test crashed on assert(_jni_lock_count == count) failed: must be equal - S7150454: add release jdk7u4 to jprt.properties - S7150594: VM chash in JCK api/java_awt/Image/ConvolveOp/ tests for 64 bit jdk8 on linux. - S7150899: remove unused build.targets lines from jprt.properties - S7151089: PS NUMA: NUMA allocator should not attempt to free pages when using SHM large pages - S7151348: Build breaks due to warning clean up in sun.rmi.*(7146763) - S7151427: Fix the potential memory leak in error handling code in X11SurfaceData.c - S7151434: java -jar -XX crashes java launcher - S7151532: DCmd for hotspot native memory tracking - S7152007: Fix warnings in sun/rmi/rmic - S7152031: Hotspot needs updated xawt path [macosx] - S7152121: Krb5LoginModule no longer handles keyTabNames with "file:" prefix - S7152183: TEST_BUG: java/lang/ProcessBuilder/Basic.java failing intermittently [sol] - S7152206: anti-delta the fix for 7152031 - S7152519: Dependency on non-POSIX header file causes portability problem - S7152700: new hotspot build - hs24-b04 - S7152791: wbapi tests fail on cygwin - S7152796: TEST_BUG: java/net/Socks/SocksV4Test.java does not terminate - S7152800: All tests using the attach API fail with "well-known file is not secure" on Mac OS X - S7152811: Issues in client compiler - S7152856: TEST_BUG: sun/net/www/protocol/jar/B4957695.java failing on Windows - S7152948: DatagramDispatcher.c should memset msghdr to make it portable to other platforms - S7152954: G1: Native memory leak during full GCs - S7152955: print_method crashes with null root - S7152957: VM crashes with assert(false) failed: bad AD file - S7152961: InlineTree::should_not_inline may exit prematurely - S7153339: InternalError when drawLine with Xor and Antialiasing - S7153343: Dependency on non-POSIX header file causes portability problem - S7153374: ARM ONLY .. linking problem with new compilers.. Need to use -fPIC - S7153702: [TEST_BUG] [macosx] Synchronization problem in test javax/swing/JPopupMenu/6827786/bug6827786.java - S7154030: java.awt.Component.hide() does not repaint parent component - S7154114: jstat tests failing on non-english locales - S7154333: JVM fails to start if -XX:+AggressiveHeap is set - S7154517: Build error in hotspot-gc without precompiled headers - S7154638: Change download.oracle.com to docs.oracle.com in jdk/make/docs/Makefile - S7154641: Servicability agent should work on platforms other than x86, sparc - S7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass. - S7154706: new hotspot build - hs23-b05 - S7154724: jdk7u4 test properties missing from jprt.properties - S7154778: [macosx] NSView-based implementation of sun.awt.EmbeddedFrame - S7154997: assert(false) failed: not G1 barrier raw StoreP - S7155168: java/util/TimeZone/Bug6912560.java: expected Asia/Tokyo - S7155298: Editable TextArea/TextField are blocking GUI applications from exit - S7155300: Include pthread.h on all POSIX platforms except Solaris to improve portability - S7155453: [macosx] re-enable jbb tests in JPRT - S7155887: ComboBox does not display focus outline in GTK L&F - S7156659: new hotspot build - hs24-b06 - S7156729: PPC: R_PPC_REL24 relocation error related to some libraries built without -fPIC - S7156764: Remove unused size parameter from some CollectedHeap methods - S7156873: (zipfs) FileSystems.newFileSystem(uri, env) fails for uri with escaped octets - S7156960: Incorrect copyright headers in parts of the Serviceability agent - S7157073: G1: type change size_t -> uint for region counts / indexes - S7157141: crash in 64 bit with corrupted oops - S7157365: jruby/bench.bench_timeout crashes with JVM internal error - S7157695: Add windows implementation of socket interface - S7157734: hotspot test scripts not testing 64-bit JVM under JPRT/JTREG. - S7158137: new hotspot build - hs24-b07 - S7158329: NPE in sun.security.krb5.Credentials.acquireDefaultCreds() - S7158457: division by zero in adaptiveweightedaverage - S7158552: The instanceKlsss::_host_klass is only needed for anonymous class for JSR 292 support. - S7158682: G1: Handle leak when running nsk.sysdict tests - S7158807: Revise stack management with volatile call sites - S7158988: jvm crashes while debugging on x86_32 and x86_64 - S7159041: Fix for 7152519 causing build breakage. - S7159772: instanceKlass::all_fields_count() returns incorrect total field count - S7159842: new hotspot build - hs24-b08 - S7159982: ZipFile uses static for error message when malformed zip file encountered - S7160161: Missed safepoint in non-Counted loop - S7160252: (prefs) NodeAddedEvent was not delivered when new node add when new Node - S7160467: Fix test for 7158988 - S7160539: JDeveloper crashes on 64-bit Windows - S7160570: Intrinsification support for tracing framework - S7160609: [macosx] JDK crash in libjvm.dylib ( C [GeForceGLDriver+0x675a] gldAttachDrawable+0x941) - S7160610: Unknown Native Code compilation issue - S7160613: VerifyRememberedSets doesn't work with CompressedOops - S7160677: missing else in fix for 7152811 - S7160728: Introduce an extra logging level for G1 logging - S7160757: Problem with hotspot/runtime_classfile - S7160924: jvmti: GetPhase returns incorrect phase before VMInit event is issued - S7160951: ActionListener called twice for JMenuItem using ScreenMenuBar - S7160951: [macosx] ActionListener called twice for JMenuItem using ScreenMenuBar - S7161229: PriorityBlockingQueue keeps hard reference to last removed element - S7161282: Move test/sun/tools/classpath/RMICClassPathTest.java to a more appropriate location - S7161437: [macosx] awt.FileDialog doesn't respond appropriately for mac when selecting folders - S7161545: G1: Minor cleanups to the G1 logging - S7161732: Improve handling of thread_id in OSThread - S7161759: TEST_BUG: java/awt/Frame/WindowDragTest/WindowDragTest.java fails to compile, should be modified - S7161796: PhaseStringOpts::fetch_static_field tries to fetch field from the Klass instead of the mirror - S7162063: libsaproc debug print should format size_t correctly on 64bit platform - S7162094: LateInlineCallGenerator::do_late_inline crashed on uninitialized _call_node - S7162111: TEST_BUG: change tests run in headless mode [macosx] - S7162144: Missing AWT thread in headless mode in 7u4 b06 - S7162385: TEST_BUG: sun/net/www/protocol/jar/B4957695.java failing again - S7162488: VM not printing unknown -XX options - S7162726: Wrong filter predicate of visible locals in SA JSJavaFrame - S7162955: Attach api on Solaris, too many open files - S7163117: Agent can't connect to process on Mac OSX - S7163193: new hotspot build - hs24-b09 - S7163198: Tightened package accessibility - S7163534: VM could crashes assert(false) failed: infinite EA connection graph build - S7163848: G1: Log GC Cause for a GC - S7163863: Updated projectcreator - S7163865: Performance improvement for DateFormatSymbols.getZoneIndex(String) - S7163874: InetAddress.isReachable should support pinging 0.0.0.0 - S7164144: Fix variable naming style in freeBlockDictionary.* and binaryTreeDictionary* - S7164191: properties.putAll API may fail with ConcurrentModifcationException on multi-thread scenario - S7164344: enabling ZIP_DEBUGINFO_FILES causes unexpected test failures on Solaris and Windows - S7165722: Invalid path in MemoryMonitor demo's README.txt - S7165755: OS Information much longer on linux than other platforms - S7166048: Remove the embeded epoll data structure. - S7166055: Javadoc for WeakHashMap contains misleading advice - S7166498: JVM crash in ClassVerifier - S7166615: new hotspot build - hs24-b10 - S7166894: Add gc cause to GC logging for all collectors - S7166896: DocumentBuilder.parse(String uri) is not IPv6 enabled. It throws MalformedURLException - S7166955: (pack200) JNI_GetCreatedJavaVMs needs additional checking - S7167069: 6 VM flags crash the VM when queried via jinfo - S7167142: Consider a warning when finding a .hotspotrc or .hotspot_compiler file that isn't used - S7167254: Crash on OSX in Enumerator.nextElement() with compressed oops - S7167266: missing copyright notes in 3rd party code - S7167406: (Zero) Fix for InvokeDynamic needed - S7167437: Can't build on linux without precompiled headers - S7167593: Changed get_source.sh to allow for getting full oracle jdk repo forest - S7167625: Adjustments for SE-Embedded build process - S7167780: Hang javasoft.sqe.tests.api.javax.swing.Timer.Ctor2Tests - S7167976: Fix broken get_source.sh script - S7168144: No appropriate CCC request for changes introduced by 7154030 - S7168172: (fs) Files.isReadable slow on Windows - S7168247: new hotspot build - hs24-b11 - S7168280: Eliminate the generic signature index slot from field array for field without generic signature. - S7168294: G1: Some Full GCs incorrectly report GC cause as "No GC" - S7168848: Add test to check that humongous object allocation path also checks the heap occupancy. - S7169056: Add gigabyte unit to proper_unit_for_byte_size() and byte_size_in_proper_unit() - S7169062: CMS: Assertion failed with -XX:+ObjectAlignmentInBytes=64 - S7169102: 7165060 merge lost changes to make/windows/makefiles/defs.make - S7169111: Unreadable menu bar with Ambiance theme in GTK L&F - S7169395: Exception throws due to the changes in JDK 7 object tranversal and break backward compatibility - S7169409: enabling ZIP_DEBUGINFO_FILES causes unexpected test failures on Windows X86 - S7169782: C2: SIGSEGV in LShiftLNode::Ideal(PhaseGVN*, bool) - S7169934: pow(x,y) or x64 computes incorrect result when x<0 and y is an odd integer - S7170006: new hotspot build - hs24-b12 - S7170010: conditional "ZIP_DEBUGINFO_FILES ?= 0" setting is not reliable on Windows - S7170053: crash in C2 when using -XX:+CountCompiledCalls - S7170091: Fix missing wait between repo cloning in hgforest.sh - S7170145: C1 doesn't respect the JMM with volatile field loads - S7170197: Update JPRT default build targets to support embedded builds - S7170275: os::print_os_info needs to know about Windows 8 - S7170463: C2 should recognize "obj.getClass() == A.class" code pattern - S7170655: Frame size does not follow font size change with XToolkit - S7170657: [macosx] There seems to be no keyboard/mouse action to select non-contiguous items in List - S7170996: IME composition window does not disappear when file dialog is closed : Japanese WinXP - S7171028: dots are missed in the datetime for Slovanian - S7171045: [macosx] There are no enter or exit events reported against 8b39 for MouseEventsDuringDrag. - S7171422: Change 7161732 breaks SA on Windows - S7171703: JNI DefineClass crashes client VM when first parameter is NULL - S7171812: [macosx] Views keep scrolling back to the drag position after DnD - S7171824: assert(_offset >= 1) failed: illegal call to offset() - S7171853: new hotspot build - hs24-b13 - S7171890: C1: add Class.isInstance intrinsic - S7171936: LOG_G incorrectly defined in globalDefinitions.hpp - S7172149: ArrayIndexOutOfBoundsException from Signature.verify - S7172177: test/java/util/TimeZone/DstTzTest.java failing on all platforms - S7172187: [macosx] JAWT native CALayer not positioned over Canvas - S7172226: HotSpot fails to build with GCC 4.7 because of stricter c++ argument dependent lookup - S7172279: G1: Clean up TraceGen0Time and TraceGen1Time data gathering - S7172388: G1: _total_full_collections should not be incremented for concurrent cycles - S7172708: 32/64 bit type issues on Windows after Mac OS X port - S7172826: (se) Selector based on the Solaris event port mechanism - S7172843: C1: fix "assert(has_printable_bci()) failed: _printable_bci should have been set" - S7172967: Eliminate constMethod's _method backpointer to methodOop. - S7173044: MemoryMonitor hangs if getMax method in MemoryUsage object returns -1 - S7173340: C2: code cleanup: use PhaseIterGVN::replace_edge(Node*, int, Node*) where applicable - S7173438: new hotspot build - hs24-b14 - S7173460: G1: java/lang/management/MemoryMXBean/CollectionUsageThreshold.java failes with G1 - S7173494: some jdk tests are not run in test/Makefile - S7173635: jprt.properties should include release jdk7u6 - S7173712: G1: Duplicated code in G1UpdateRSOrPushRefOopClosure::do_oop_nv() - S7173959: Jvm crashed during coherence exabus (tmb) testing - S7174218: remove AtomicLongCSImpl intrinsics - S7174363: Arrays.copyOfRange leads to VM crash with -Xcomp -server if executed by testing framework - S7174510: 19 JCK compiler tests fail with C2 error: memNode.cpp:812 - ShouldNotReachHere - S7174532: jdk/test/java/lang/Math/WorstCaseTests.java failing on x86 - S7174884: C1: failures after 7171890: assert(cur_state != NULL) failed: state_before must be set - S7174887: Deadlock in jndi ldap connection cleanup - S7174928: JSR 292: unresolved invokedynamic call sites deopt and osr infinitely - S7175133: jinfo failed to get system properties after 6924259 - S7175183: [macosx] Objective-C exception thrown when switching monitor configuration - S7175515: new hotspot build - hs24-b15 - S7175616: Port fix for TimeZone from JDK 8 to JDK 7 - S7175707: [macosx] PIT: 8 b43 Not running on AppKit thread issue again - S7175775: Disable SA options in jinfo/Basic.java test until SA updated for new hash and String count/offset - S7175914: Usage of gcc with precompiled headers produces wrong build dependencies - S7176485: (bf) Allow temporary buffer cache to grow to IOV_MAX - S7176856: add the JRE name to the error log - S7177003: C1: LogCompilation support - S7177040: Deadlock between PostEventQueue.noEvents, EventQueue.isDispatchThread and SwingUtilities.invokeLater - S7177128: SA cannot get correct system properties after 7126277 - S7177144: [macosx] Drag and drop not working (regression in 7u6) - S7177173: [macosx] JFrame.setExtendedState(JFrame.MAXIMIZED_BOTH) not working as expected in JDK 7 - S7177307: fix fo CR7158800 doesn't contain Test7158800.sh - S7177409: Perf regression in JVM_GetClassDeclaredFields after generic signature changes. - S7177917: Failed test java/lang/Math/PowTests.java - S7177923: SIGBUS on sparc in compiled code for java.util.Calendar.clear() - S7178079: REGRESSION: Some AWT Drag-n-Drop tests fail since JDK 7u6 b13 - S7178113: build environment change - S7178145: Change constMethodOop::_exception_table to optionally inlined u2 table. - S7178280: Failed new vector regression tests - S7178324: Crash when compiling for(i : x) try(AutoCloseable x = ...) {} - S7178361: G1: Make sure that PrintGC and PrintGCDetails use the same timing for the GC pause - S7178363: G1: Remove the serial code for PrintGCDetails and make it a special case of the parallel code - S7178649: TEST BUG: BadKdc3.java needs improvement to ignore the unlikely but possible timeout - S7178667: ALT_EXPORT_PATH does not export server jvm on macosx - S7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table - S7178703: Fix handling of quoted arguments and better error messages in dcmd - S7178741: SA: jstack -m produce UnalignedAddressException in output (Linux) - S7178846: IterateThroughHeap: heap_iteration_callback passes a negative size - S7179138: Incorrect result with String concatenation optimization - S7179305: (fs) Method name sun.nio.fs.UnixPath.getPathForExecptionMessage is misspelled - S7179383: MaxDirectMemorySize argument parsing is broken for values >2G - S7179759: ENV: Nightly fails during jdk copiyng for solaris platforms after FDS unzipping - S7179879: SSLSocket connect times out instead of throwing socket closed exception - S7179908: Fork hs23.3 hsx from hs22.2 for jdk7u7 and reinitialize build number - S7180621: Hashtable has incorrect alternative hashing threshold default value - S7180769: assert(tboth->klass_is_exact()) failed: klass should be exact - S7180882: new hotspot build - hs24-b16 - S7180884: new hotspot build - hs23.2-b09 - S7180906: Javadoc tool does not apply parameter -nosince - S7180907: Jarsigner -verify fails if rsa file used sha-256 with authenticated attributes - S7180914: Compilation warning after: 7172967: Eliminate the constMethod's _method backpointer to the methodOop. - S7181027: [macosx] Unable to use headless mode - S7181175: Enable builds on Windows with MinGW/MSYS - S7181199: [macosx] Startup is much slower in headless mode for apps using Fonts - S7181200: JVM new hashing code breaks SA in product mode - S7181320: javac NullPointerException for switch labels with cast to String expressions - S7181353: Update error message to distinguish native OOM and java OOM in net - S7181438: [OGL] Incorrect alpha used, during blit from SW to the texture. - S7181494: cleanup avx and vectors code - S7181632: nsk classLoad001_14 failure and CompileTheWorld crash after 7178145. - S7181658: CTW: assert(t->meet(t0) == t) failed: Not monotonic - S7181986: NMT ON: Assertion failure when running jdi ExpiredRequestDeletionTest - S7181989: NMT ON: Assertion failure when NMT checks thread's native stack base address - S7181995: NMT ON: NMT assertion failure assert(cur_vm->is_uncommit_record() || cur_vm->is_deallocation_record - S7182152: Instrumentation hot swap test incorrect monitor count - S7182226: NLS: jdk7u6 message drop20 integration - S7182260: G1: Fine grain RSet freeing bottleneck - S7182500: OCSP revocation checking fails if OCSP responce does not contain certificates - S7182543: NMT ON: Aggregate a few NMT related bugs - S7182902: [macosx] Test api/java_awt/GraphicsDevice/indexTGF.html#SetDisplayMode fails on Mac OS X 10.7 - S7182971: Need to include documentation content for JCMD man page - S7183203: ShortRSAKeynnn.sh tests intermittent failure - S7183209: Backout 7105952 changes for jdk7u - S7183251: Netbeans editor renders text wrong on JDK 7u6 build - S7183292: HttpURLConnection.getHeaderFields() throws IllegalArgumentException: Illegal cookie name - S7183516: [macosx]Can't print-out the defined fonts for PrintFont_2D and AntialiasTableTest. - S7183753: [TEST] Some colon in the diff for this test - S7183754: Test runtime/6294277/Test6294277.sh runs wrong JVM - S7184050: new hotspot build - hs24-b17 - S7184145: (pack200) pack200 --repack throws NullPointerException when JAR file specified without path - S7184287: (prefs) BackingStoreException when calling flush on root node[macosx] - S7184326: TEST_BUG: java/awt/Frame/7024749/bug7024749.java has a typo - S7184365: closed/java/awt/event/TextEvent/TextEventSequenceTest/TextEventSequenceTest fails - S7184394: add intrinsics to use AES instructions - S7184401: JDk7u6 : Missing main menu bar in Netbeans after fix for 7162144 - S7184406: Adjust get_source/hgforest script to allow for trailing // characters - S7184772: G1: Incorrect assert in HeapRegionLinkedList::add_as_head() - S7184815: [macosx] Need to read Kerberos config in files - S7184845: Apps6: menu tree bean in form throws npe in jre 7 while closing - S7184943: fix failing test com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java - S7184946: fix failing test com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java - S7184951: [macosx] Exception at java.awt.datatransfer on headless mode (only in GUI session) - S7185245: Licensee source bundle tries to compile JFR - S7185280: Jre7cert: focusgained does not get called for all focus req when do alt + tab - S7185340: TEST_BUG: java/nio/channels/AsynchronousSocketChannel/Leaky.java failing intermittently [win] - S7185471: Avoid key expansion when AES cipher is re-init w/ the same key - S7185512: The printout doesn't match image on screen. - S7185550: TEST: runtime/7020373/Test7020373.sh fails because there is no test/runtime/7020373/testcase.jar - S7185614: NMT ON: "check by caller" assertion failed on nsk ThreadMXBean test - S7185699: G1: Prediction model discrepancies - S7185775: new hotspot build - hs24-b18 - S7185778: javah error "Not a valid class name" on class names with dollar signs - S7185965: Build error in javadoc make stage for bundles not containing crypto package - S7186111: fix bugs in java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup - S7186278: Build error after CR#6995781 / 7151532 with GCC 4.7.0 - S7186286: TLS implementation to better adhere to RFC - S7186371: [macosx] Main menu shortcuts not displayed (7u6 regression) - S7186778: MachO decoder implementation for MacOSX - S7186794: Setter not found. PropertyDescriptor(PropertyDescriptor,PropertyDescriptor) - S7187046: Crash in ClassFileParser on solaris-ia32 during RetransformClasses. - S7187290: nightly failures after JSR 292 lazy method handle update - S7187429: NMT ON: Merge failure should cause NMT to shutdown - S7187454: stack overflow in C2 compiler thread on Solaris x86 - S7187463: new hotspot build - hs24-b19 - S7187618: PropertyDescriptor Performance Slow - S7187834: [macosx] Usage of private API in macosx 2d implementation causes Apple Store rejection - S7187876: ClassCastException in TCPTransport.executeAcceptLoop - S7187882: TEST_BUG: java/rmi/activation/checkusage/CheckUsage.java fails intermittently - S7188114: (launcher) need an alternate command line parser for Windows - S7188168: 7071904 broke the DEBUG_BINARIES option on Linux - S7188176: The JVM should differentiate between T and M series and adjust GC ergonomics - S7188227: VM should recognize M-series SPARC - S7188276: JSR 292: assert(ct == T_OBJECT) failed: rt=T_OBJECT, ct=13 - S7188594: Print statistic collected by NMT with VM flag - S7188612: JTable's AccessibleJTable throws IllegalComponentStateException instead of null - S7188708: REGRESSION: closed/java/awt/EventQueue/PostEventOrderingTest.java fails - S7188755: Crash due to missing synchronization on gconf_client in DefaultProxySelector.c - S7188852: Move implementation of De/Inflater.getBytesRead/Writtten() to java from native - S7188911: nightly failures after JSR 292 lazy method handle update (round 2) - S7189086: new hotspot build - hs24-b20 - S7189103: Executors needs to maintain state - S7189112: java.beans.Introspector misses write methods - S7189136: Fork hs23.5 hsx from hs23.4 for jdk7u9 and reinitialize build number - S7189350: Fix failed for CR 7162144 - S7189490: More improvements to DomainCombiner checking - S7189611: Venezuela current Currency should be Bs.F. - S7189729: jprt.properties should include release jdk7u8 - S7189926: Reduce test size for default run. Add additional run enabling alternative hashing. - S7189944: (launcher) test/tools/launcher/Arrrrghs.java needs a couple of minor fixes - S7189946: Incorrect copyright header in ExpertTaglet.java - S7190089: NMT ON: NMT failed assertion on thread's stack base address - S7190118: new hotspot build - hs23.4-b01 - S7190130: make jdk7u8 the default jprt release for hs23.4 - S7190219: (bf) CharBuffer.put(String,int,int) modifies position even if BufferOverflowException thrown - S7190254: NetworkInterface getFlags implementation should support full integer bit range for flags value - S7190310: Inlining WeakReference.get(), and hoisting $referent may lead to non-terminating loops - S7190416: JSR 292: typo in InvokerBytecodeGenerator.getConstantPoolSize - S7190512: Fix for 7181175 broke hotspot/make/windows/create.bat builds - S7190550: REGRESSION: Some closed/com/oracle/jfr/api tests fail to compile becuse of fix 7185245 - S7190666: G1: assert(_unused == 0) failed: Inconsistency in PLAB stats - S7190772: new hotspot build - hs24-b21 - S7191102: nightly failures after JSR 292 lazy method handle update (round 3) - S7191124: Optimized build is broken due to inconsistent use of DEBUG_ONLY and NOT_PRODUCT macros in NMT - S7191275: Cleanup OS specific blocks in PlainDatagramSocketImpl.c to support more unix-like platforms - S7191547: XMLEventFactory.newFactory(String factoryId, ClassLoader loader) does not work as expected - S7191556: (fs) UnixNativeDispatcher.getextmntent should be moved into platform specific code - S7191587: (se) SelectionKey.interestOps does not defer changing the interest set to the next select [macosx] - S7191765: make jdk8 the default jprt release for hs24 - S7191872: Xrender: No text displayed using 64 bit JDK on solaris11-sparc - S7191926: Remove MKS dependency in Hotspot regression tests - S7192128: G1: Extend fix for 6948537 to G1's BOT - S7192167: JSR 292: C1 has old broken code which needs to be removed - S7192406: JSR 292: C2 needs exact return type information for invokedynamic and invokehandle call sites - S7192449: fix up tests to accommodate jtreg spec change - S7192744: fix up tests to accommodate jtreg spec change - S7192847: new hotspot build - hs23.4-b02 - S7192887: java/awt/Window/Grab/GrabTest.java still failed (fix failed for CR 7149068) - S7192916: Hotspot development launcher should use DYLD_LIBRARY_PATH on OS X - S7192955: Introspector overide PropertyDescriptor for generic type field defined in super class - S7192963: assert(_in[req-1] == this) failed: Must pass arg count to 'new' - S7192964: assert(false) failed: bad AD file - S7192965: assert(is_aligned_sets(size)) failed: mask is not aligned, adjacent sets - S7193157: G1: Make some develpflags available in product builds - S7193169: The code example in javadoc of Component.java misses 'implements' keyword - S7193219: JComboBox serialization fails in JDK 1.7 - S7193318: C2: remove number of inputs requirement from Node's new operator - S7193463: Improve registering signal handlers in java.lang.Terminator.setup() - S7193946: Move warnings associated with UseMemSetInBOT flag - S7193977: REGRESSION:Java 7's JavaBeans persistence ignoring the "transient" flag on properties - S7194004: new hotspot build - hs24-b22 - S7194032: update tests for upcoming changes for jtreg - S7194035: update tests for upcoming changes for jtreg - S7194184: JColorChooser swatch cannot accessed from keyboard - S7194409: os::javaTimeNanos() shows hot on CPU_CLK_UNHALTED profiles - S7194469: Pressing the Enter key results in an alert tone beep when focus is TextField - S7194472: FileKeyTab.java test fails on Windows - S7194612: api/java_lang/invoke/MethodHandles/Lookup/index.html#ExceptionsTests[findVirtualNSME] fails w/ -esa - S7194633: G1: Assertion and guarantee failures in block offset table - S7194662: JSR 292: PermuteArgsTest times out in nightly test runs - S7195063: [TEST] jtreg flags com/sun/corba/cachedSocket/7056731.sh with Error failure. - S7195106: REGRESSION : There is no way to get Icon inf, once Softreference is released - S7195151: Multiplatform tescase for 6929067 - S7195301: XML Signature DOM implementation should not use instanceof to determine type of Node - S7195931: UnsatisfiedLinkError on PKCS11.C_GetOperationState while using NSS from jre7u6+ - S7196045: Possible JVM deadlock in ThreadTimesClosure when using HotspotInternal non-public API. - S7196199: java/text/Bidi/Bug6665028.java failed: Bidi run count incorrect - S7196242: vm/mlvm/indy/stress/java/loopsAndThreads crashed - S7196262: JSR 292: java/lang/invoke/PrivateInvokeTest.java fails on solaris-sparc - S7196361: add hotspot/make/closed to hgforest.sh - S7196547: [macosx] Implement dead key detection for KeyEvent - S7197033: missing ResourceMark for assert in Method::bci_from() - S7197071: Makefiles for various security providers aren't including the default manifest. - S7197100: new hotspot build - hs23.6-b03 - S7197106: renumber hs23.4 to hs23.6 - S7197619: Using modifiers for the dead key detection on Windows - S7197652: Impossible to run any signed JNLP applications or applets, OCSP off by default - S7198073: (prefs) user prefs not saved [macosx] - S7198084: NPG: distance is too big for short branches in test_invocation_counter_for_mdp() - S7198130: G1: PrintReferenceGC output comes out of order - S7198146: Another new regression test does not compile on windows-amd64 - S7198338: make jdk7u10 the default jprt release for hs23.6 - S7198499: TraceTypeProfile as diagnostic option - S7198529: NPG: assert with NMT code in Thread destructor - S7198570: (tz) Support tzdata2012f - S7198640: new hotspot build - hs23.6-b04 - S7198904: (alt-rt) TreeMap.clone is broken - S7198988: re-order paramaters for Collision.java @run - S7199010: incorrect vector alignment - S7199066: Typo in method name - S7199092: NMT: NMT needs to deal overlapped virtual memory ranges - S7199180: [macosx] Dead keys handling for input methods - S7199219: Proxy-Connection headers set incorrectly when a HttpClient is retrieved from the Keep Alive Cache - S7199249: TEST_BUG : Add /othervm to Collisions.java @run main with -D definitions - S7199488: [TEST] runtime/7158800/InternTest.java failed due to false-positive on PID match. - S7199637: TEST_BUG: add serialization tests to jdk7u problem list for macosx - S7199645: Increment build # of hs23.5 to b02 - S7199654: Remove LoadUI2LNode - S7199669: Update tags in .hgtags file for CPU release rename - S7199708: FileChooser crashs when opening large folder - S7199742: A lot of C2 OSR compilations of the same method's bci - S7199862: Make sure that a connection is still alive when retrieved from KeepAliveCache in certain cases - S7200001: failed C1 OSR compile doesn't get recompiled with C2 - S7200092: Make NMT a bit friendlier to work with - S7200145: runtime/7196045/Test7196045.java fails with No class provided for `main' - S7200163: add CodeComments functionality to assember stubs - S7200233: C2: can't use expand rules for vector instruction rules - S7200261: G1: Liveness counting inconsistencies during marking verification - S7200264: 7192963 changes disabled shift vectors - S7200295: CertificateRequest message is wrapping when using large numbers of Certs - S7200297: agent code does not handle multiple boot library path elements correctly - S7200720: crash in net.dll during NTLM authentication - S7200742: (se) Selector.select does not block when starting Coherence (sol11u1) - S7200762: [macosx] Stuck in sun.java2d.opengl.CGLGraphicsConfig.getMaxTextureSize(Native Method) - S7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path - S7201026: add vector for shift count - S7201053: Krb5LoginModule shows NPE when both useTicketCache and storeKey are set to true - S7201151: Fix Contribution : Java cannot get Windows's IME name correctly - S7201156: jar tool fails to convert file separation characters for list and extract - S8000102: Resolve include conflicts - S8000178: (bf) Backout 7190219 fix for jdk7u (JCK issue) - S8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64 - S8000263: JSR 292: signature types may appear to be unloaded - S8000285: Deadlock between PostEventQueue.noEvents, EventQueue.isDispatchThread and SwingUtilities.invokeLater - S8000286: [macosx] Views keep scrolling back to the drag position after DnD - S8000297: REGRESSION: closed/java/awt/EventQueue/PostEventOrderingTest.java fails - S8000307: Jre7cert: focusgained does not get called for all focus req when do alt + tab - S8000311: G1: ParallelGCThreads==0 broken - S8000313: C2 should use jlong for 64bit values - S8000423: Diacritic is not applyed to a base letter on Linux - S8000459: assert(java_lang_String::is_instance(entry)) failure with various mlvm tests. - S8000485: Hotspot build fails in Solaris Studio IDE when building dtrace - S8000486: REGRESSION: Three java2d tests fail since jdk8b58 on Windows 7 with NullPointerException - S8000487: Java JNDI connection library on ldap conn is not honoring configured timeout - S8000525: Java.net.httpcookie api does not support 2-digit year format - S8000592: Improve adlc usability - S8000622: Forgot to hg add and check in test for JDK-7170638 - S8000664: 2 SAX features does not work properly - S8000740: remove LinkWellKnownClasses - S8000743: docencoding not available to stylesheet - S8000780: [Backport from jdk8] Fix zero fail to build in icedtea7-head. - S8000805: JMM issue: short loads are non-atomic - S8000817: Reinstate accidentally removed sleep() from ProcessBuilder/Basic.java - S8000821: JSR 292: C1 fails to call virtual method (JRUBY-6920) - S8000831: Heap verification output incorrect/incomplete - S8000955: Hashtable.Entry.hashCode() does not conform to Map.Entry.hashCode() defined behaviour - S8000989: smaller code changes to make future JSR 292 backports easier - S8001071: Add simple range check into VM implemenation of Unsafe access methods - S8001101: C2: more general vector rule subsetting - S8001124: jdk7u ProblemList.txt updates (10/2012) - S8001161: mac: EmbeddedFrame doesn't become active window - S8001174: new hotspot build - hs24-b23 - S8001175: new hotspot build - hs24-b24 - S8001183: incorrect results of char vectors right shift operaiton - S8001192: allow duplicate bug ids in hs24 - S8001208: Fix for KRB5CCNAME not complete - S8001591: NMT: assertion failed: assert(rec->addr() + rec->size() <= cur->base()) failed: Can not overlap in memSnapshot.cpp - S8001592: NMT: assertion failed: assert(_amount >= amt) failed: Just check: memBaseline.hpp:180 - S8001621: Update awk scripts that check output from jps/jcmd - S8001635: assert(in_bb(n)) failed: must be - S8001662: new hotspot build - hs24-b25 - S8001756: Hotspot makefiles report missing OBJCOPY command in the wrong circumstances - S8001808: Create a test for 8000327 - S8001876: Create regtest for 8000283 - S8002034: Allow Full Debug Symbols when cross-compiling - S8002040: Allow Full Debug Symbols when cross-compiling - S8002069: Assert failed in C2: assert(field->edge_count() > 0) failed: sanity - S8002077: Possible mnemonic issue on JFileChooser Save button on nimbus L&F - S8002078: hs_err_pid file should report full JDK version string - S8002114: fix failed for JDK-7160951: [macosx] ActionListener called twice for JMenuItem using ScreenMenuBar - S8002225: (tz) Support tzdata2012i - S8002227: (tz) Support tzdata2012i - S8002273: NMT to report JNI memory leaks when -Xcheck:jni is on - S8002294: assert(VM_Version::supports_ssse3()) failed - S8002297: sun/net/www/protocol/http/StackTraceTest.java fails intermittently - S8002313: TEST_BUG : jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.java should run in headless mode - S8002344: Krb5LoginModule config class does not return proper KDC list from DNS - S8002362: Build fails after integration of 7185280 to jdk7u-dev - S8003230: new hotspot build - hs24-b26 - S8003254: make jdk7u12 the default jprt release for hs24 - S8003260: [findbug] some fields should be package protected - S8003261: static field is public but not final - S8003322: Add instrumentation points for tracing of I/O calls - S8003333: Regression: java/beans/EventHandler/Test6277266.java fails with ACE - S8003487: NMT: incorrect assertion in VMMemPointerIterator::remove_released_region method (memSnapshot.cpp) - S8003550: new hotspot build - hs24-b27 - S8003591: Abstract_VM_Version::internal_vm_info_string needs to stringify FLOAT_ARCH for ease of use - S8003597: TEST_BUG: Eliminate dependency on javaweb from closed net tests - S8003689: MemTracker::init_tracking_options() reads outside array if commandline argument is empty - S8003830: NPE at BasicTreeUI$Actions.page:4470 - S8003948: NTLM/Negotiate authentication problem - S8003982: new test javax/swing/AncestorNotifier/7193219/bug7193219.java failed on macosx - S8004094: Javac compiler error - synthetic method accessor generated with duplicate name - S8004114: build environment change - S8004131: move jdi tests out of core testset - S8004170: G1: Verbose GC output is not getting flushed to log file using JDK 8 - S8004188: Rename src/share/lib/security/java.security to java.security-linux - S8004317: TestLibrary.getUnusedRandomPort() fails intermittently, but exception not reported - S8004337: java/sql tests aren't run in test/Makefile - S8004344: Fix a crash in ToolkitErrorHandler() in XlibWrapper.c - S8004391: Bug fix in jtreg causes test failures in pre jdk 8 langtools tests - S8004640: C2 assert failure in memnode.cpp: NULL+offs not RAW address - S8004713: Stackoverflowerror thrown when thread stack straddles 0x80000000 - S8004748: clean up @build tags in RMI tests - S8004802: jcmd VM.native_memory baseline=false crashes VM - S8004846: Time-specific certpath validation applies to all certs involved - S8004925: java/net/Socks/SocksV4Test.java failing on all platforms - S8005035: new hotspot build - hs24-b28 - S8005290: remove -showversion from RMI test library subprocess mechanism - S8005460: [findbugs] Probably returned array should be cloned - S8005556: java/net/Socks/SocksV4Test.java is missing @run tag - S8005646: TEST_BUG: java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup leaves process running - S8005920: After pressing combination Windows Key and M key, the frame, the instruction and the dialog can't be minimized. - S8005943: (process) Improved Runtime.exec - S8006120: Provide "Server JRE" for 7u train - S8006309: More reliable control panel operation - S8006417: JComboBox.showPopup(), hidePopup() fails in JRE 1.7 on OS X - S8006435: Improvements in JMX - S8006534: CLONE - TestLibrary.getUnusedRandomPort() fails intermittently-doesn't retry enough times - S8006536: [launcher] removes trailing slashes on arguments - S8006560: java/net/ipv6tests/B6521014.java fails intermittently - S8006564: Test sun/security/util/Oid/S11N.sh fails with timeout on Linux 32-bit - S8006669: sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh fails on mac - S8006753: fix failed for JDK-8002415 White box testing API for HotSpot - S8006777: Improve TLS handling of invalid messages - S8006790: Improve checking for windows - S8006795: Improve font warning messages - S8007014: Improve image handling - S8007406: Improve accessibility of AccessBridge - S8007515: TEST_BUG: update ProblemList.txt and TEST.ROOT in jdk7u-dev to match jdk8 - S8007617: Better validation of images - S8007667: Better image reading - S8007675: Improve color conversion - S8007688: Blacklist known bad certificate - S8007701: Hotspot trace allocation events - S8007918: Better image writing - S8008081: Print outs do not have matching arguments - S8008140: Better method handle resolution - S8008223: java/net/BindException/Test.java fails rarely - S8008249: Sync ICU into JDK : - S8008379: TEST_BUG: Fail automatically with java.lang.NullPointerException. - S8008737: The trace event vm/gc/heap/summary is missing for CMS - S8008815: [TEST_BUG] Add back tests to the Problemlist files post the jdk7u -> 7u-cpu test sync up - S8008917: CMS: Concurrent mode failure tracing event - S8008920: Tracing events for heap statistics - S8009032: Implement evacuation info event - S8009165: Fix for 8008817 needs revision - S8009305: Improve AWT data transfer - S8009399: Bump the hsx build number for APRIL CPU - S8009460: C2compiler crash in machnode::in_regmask(unsigned int) - S8009463: Regression test test\java\lang\Runtime\exec\ArgWithSpaceAndFinalBackslash.java failing. - S8009530: ICU Kern table support broken - S8009610: Blacklist certificate used with malware. - S8009634: TEST_BUG: sun/misc/Version/Version.java handle 2 digit minor in VM version - S8009677: Better setting of setters - S8009699: Methodhandle lookup - S8009750: javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java should run in other vm mode - S8009814: Better driver management - S8009857: Problem with plugin - S8009881: TEST_BUG: javax/swing/JTree/8004298/bug8004298.java should be modified - S8010166: TEST_BUG: fix for 8009634 overlooks possible version strings (sun/misc/Version/Version.java) - S8010294: Refactor HeapInspection to make it more reusable - S8010651: create.bat still builds the kernel - S8010916: Add tenuring threshold to young garbage collection events - S8010939: Deadlock in LogManager - S8011021: new hotspot build - hs24-b39 - S8011400: missing define OPENJDK for windows builds - S8011583: new hotspot build - hs24-b40 - S8011699: CMS: assert(_shared_gc_info.id() != SharedGCInfo::UNSET_GCID) failed: GC not started? - S8011745: Unknown CertificateChoices - S8011867: Accept unknown PKCS #9 attributes - S8012572: Exclude sun/tools/jmap/Basic.sh for short term - S8014469: (tz) Support tzdata2013c * Backports - PR1197, S8003120, RH868136: ResourceManager.getApplicationResources() does not close InputStreams - S8014618, RH962568: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement * Bug fixes - PR1212: IcedTea7 fails to build because Resources.getText() is no longer available for code to use - Add NSS (commented out) to other platforms. - Allow multiple PKCS11 library initialisation to be a non-critical error. - Complete switch from local zlib patch to upstream version. - Include defs.make in buildtree.make so ZERO_BUILD is recognised and JVM_VARIANT_ZERO set. - Provide support for using PKCS11 provider with NSS - Remove file apparently removed as part of upstreaming of Zero. - Revert 7060849 - Set UNLIMITED_CRYPTO=true to ensure we use the unlimited policy. - PR473: Set handleStartupErrors to ignoreMultipleInitialisation in nss.cfg - PR716: IcedTea7 should bootstrap with IcedTea6 - Expand java.security.cert.* imports to avoid conflict when building with OpenJDK 6. - Fix indentation on Makefile block not executed when STRIP_POLICY=no_strip is set - Fix invalid XSL stylesheets and DTD introduced as part of JEP 167. - Include defs.make in buildtree.make so ZERO_BUILD is recognised and JVM_VARIANT_ZERO set. - Make sure libffi cflags and libs are used. - PR1378: Add AArch64 support to Zero - PR1170: Ensure unlimited crypto policy is in place. - RH513605, PR1280: Updating/Installing OpenJDK should recreate the shared class-data archive - PR1358: Make XRender mandatory - PR1360: Check for /usr/lib64 JVMs and generic JPackage alternative - PR1435, D657854: OpenJDK 7 returns incorrect TrueType font metrics - PR728: GTKLookAndFeel does not honor gtk-alternative-button-order * CACAO - src/vm/jit/x86_64/asmpart.S (asm_abstractmethoderror): Keep stack aligned. - src/native/jni.cpp (GetObjectClass): Remove null pointer check. - Removing the cache flush was not the brightest idea. Putting it back in. - arm: Make md_dcacheflush a compiler barrier, as on x86. - src/vm/jit/codegen-common.cpp: Removed superfluous memory barrier - CA168: Updating to the new assertion interface of GNU Classpath - src/vm/jit/trap.cpp (trap_handle): Print stack trace before aborting. - arm: Thumb interworking should work on armv5 - Fixed using typename declarations for clang - src/native/vm/openjdk/sun_misc_Perf.cpp: Implement high resolution timer. - CA166: make check-langtools failure: MineField.sh - CA167: intern strings in get_StackTraceElement - src/native/vm/openjdk/jvm.cpp: Recreate JVM_Available. - Export JVM_SetNativeThreadName (noop) - src/vm/initialize.cpp: Explicitly initialize java/lang/Class early. - Adapt to recent java.lang.String changes in openjdk7 - jdk_str_ops broke the GNU classpath build. - Support class version 51 unconditionally. Also identify as Java 6. - Stop creating pseudo files for OpenJDK (libjsig.so, Xusage.txt) - src/vm/jit/alpha/asmpart.S: Properly set up GP in asm_abstractmethoderror - CA172, PR1266, G453612: ARM hardfloat support - Clang fix for the i386 backend - Fix rt-timing - Moved rt-timing.{c,h} to C++ - PR1278: Synchronise CACAO versions between IcedTea6/7/8 where possible - PR1276: Synchronise CACAO rules between IcedTea6/7/8 where possible * JamVM - JSR 335: (lambda expressions) initial hack - JEP 171: Implement fence methods in sun.misc.Unsafe - Fix invokesuper check in invokespecial opcode - Fix non-direct interpreter invokespecial super-class check - When GC'ing a native method don't try to free code - Do not free unprepared Miranda method code data - Set anonymous class protection domain - JVM_IsVMGeneratedMethodIx stub - Dummy implementation of sun.misc.Perf natives * SystemTap - Add garbage collection probes The tarball can be downloaded from: * http://icedtea.classpath.org/download/source/icedtea-2.4.0.tar.gz SHA256 checksums: be030583f0216151bd4b67b354085bf957b532d7bd2d67f14166bb6a1fc5497a icedtea-2.4.0.tar.gz Each tarball is accompanied by a digital signature (available at the above URL + '.sig'). This is produced using my public key. See details below. The following people helped with these releases: * Lucas Berk (SystemTap garbage collection patch) * Andrew John Hughes (all upstream merges & backports, all other bug fixes, PR1278 CACAO update, release management) * Matthais Klose (Xp check removal) * Xerxes R?nby (JamVM update) * Robert Schuster (PR1276 --with-cacao-src-dir support) * Pavel Tisnovsky (build failure fix) * Michal Vyskocil (PR1358, PR1360) We would also like to thank the bug reporters and testers! To get started: $ tar xzf icedtea-2.4.0.tar.gz $ mkdir icedtea-build $ cd icedtea-build $ ../icedtea-2.4.0/configure [--enable-cacao --enable-pulse-java ...] Full build requirements and instructions are in INSTALL. Happy hacking! -- Andrew :) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130609/928be3b2/attachment.bin From adomurad at redhat.com Mon Jun 10 12:39:41 2013 From: adomurad at redhat.com (Adam Domurad) Date: Mon, 10 Jun 2013 15:39:41 -0400 Subject: [rfc][icedtea-web] Extract URL processing in TinyHttpdImpl In-Reply-To: <51B5F80D.1040706@redhat.com> References: <51B5F80D.1040706@redhat.com> Message-ID: <51B62B7D.7030300@redhat.com> Thanks for the refactoring! On 06/10/2013 12:00 PM, Andrew Azores wrote: > Changelog: > * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: > extracted some lines out of run() into new method urlToFilePath() You should use list symbols you changed in the ChangeLog if its only a few. Eg: * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java (run): Calls urlToFilePath (urlToFilePath): New, extract path resolution from (run) > * > tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java: > unit tests added for new urlToFilePath() > > As per Jiri's request/suggestion a few days ago. Fix comments: > diff --git a/tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java b/tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java > --- a/tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java > +++ b/tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java > @@ -42,6 +42,7 @@ import java.io.DataOutputStream; > import java.io.File; > import java.io.FileInputStream; > import java.io.InputStreamReader; > +import java.io.UnsupportedEncodingException; > import java.net.HttpURLConnection; > import java.net.Socket; > import java.net.SocketException; > @@ -120,14 +121,8 @@ public class TinyHttpdImpl extends Threa > t.nextToken(); > String op = t.nextToken(); > String p = op; > - if (p.startsWith(XSX)) { > - p = p.replace(XSX, "/"); > - } > ServerAccess.logNoReprint("Getting: " + p); > - p = URLDecoder.decode(p, "UTF-8"); > - p = p.replaceAll("\\?.*", ""); > - p = (".".concat((p.endsWith("/")) ? p.concat("index.html") : p)).replace('/', File.separatorChar); > - p = stripHttpPathParams(p); > + p = urlToFilePath(p); > ServerAccess.logNoReprint("Serving: " + p); > File pp = new File(dir, p); > int l = (int) pp.length(); > @@ -206,6 +201,28 @@ public class TinyHttpdImpl extends Threa > } > > /** > + * This function transforms a request URL into a path to a file which the server > + * will return to the requester. > + * @param url - the request URL > + * @return a String representation of the local path to the file > + * @throws UnsupportedEncodingException > + */ > + public static String urlToFilePath(String url) throws UnsupportedEncodingException { > + url = URLDecoder.decode(url, "UTF-8"); // Decode URL encoded charaters, eg "%3B" becomes ';' Please fix the indentation in this function (also make sure you aren't using any tabs, see http://icedtea.classpath.org/wiki/IcedTea-Web#Code_style) > + if (url.startsWith(XSX)) { > + url = url.replace(XSX, "/"); > + } > + url = url.replaceAll("\\?.*", ""); // Remove query string from URL > + url = ".".concat(url); // Change path into relative path I would just place comments one space away from the line instead of trying to line them up, but its up to you. > + if (url.endsWith("/")) { > + url += "index.html"; > + } > + url = url.replace('/', File.separatorChar); // If running on Windows, replace '/' in path with "\\" > + url = stripHttpPathParams(url); > + return url; > + } > + > + /** > * This function removes the HTTP Path Parameter from a given JAR URL, assuming that the > * path param delimiter is a semicolon > * @param url - the URL from which to remove the path parameter Otherwise looks good :-) Test commments: > diff --git a/tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java b/tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java > --- a/tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java > +++ b/tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java > @@ -39,6 +39,8 @@ package net.sourceforge.jnlp; > import java.io.File; > import java.io.FileInputStream; > import java.net.URL; > +import java.net.URLDecoder; > + > import org.junit.Assert; > import org.junit.Test; > > @@ -217,6 +219,41 @@ public class ServerAccessTest { > Assert.assertArrayEquals(b2, bb[1]); > Assert.assertArrayEquals(b3, bb[2]); > } > + > + private static final String[] filePathTestUrls = { > + "/foo.html", > + "/foo/", > + "/foo/bar.jar", > + "/foo/bar.jar;path_param", > + "/foo/bar.jar%3Bpath_param", > + "/foo/bar?query=string&red=hat" > + }; > + @Test > + public void urlToFilePathTest() throws Exception { > + for (String url : filePathTestUrls) { > + String newUrl = TinyHttpdImpl.urlToFilePath(url); > + > + Assert.assertFalse("File path should not contain query string: " + newUrl, newUrl.contains("?")); > + Assert.assertTrue("File path should be relative: " + newUrl, newUrl.startsWith("./")); > + Assert.assertFalse("File path should not contain \"/XslowX\":" + newUrl, > + newUrl.toLowerCase().contains("/XslowX".toLowerCase())); > + > + if (url.endsWith("/")) { > + Assert.assertTrue(newUrl.endsWith("/index.html")); > + } > + } > + } > + > + @Test > + public void urlToFilePathUrlDecodeTest() throws Exception { > + // This test may fail with strange original URLs, eg those containing the substring "%253B", > + // which can be decoded into "%3B", then decoded again into ';'. Indentation should be fixed here, easy way is to just autoformat in eclipse (make sure your formatting profile uses spaces only). > + > + for (String url : filePathTestUrls) { > + String newUrl = TinyHttpdImpl.urlToFilePath(url); > + Assert.assertEquals(newUrl, URLDecoder.decode(newUrl, "UTF-8")); > + } > + } > > @Test > public void stripHttpPathParamTest() { Otherwise looks good, though. Thanks again! -Adam From adomurad at redhat.com Mon Jun 10 13:10:03 2013 From: adomurad at redhat.com (Adam Domurad) Date: Mon, 10 Jun 2013 16:10:03 -0400 Subject: [rfc][icedtea-web] fix (And tests) for PR1473 In-Reply-To: <51B5EFA8.1010601@redhat.com> References: <51B5B02E.7020001@redhat.com> <51B5EFA8.1010601@redhat.com> Message-ID: <51B6329B.9010402@redhat.com> On 06/10/2013 11:24 AM, Jiri Vanek wrote: > > > This patch is removing the redownloading of jnlp file - both from local > file and form network, and > so fixing the http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1473 > > The unhappy redownloading was added during one of inital pushes - > http://icedtea.classpath.org/hg/icedtea-web/rev/1d604ccd9b6b And I'm > wondering why:) > > > J. > > > OK this patch left me a bit confused, file.getSourceLocation() is the location of the href, we are correctly redownloading from here to get the most up-to-date JNLP. However we can skip this check based on the update policy, and if we are already downloading from a network location (and we should, too). Your tests seem to fail because the JNLP from the href is attempting to be downloaded -- but this is correct behaviour. Can you explain ? Thanks, -Adam From bugzilla-daemon at icedtea.classpath.org Mon Jun 10 14:25:47 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 10 Jun 2013 21:25:47 +0000 Subject: [Bug 1477] New: JVM Crash (SIGSERGV) on frame C 0x0000000000000000 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1477 Bug ID: 1477 Summary: JVM Crash (SIGSERGV) on frame C 0x0000000000000000 Classification: Unclassified Product: IcedTea Version: unspecified Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: francesco.vollero at gmail.com CC: unassigned at icedtea.classpath.org Created attachment 886 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=886&action=edit Dumpstack While I was happily using Eclipse i got this weird error. It can be referred to Eclipse or to OpenJDK. I am not able to predict which one. thank you! -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130610/fcb674d8/attachment.html From andrew at icedtea.classpath.org Tue Jun 11 02:45:00 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 11 Jun 2013 09:45:00 +0000 Subject: /hg/icedtea7: 5 new changesets Message-ID: changeset 80f5694f5597 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=80f5694f5597 author: Andrew John Hughes date: Sun Jun 09 18:51:53 2013 +0100 Add Debian bug ID for PR1435. 2013-06-09 Andrew John Hughes * NEWS: Add Debian bug ID for PR1435. changeset aa56d739eda1 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=aa56d739eda1 author: Andrew John Hughes date: Sun Jun 09 18:54:26 2013 +0100 Remove jconsole directory from GENERATED_FILES. 2013-06-09 Andrew John Hughes * Makefile.am: Remove jconsole directory from GENERATED_FILES. changeset 98030afd6ccd in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=98030afd6ccd author: Andrew John Hughes date: Sun Jun 09 18:58:29 2013 +0100 Remove non-existent JamVM patch directory. 2013-06-09 Andrew John Hughes * Makefile.am: (EXTRA_DIST): Remove non-existent JamVM patch directory. changeset 9d0ec2f1a156 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=9d0ec2f1a156 author: Andrew John Hughes date: Sun Jun 09 21:52:45 2013 +0100 Use 'IcedTea' as ICEDTEA_NAME. 2013-04-21 Andrew John Hughes * Makefile.am: (ICEDTEA_NAME): Make same across all versions. changeset 7b39d0b37add in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=7b39d0b37add author: Andrew John Hughes date: Tue Jun 11 10:44:39 2013 +0100 Complete 2.4.0 release notes. 2013-06-11 Andrew John Hughes * NEWS: Update 2.4.0 following release annoucement, including setting release date. diffstat: ChangeLog | 27 +++++++++++++++++++++++++++ Makefile.am | 4 +--- NEWS | 18 +++++++++++------- 3 files changed, 39 insertions(+), 10 deletions(-) diffs (134 lines): diff -r a0b3e77af9d3 -r 7b39d0b37add ChangeLog --- a/ChangeLog Fri Jun 07 22:22:02 2013 +0100 +++ b/ChangeLog Tue Jun 11 10:44:39 2013 +0100 @@ -1,3 +1,30 @@ +2013-06-11 Andrew John Hughes + + * NEWS: Update 2.4.0 following release + annoucement, including setting release + date. + +2013-04-21 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_NAME): Make same across all versions. + +2013-06-09 Andrew John Hughes + + * Makefile.am: + (EXTRA_DIST): Remove non-existent JamVM patch + directory. + +2013-06-09 Andrew John Hughes + + * Makefile.am: + (GENERATED_FILES): Remove non-existent jconsole + directory. + +2013-06-09 Andrew John Hughes + + * NEWS: Add Debian bug ID for PR1435. + 2013-06-07 Andrew John Hughes * configure.ac: Set to 2.5pre. diff -r a0b3e77af9d3 -r 7b39d0b37add Makefile.am --- a/Makefile.am Fri Jun 07 22:22:02 2013 +0100 +++ b/Makefile.am Tue Jun 11 10:44:39 2013 +0100 @@ -416,7 +416,7 @@ ICEDTEA_SHARK_BUILD = true endif -ICEDTEA_NAME = IcedTea7 +ICEDTEA_NAME = IcedTea if HAS_ICEDTEA_REVISION ICEDTEA_REV = +${ICEDTEA_REVISION} endif @@ -657,7 +657,6 @@ $(top_srcdir)/generated/sun/util/resources/*.java \ $(top_srcdir)/generated/sun/print/resources/serviceui*.java \ $(top_srcdir)/generated/sun/tools/jar/resources/jar*.java \ - $(top_srcdir)/generated/sun/tools/jconsole/*.java \ $(top_srcdir)/generated/sun/management/resources/agent*.java \ $(top_srcdir)/generated/java/nio/*.java \ $(top_srcdir)/generated/java/nio/channels/*.java \ @@ -760,7 +759,6 @@ EXTRA_DIST = $(GENERATED_FILES) $(top_srcdir)/patches/*.patch \ $(top_srcdir)/patches/boot/*.patch \ $(top_srcdir)/patches/cacao/*.patch \ - $(top_srcdir)/patches/jamvm/*.patch \ $(top_srcdir)/patches/boot/hotspot/*/*.patch \ tools-copy contrib overlays \ javaws.png javaws.desktop \ diff -r a0b3e77af9d3 -r 7b39d0b37add NEWS --- a/NEWS Fri Jun 07 22:22:02 2013 +0100 +++ b/NEWS Tue Jun 11 10:44:39 2013 +0100 @@ -7,12 +7,14 @@ GX - http://bugs.gentoo.org/show_bug.cgi?id=X CAX - http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=X LPX - https://bugs.launchpad.net/bugs/X +JSRX - http://jcp.org/en/jsr/detail?id=X +JEPX - http://openjdk.java.net/jeps/X CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY New in release 2.5.0 (2012-XX-XX): -New in release 2.4.0 (2012-XX-XX): +New in release 2.4.0 (2013-06-09): OpenJDK - PR1209, S7170638: Use DTRACE_PROBE[N] in JNI Set and SetStatic Field. @@ -793,6 +795,7 @@ - S8011867: Accept unknown PKCS #9 attributes - S8012572: Exclude sun/tools/jmap/Basic.sh for short term - S8014469: (tz) Support tzdata2013c + - S8015275: Resolve ambiguity in OCSPChecker & CrlRevocationChecker * Backports - PR1197, S8003120, RH868136: ResourceManager.getApplicationResources() does not close InputStreams - S8014618, RH962568: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement @@ -804,13 +807,12 @@ - Include defs.make in buildtree.make so ZERO_BUILD is recognised and JVM_VARIANT_ZERO set. - Provide support for using PKCS11 provider with NSS - Remove file apparently removed as part of upstreaming of Zero. - - Revert 7060849 + - Revert S7060849 - Set UNLIMITED_CRYPTO=true to ensure we use the unlimited policy. - PR473: Set handleStartupErrors to ignoreMultipleInitialisation in nss.cfg - PR716: IcedTea7 should bootstrap with IcedTea6 - - Expand java.security.cert.* imports to avoid conflict when building with OpenJDK 6. - Fix indentation on Makefile block not executed when STRIP_POLICY=no_strip is set - - Fix invalid XSL stylesheets and DTD introduced as part of JEP 167. + - JEP167: Fix invalid XSL stylesheets and DTD. - Include defs.make in buildtree.make so ZERO_BUILD is recognised and JVM_VARIANT_ZERO set. - Make sure libffi cflags and libs are used. - PR1378: Add AArch64 support to Zero @@ -818,7 +820,7 @@ - RH513605, PR1280: Updating/Installing OpenJDK should recreate the shared class-data archive - PR1358: Make XRender mandatory - PR1360: Check for /usr/lib64 JVMs and generic JPackage alternative - - PR1435: OpenJDK 7 returns incorrect TrueType font metrics + - PR1435, D657854: OpenJDK 7 returns incorrect TrueType font metrics - PR728: GTKLookAndFeel does not honor gtk-alternative-button-order * CACAO - src/vm/jit/x86_64/asmpart.S (asm_abstractmethoderror): Keep stack aligned. @@ -848,8 +850,8 @@ - PR1278: Synchronise CACAO versions between IcedTea6/7/8 where possible - PR1276: Synchronise CACAO rules between IcedTea6/7/8 where possible * JamVM - - JSR 335: (lambda expressions) initial hack - - JEP 171: Implement fence methods in sun.misc.Unsafe + - JSR335: (lambda expressions) initial hack + - JEP171: Implement fence methods in sun.misc.Unsafe - Fix invokesuper check in invokespecial opcode - Fix non-direct interpreter invokespecial super-class check - When GC'ing a native method don't try to free code @@ -857,6 +859,8 @@ - Set anonymous class protection domain - JVM_IsVMGeneratedMethodIx stub - Dummy implementation of sun.misc.Perf natives +* SystemTap + - Add garbage collection probes New in release 2.1.8 (2013-05-02): From bugzilla-daemon at icedtea.classpath.org Tue Jun 11 02:45:18 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 11 Jun 2013 09:45:18 +0000 Subject: [Bug 1435] [IcedTea7] OpenJDK 7 returns incorrect TrueType font metrics In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1435 --- Comment #6 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7?cmd=changeset;node=80f5694f5597 author: Andrew John Hughes date: Sun Jun 09 18:51:53 2013 +0100 Add Debian bug ID for PR1435. 2013-06-09 Andrew John Hughes * NEWS: Add Debian bug ID for PR1435. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130611/10b5afb6/attachment.html From andrew at icedtea.classpath.org Tue Jun 11 03:09:27 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 11 Jun 2013 10:09:27 +0000 Subject: /hg/release/icedtea7-2.4: Start 2.4.1 release cycle. Message-ID: changeset 861abb252466 in /hg/release/icedtea7-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=861abb252466 author: Andrew John Hughes date: Tue Jun 11 11:09:13 2013 +0100 Start 2.4.1 release cycle. 2013-06-11 Andrew John Hughes * configure.ac: Bump to 2.4.1pre. * NEWS: Add 2.4.1 section. diffstat: ChangeLog | 5 +++++ NEWS | 2 ++ configure.ac | 2 +- 3 files changed, 8 insertions(+), 1 deletions(-) diffs (33 lines): diff -r 465798b717c9 -r 861abb252466 ChangeLog --- a/ChangeLog Mon Jun 10 15:57:07 2013 +0100 +++ b/ChangeLog Tue Jun 11 11:09:13 2013 +0100 @@ -1,3 +1,8 @@ +2013-06-11 Andrew John Hughes + + * configure.ac: Bump to 2.4.1pre. + * NEWS: Add 2.4.1 section. + 2013-06-10 Andrew John Hughes * NEWS: Update following release diff -r 465798b717c9 -r 861abb252466 NEWS --- a/NEWS Mon Jun 10 15:57:07 2013 +0100 +++ b/NEWS Tue Jun 11 11:09:13 2013 +0100 @@ -12,6 +12,8 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release 2.4.1 (2013-06-XX): + New in release 2.4.0 (2013-06-09): OpenJDK diff -r 465798b717c9 -r 861abb252466 configure.ac --- a/configure.ac Mon Jun 10 15:57:07 2013 +0100 +++ b/configure.ac Tue Jun 11 11:09:13 2013 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.4.0], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea], [2.4.1pre], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From ptisnovs at icedtea.classpath.org Tue Jun 11 03:38:15 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 11 Jun 2013 10:38:15 +0000 Subject: /hg/gfx-test: Added five new tests into BitBltUsingBgColorAlpha. Message-ID: changeset 2f1b8da1d25c in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=2f1b8da1d25c author: Pavel Tisnovsky date: Tue Jun 11 12:40:44 2013 +0200 Added five new tests into BitBltUsingBgColorAlpha. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java | 75 +++++++++++++++++ 2 files changed, 80 insertions(+), 0 deletions(-) diffs (97 lines): diff -r f9f7b283f2df -r 2f1b8da1d25c ChangeLog --- a/ChangeLog Mon Jun 10 09:28:04 2013 +0200 +++ b/ChangeLog Tue Jun 11 12:40:44 2013 +0200 @@ -1,3 +1,8 @@ +2013-06-11 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java: + Added five new tests into BitBltUsingBgColorAlpha. + 2013-06-10 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r f9f7b283f2df -r 2f1b8da1d25c src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java Mon Jun 10 09:28:04 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java Tue Jun 11 12:40:44 2013 +0200 @@ -1333,6 +1333,81 @@ } /** + * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB_PRE. + * Background color is set to Color.black. + * + * @param image + * image to used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeIntARGBPreBackgroundBlackAlpha000(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeIntARGBPre(image, graphics2d, Color.black, 0.0f); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB_PRE. + * Background color is set to Color.black. + * + * @param image + * image to used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeIntARGBPreBackgroundBlackAlpha025(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeIntARGBPre(image, graphics2d, Color.black, 0.25f); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB_PRE. + * Background color is set to Color.black. + * + * @param image + * image to used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeIntARGBPreBackgroundBlackAlpha050(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeIntARGBPre(image, graphics2d, Color.black, 0.5f); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB_PRE. + * Background color is set to Color.black. + * + * @param image + * image to used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeIntARGBPreBackgroundBlackAlpha075(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeIntARGBPre(image, graphics2d, Color.black, 0.75f); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB_PRE. + * Background color is set to Color.black. + * + * @param image + * image to used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeIntARGBPreBackgroundBlackAlpha100(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeIntARGBPre(image, graphics2d, Color.black, 1.00f); + } + + /** * Entry point to the test suite. * * @param args not used in this case From ptisnovs at icedtea.classpath.org Tue Jun 11 03:41:46 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 11 Jun 2013 10:41:46 +0000 Subject: /hg/rhino-tests: Updated some tests in ScriptEngineManagerClassT... Message-ID: changeset ff30b92ad88a in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=ff30b92ad88a author: Pavel Tisnovsky date: Tue Jun 11 12:45:16 2013 +0200 Updated some tests in ScriptEngineManagerClassTest for (Open)JDK8 API: getField, getFields, getDeclaredField and getDeclaredFields. diffstat: ChangeLog | 6 + src/org/RhinoTests/ScriptEngineManagerClassTest.java | 74 ++++++++++++++++++- 2 files changed, 76 insertions(+), 4 deletions(-) diffs (125 lines): diff -r f05207753755 -r ff30b92ad88a ChangeLog --- a/ChangeLog Mon Jun 10 09:33:25 2013 +0200 +++ b/ChangeLog Tue Jun 11 12:45:16 2013 +0200 @@ -1,3 +1,9 @@ +2013-06-11 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptEngineManagerClassTest.java: + Updated some tests in ScriptEngineManagerClassTest for (Open)JDK8 API: + getField, getFields, getDeclaredField and getDeclaredFields. + 2013-06-10 Pavel Tisnovsky * src/org/RhinoTests/ScriptEngineClassTest.java: diff -r f05207753755 -r ff30b92ad88a src/org/RhinoTests/ScriptEngineManagerClassTest.java --- a/src/org/RhinoTests/ScriptEngineManagerClassTest.java Mon Jun 10 09:33:25 2013 +0200 +++ b/src/org/RhinoTests/ScriptEngineManagerClassTest.java Tue Jun 11 12:45:16 2013 +0200 @@ -481,9 +481,22 @@ }; final String[] fieldsThatShouldExist_jdk7 = { }; + final String[] fieldsThatShouldExist_jdk8 = { + }; // get the right array of field signatures - final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7; + String[] fieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + fieldsThatShouldExist = fieldsThatShouldExist_jdk6; + break; + case 7: + fieldsThatShouldExist = fieldsThatShouldExist_jdk7; + break; + case 8: + fieldsThatShouldExist = fieldsThatShouldExist_jdk8; + break; + } // get all fields Field[] fields = this.scriptEngineManagerClass.getFields(); @@ -520,10 +533,29 @@ "private java.util.HashMap javax.script.ScriptEngineManager.mimeTypeAssociations", "private javax.script.Bindings javax.script.ScriptEngineManager.globalScope", }; + final String[] declaredFieldsThatShouldExist_jdk8 = { + "private static final boolean javax.script.ScriptEngineManager.DEBUG", + "private java.util.HashSet javax.script.ScriptEngineManager.engineSpis", + "private java.util.HashMap javax.script.ScriptEngineManager.nameAssociations", + "private java.util.HashMap javax.script.ScriptEngineManager.extensionAssociations", + "private java.util.HashMap javax.script.ScriptEngineManager.mimeTypeAssociations", + "private javax.script.Bindings javax.script.ScriptEngineManager.globalScope", + }; // get the right array of field signatures // following fields should be declared - final String[] declaredFieldsThatShouldExist = getJavaVersion() < 7 ? declaredFieldsThatShouldExist_jdk6 : declaredFieldsThatShouldExist_jdk7; + String[] declaredFieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk6; + break; + case 7: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk7; + break; + case 8: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk8; + break; + } // get all declared fields Field[] declaredFields = this.scriptEngineManagerClass.getDeclaredFields(); @@ -548,8 +580,21 @@ }; final String[] fieldsThatShouldExist_jdk7 = { }; + final String[] fieldsThatShouldExist_jdk8 = { + }; - final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7; + String[] fieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + fieldsThatShouldExist = fieldsThatShouldExist_jdk6; + break; + case 7: + fieldsThatShouldExist = fieldsThatShouldExist_jdk7; + break; + case 8: + fieldsThatShouldExist = fieldsThatShouldExist_jdk8; + break; + } // check if all required fields really exists for (String fieldThatShouldExists : fieldsThatShouldExist) { @@ -587,8 +632,29 @@ "mimeTypeAssociations", "globalScope", }; + final String[] declaredFieldsThatShouldExist_jdk8 = { + "DEBUG", + "engineSpis", + "nameAssociations", + "extensionAssociations", + "mimeTypeAssociations", + "globalScope", + }; - final String[] declaredFieldsThatShouldExist = getJavaVersion() < 7 ? declaredFieldsThatShouldExist_jdk6 : declaredFieldsThatShouldExist_jdk7; + // get the right array of field signatures + // following fields should be declared + String[] declaredFieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk6; + break; + case 7: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk7; + break; + case 8: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk8; + break; + } // check if all required declared fields really exists for (String declaredFieldThatShouldExists : declaredFieldsThatShouldExist) { From jvanek at redhat.com Tue Jun 11 04:35:28 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 11 Jun 2013 13:35:28 +0200 Subject: [rfc][icedtea-web] fix (And tests) for PR1473 In-Reply-To: <51B6329B.9010402@redhat.com> References: <51B5B02E.7020001@redhat.com> <51B5EFA8.1010601@redhat.com> <51B6329B.9010402@redhat.com> Message-ID: <51B70B80.4070809@redhat.com> On 06/10/2013 10:10 PM, Adam Domurad wrote: > On 06/10/2013 11:24 AM, Jiri Vanek wrote: >> >> >> This patch is removing the redownloading of jnlp file - both from local >> file and form network, and >> so fixing the http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1473 >> >> The unhappy redownloading was added during one of inital pushes - >> http://icedtea.classpath.org/hg/icedtea-web/rev/1d604ccd9b6b And I'm >> wondering why:) >> >> >> J. >> >> >> > > > OK this patch left me a bit confused, file.getSourceLocation() is the location of the href, we are > correctly redownloading Is it really correct? It is what is wanted? WYYY!?!?!!? [1] > from here to get the most up-to-date JNLP. However we can skip this check This is 100% wrong for generated jnlp, which have some session id (eg ellumintate). [1] After yesterdays conversation with Omair, I believe that this patch is correct. [1] > based on the update policy, and if we are already downloading from a network location (and we > should, too). Update policy is missuesd in case of forcible re downloaded jnlp [1] > > Your tests seem to fail because the JNLP from the href is attempting to be downloaded -- but this is > correct behaviour. Can you explain ? Yah. My intention was to simulate generated id,and I was to lazy to crate dynamic generation hook in our testing server;) So look into it as that user download GeneratedId.jnlp, where is some value - AnotherId and save it as GeneratedId_1_tmp.jnlp. Then launches this file, but we redownload the GeneratedId.jnlp where is "generated" SomeId, so the parameter id will be suddenly wrong. See the usecases [1] ;) > > Thanks, > -Adam [1] Typical (correct) usecases I can see: * ./javaws http:/some.remote.url/some.jnlp - best usecase, will have most recent jnlp, and we do not need to redownload (btw I'm sure we are redownloading even in this case and it is WRONG) * ./javaws somewhere/stored/some.jnlp - imho most common usecase. As user will probably click on the jnlp in browser, and then "open with javaws" (then browser will save it somewhere and lunch the command above). - then redownlaoding is wrong - user already have the most recent version. And if in this jnlp was generated id, session or whatever, it will be lost. * I do not believe user will later dig for this jnlp file and so lunch the outdated * The only wrong usecases I can see after this patch is our jnlp desktop icon. It /points/directy/to/cached/file.jnlp and so the risk of running outdated one is possible. But it is bug - this desktop file must point to http://original.url/file.jnlp and the offline run must be handled in better way (goal for 1.5 ;) (see [rfc] [icedtea-web] desktop icon is pointing to cache instead to real url and its thread from 1.2.5013 (where you yourself have participated) Thanx for disagreeing:) J. From adomurad at redhat.com Tue Jun 11 06:24:06 2013 From: adomurad at redhat.com (Adam Domurad) Date: Tue, 11 Jun 2013 09:24:06 -0400 Subject: [rfc][icedtea-web] fix (And tests) for PR1473 In-Reply-To: <51B70B80.4070809@redhat.com> References: <51B5B02E.7020001@redhat.com> <51B5EFA8.1010601@redhat.com> <51B6329B.9010402@redhat.com> <51B70B80.4070809@redhat.com> Message-ID: <51B724F6.5000602@redhat.com> On 06/11/2013 07:35 AM, Jiri Vanek wrote: > On 06/10/2013 10:10 PM, Adam Domurad wrote: >> On 06/10/2013 11:24 AM, Jiri Vanek wrote: >>> >>> >>> This patch is removing the redownloading of jnlp file - both from local >>> file and form network, and >>> so fixing the >>> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1473 >>> >>> The unhappy redownloading was added during one of inital pushes - >>> http://icedtea.classpath.org/hg/icedtea-web/rev/1d604ccd9b6b And I'm >>> wondering why:) >>> >>> >>> J. >>> >>> >>> >> >> >> OK this patch left me a bit confused, file.getSourceLocation() is the >> location of the href, we are >> correctly redownloading > > Is it really correct? It is what is wanted? WYYY!?!?!!? [1] > >> from here to get the most up-to-date JNLP. However we can skip this >> check > > This is 100% wrong for generated jnlp, which have some session id (eg > ellumintate). [1] > > After yesterdays conversation with Omair, I believe that this patch is > correct. [1] >> based on the update policy, and if we are already downloading from a >> network location (and we >> should, too). > > Update policy is missuesd in case of forcible re downloaded jnlp [1] >> >> Your tests seem to fail because the JNLP from the href is attempting >> to be downloaded -- but this is >> correct behaviour. Can you explain ? > > Yah. My intention was to simulate generated id,and I was to lazy to > crate dynamic generation hook in our testing server;) > > So look into it as that user download GeneratedId.jnlp, where is some > value - AnotherId and save it as GeneratedId_1_tmp.jnlp. Then launches > this file, but we redownload the GeneratedId.jnlp where is "generated" > SomeId, so the parameter id will be suddenly wrong. See the usecases > [1] ;) >> >> Thanks, >> -Adam > > > [1] > > > Typical (correct) usecases I can see: > > * ./javaws http:/some.remote.url/some.jnlp > - best usecase, will have most recent jnlp, and we do not need to > redownload (btw I'm sure we are redownloading even in this case and > it is WRONG) > > > * ./javaws somewhere/stored/some.jnlp > - imho most common usecase. As user will probably click on the jnlp in > browser, and then "open with javaws" (then browser will save it > somewhere and lunch the command above). > - then redownlaoding is wrong - user already have the most recent > version. And if in this jnlp was generated id, session or whatever, it > will be lost. > > * I do not believe user will later dig for this jnlp file and so > lunch the outdated > > > * The only wrong usecases I can see after this patch is our jnlp > desktop icon. > It /points/directy/to/cached/file.jnlp and so the risk of running > outdated one is possible. > > But it is bug - this desktop file must point to > http://original.url/file.jnlp and the offline run must be handled in > better way (goal for 1.5 ;) (see [rfc] [icedtea-web] desktop icon is > pointing to cache instead to real url and its thread from 1.2.5013 > (where you yourself have participated) > > > Thanx for disagreeing:) > J. > > OK we discussed this more on IRC and I think we're agreed: - Don't redownload if no href (already the case) - Don't redownload if not local file (needs to be added) The case where you save the JNLP and immediately launch it unfortunately does redownload, we can however do some timestamp check if you really do not like this. Other than that ideally the caching system would be allow for a simple HEAD request to determine if the JNLP needs to be updated, instead of a full redownload. Cheers, -Adam From aazores at redhat.com Tue Jun 11 06:24:47 2013 From: aazores at redhat.com (Andrew Azores) Date: Tue, 11 Jun 2013 09:24:47 -0400 Subject: [rfc][icedtea-web] Extract URL processing in TinyHttpdImpl In-Reply-To: <51B62B7D.7030300@redhat.com> References: <51B5F80D.1040706@redhat.com> <51B62B7D.7030300@redhat.com> Message-ID: <51B7251F.8060404@redhat.com> On 06/10/2013 03:39 PM, Adam Domurad wrote: > Thanks for the refactoring! > > On 06/10/2013 12:00 PM, Andrew Azores wrote: >> Changelog: >> * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: >> extracted some lines out of run() into new method urlToFilePath() > > You should use list symbols you changed in the ChangeLog if its only a > few. Eg: > * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java > (run): Calls urlToFilePath > (urlToFilePath): New, extract path resolution from (run) > Good to know :) > Indentation should be fixed here, easy way is to just autoformat in > eclipse (make sure your formatting profile uses spaces only). > >> + >> + for (String url : filePathTestUrls) { >> + String newUrl = TinyHttpdImpl.urlToFilePath(url); >> + Assert.assertEquals(newUrl, URLDecoder.decode(newUrl, >> "UTF-8")); >> + } >> + } >> >> @Test >> public void stripHttpPathParamTest() { My Eclipse formatting should be set up correctly now, hopefully these patches have come out properly this time. > > > Otherwise looks good, though. > > Thanks again! > -Adam Thanks, Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: fix.patch Type: text/x-patch Size: 2552 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130611/cbaed8ee/fix.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: unit_test.patch Type: text/x-patch Size: 2161 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130611/cbaed8ee/unit_test.patch From adomurad at redhat.com Tue Jun 11 06:33:58 2013 From: adomurad at redhat.com (Adam Domurad) Date: Tue, 11 Jun 2013 09:33:58 -0400 Subject: [rfc][icedtea-web] Extract URL processing in TinyHttpdImpl In-Reply-To: <51B7251F.8060404@redhat.com> References: <51B5F80D.1040706@redhat.com> <51B62B7D.7030300@redhat.com> <51B7251F.8060404@redhat.com> Message-ID: <51B72746.5050103@redhat.com> On 06/11/2013 09:24 AM, Andrew Azores wrote: > On 06/10/2013 03:39 PM, Adam Domurad wrote: >> Thanks for the refactoring! >> >> On 06/10/2013 12:00 PM, Andrew Azores wrote: >>> Changelog: >>> * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: >>> extracted some lines out of run() into new method urlToFilePath() >> >> You should use list symbols you changed in the ChangeLog if its only >> a few. Eg: >> * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java >> (run): Calls urlToFilePath >> (urlToFilePath): New, extract path resolution from (run) >> > Good to know :) >> Indentation should be fixed here, easy way is to just autoformat in >> eclipse (make sure your formatting profile uses spaces only). >> >>> + >>> + for (String url : filePathTestUrls) { >>> + String newUrl = TinyHttpdImpl.urlToFilePath(url); >>> + Assert.assertEquals(newUrl, URLDecoder.decode(newUrl, >>> "UTF-8")); >>> + } >>> + } >>> >>> @Test >>> public void stripHttpPathParamTest() { > My Eclipse formatting should be set up correctly now, hopefully these > patches have come out properly this time. >> >> >> Otherwise looks good, though. >> >> Thanks again! >> -Adam > > Thanks, > > Andrew A Thanks Andrew! Looks good to me, I will commit this on your behalf. -Adam From martinrb at google.com Wed Jun 12 16:08:47 2013 From: martinrb at google.com (Martin Buchholz) Date: Wed, 12 Jun 2013 16:08:47 -0700 Subject: Support Status of IcedTea 2.x Releases In-Reply-To: <627510639.694027.1370861122215.JavaMail.root@redhat.com> References: <1160740609.692850.1370860780833.JavaMail.root@redhat.com> <627510639.694027.1370861122215.JavaMail.root@redhat.com> Message-ID: Thanks for your great work on this. I'm trying to understand the release/build model for icedtea, and it's a little confusing. --- I can't find good documentation on the various kinds of icedtea changes. Upstreamed changes are easy to understand, but there's changes to icedtea7-forest-2.4, patches in icedtea7-2.4/patches, and patches in icedtea7-2.4/boot/patches Is it true that boot/patches are only used when --disable-bootstrap=no? Why would patches end up in icedtea7-forest-2.4 rather than in icedtea7-2.4/patches? The icedtea7 forests aren't well advertised. Are they supposed to be an implementation detail? Is building them independently as just another openjdk a reasonable/supported thing to do? --- icedtea7-2.4/INSTALL refers to (http://hg.openjdk.java.net/icedtea/jdk7/). but that looks obsolete. --- is the use of the word "creat" a typo or a Unix in-joke? > Most targets in IcedTea creat stamp files in the stamps directory to --- Thanks. On Mon, Jun 10, 2013 at 3:45 AM, Andrew Hughes wrote: > This is an update on the status of the various IcedTea 2.x releases, > following > the release of 2.4.0 (http://bitly.com/11Bzajd). > > * The 2.1.x series will remain supported until the ARM32 JIT is available > in a > later release. This should be true of at least the 2.3.x series by the > end of > the year. > * The 2.2.x series will be updated as part of the next security update (due > in just over a week on the 18th/19th of June, 2013, depending on what > timezone > you're in). After that, it will no longer be supported. > * The 2.3.x and 2.4.x series will be supported until the release of 2.5.0 > and 2.6.0 respectively. > > This information has now been included on our release policy page: > > http://icedtea.classpath.org/wiki/ReleasePolicy > > Thanks, > -- > Andrew :) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > PGP Key: 248BDC07 (https://keys.indymedia.org/) > Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 > > -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130612/f38479c4/attachment.html From peterneubauer2 at gmail.com Wed Jun 12 17:47:13 2013 From: peterneubauer2 at gmail.com (Peter Neubauer) Date: Thu, 13 Jun 2013 02:47:13 +0200 Subject: Icedtea 2.4.0, build CACAO/OpenJDK -> 'ERROR: You seem to not have installed ALSA 0.9.1 or higher.' Message-ID: <51B91691.2040401@gmail.com> Hi, I'm trying to build the CACAO JVM + OpenJDK with IcedTea 2.4.0 on Arch Linux. However, at one point during the OpenJDK part of the build I get an error that ALSA is missing. In fact, ALSA 1.0.26-1 is installed and working fine. The package is alsa-lib and includes headers. Here's the steps to reproduce: $ tar -xzvf ~/downloads/icedtea-2.4.0.tar.gz $ cd icedtea-2.4.0 $ ./configure --disable-bootstrap --enable-cacao --with-jdk-home=/usr/lib/jvm/java-7-openjdk --with-parallel-jobs $ make Configure output: http://pastebin.com/qYawRw7k Make output: http://pastebin.com/wj7kq45N ( At this point there is an error message saying that the macro 'AM_CONFIG_HEADER' in CACAO's configure.ac is obsolete. autoconf version: 2.69-1 automake version: 1.13.1-1 I replaced it with 'AC_CONFIG_HEADERS' according to the error message and try again: $ make ) Make output #2, part 1: http://pastebin.com/eS2LVdCy Make output #2, part 2: http://pastebin.com/F1gETRkH (contains error message at the end). For the record, I don't mind loss of features (like sound), as long as the build gets done. What should I do? Thanks, -Peter From stefan at complang.tuwien.ac.at Thu Jun 13 03:59:02 2013 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Thu, 13 Jun 2013 12:59:02 +0200 Subject: Icedtea 2.4.0, build CACAO/OpenJDK -> 'ERROR: You seem to not have installed ALSA 0.9.1 or higher.' In-Reply-To: <51B91691.2040401@gmail.com> References: <51B91691.2040401@gmail.com> Message-ID: > I replaced it with 'AC_CONFIG_HEADERS' according to the error message > and try again: > $ make Good that you could work around this yourself. > For the record, I don't mind loss of features (like sound), as long as the > build gets done. What should I do? I don't know what your intention is. If you just want a build, use an older system and copy it over. But could you run ./icedtea6/openjdk.build/tmp/alsaversioncheck and check its output? From stefan at complang.tuwien.ac.at Thu Jun 13 04:03:52 2013 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Thu, 13 Jun 2013 13:03:52 +0200 Subject: Icedtea 2.4.0, build CACAO/OpenJDK -> 'ERROR: You seem to not have installed ALSA 0.9.1 or higher.' In-Reply-To: References: <51B91691.2040401@gmail.com> Message-ID: > But could you run ./icedtea6/openjdk.build/tmp/alsaversioncheck and > check its output? Sorry, I looked into icedtea6 instead of icedtea7. This seems to work differently in 7. From stefan at complang.tuwien.ac.at Thu Jun 13 04:11:17 2013 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Thu, 13 Jun 2013 13:11:17 +0200 Subject: Icedtea 2.4.0, build CACAO/OpenJDK -> 'ERROR: You seem to not have installed ALSA 0.9.1 or higher.' In-Reply-To: References: <51B91691.2040401@gmail.com> Message-ID: For tracking this down, you can look at these pieces of the magic: GetVersion: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk/file/29ce11184945/make/common/shared/Defs.gmk#l135 ALSA_VERSION: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk/file/29ce11184945/make/common/shared/Sanity.gmk#l117 What does the line with SND_LIB_VERSION_STR say in /usr/include/alsa/version.h? From gnu.andrew at redhat.com Thu Jun 13 04:37:34 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Thu, 13 Jun 2013 07:37:34 -0400 (EDT) Subject: Support Status of IcedTea 2.x Releases In-Reply-To: References: <1160740609.692850.1370860780833.JavaMail.root@redhat.com> <627510639.694027.1370861122215.JavaMail.root@redhat.com> Message-ID: <239638017.2366251.1371123454258.JavaMail.root@redhat.com> ----- Original Message ----- > Thanks for your great work on this. > I'm trying to understand the release/build model for icedtea, and it's a > little confusing. > --- > I can't find good documentation on the various kinds of icedtea changes. > Upstreamed changes are easy to understand, but there's changes to > icedtea7-forest-2.4, patches in icedtea7-2.4/patches, and patches in > icedtea7-2.4/boot/patches For 7, most IcedTea fixes go into the forest. The only ones held in patches are those that are applied conditionally. > Is it true that boot/patches are only used when --disable-bootstrap=no? Yes (the default). Most of the fixes make the build work when it's not being built with Sun classes present or workaround known issues in some bootstrap JDKs. > Why would patches end up in icedtea7-forest-2.4 rather than in > icedtea7-2.4/patches? See above. Ideally, they don't and we try to avoid it where possible. Of those in 2.4: nss-config.patch: Enables the PKCS11 NSS configuration when enabled. pulse-soundproperties.patch: Sets up the PulseAudio provider when enabled. rhino.patch: Sets up the Rhino JavaScript support when enabled. test_gamma.patch: Disables the gamma test on PaX builds. There's also systemtap_gc.patch still in there, which can be moved into the forest (SystemTap support was optional before the main patch finally went upstream). > The icedtea7 forests aren't well advertised. Are they supposed to be an > implementation detail? Yes. With 6, we used build drops from Oracle and heavy patching instead. Having our own forest as a base is easier to maintain and makes it more obvious what is actually built. > Is building them independently as just another openjdk a > reasonable/supported thing to do? Yes, but someone doing so would be expected to know about building OpenJDK already. IcedTea is primarily there to not have to deal with the mass of make options and system knowledge needed to setup an OpenJDK build. We do build the forest standalone when integrating new changes and I believe Fedora uses it directly, a situation I feel creates more work for them and means they miss out on build fixes in IcedTea which they'd have to replicate themselves. > --- > icedtea7-2.4/INSTALL refers to > (http://hg.openjdk.java.net/icedtea/jdk7/). > but that looks obsolete. Ah, thanks :) I'll fix that. We were using that initially but we've moved back to our own servers as it's easier to resolve issues. > --- > is the use of the word "creat" a typo or a Unix in-joke? > > Most targets in IcedTea creat stamp files in the stamps directory to > --- Typo -- but a funny one :) > Thanks. > > > > On Mon, Jun 10, 2013 at 3:45 AM, Andrew Hughes wrote: > > > This is an update on the status of the various IcedTea 2.x releases, > > following > > the release of 2.4.0 (http://bitly.com/11Bzajd). > > > > * The 2.1.x series will remain supported until the ARM32 JIT is available > > in a > > later release. This should be true of at least the 2.3.x series by the > > end of > > the year. > > * The 2.2.x series will be updated as part of the next security update (due > > in just over a week on the 18th/19th of June, 2013, depending on what > > timezone > > you're in). After that, it will no longer be supported. > > * The 2.3.x and 2.4.x series will be supported until the release of 2.5.0 > > and 2.6.0 respectively. > > > > This information has now been included on our release policy page: > > > > http://icedtea.classpath.org/wiki/ReleasePolicy > > > > Thanks, > > -- > > Andrew :) > > > > Free Java Software Engineer > > Red Hat, Inc. (http://www.redhat.com) > > > > PGP Key: 248BDC07 (https://keys.indymedia.org/) > > Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 > > > > > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From ptisnovs at icedtea.classpath.org Thu Jun 13 05:02:44 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 13 Jun 2013 12:02:44 +0000 Subject: /hg/gfx-test: Ten new tests added into BitBltBasicTests test suite. Message-ID: changeset f0274d19f89f in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=f0274d19f89f author: Pavel Tisnovsky date: Thu Jun 13 14:06:13 2013 +0200 Ten new tests added into BitBltBasicTests test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltBasicTests.java | 152 +++++++++++++++++++++++ 2 files changed, 157 insertions(+), 0 deletions(-) diffs (174 lines): diff -r 2f1b8da1d25c -r f0274d19f89f ChangeLog --- a/ChangeLog Tue Jun 11 12:40:44 2013 +0200 +++ b/ChangeLog Thu Jun 13 14:06:13 2013 +0200 @@ -1,3 +1,8 @@ +2013-06-13 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + Ten new tests added into BitBltBasicTests test suite. + 2013-06-11 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java: diff -r 2f1b8da1d25c -r f0274d19f89f src/org/gfxtest/testsuites/BitBltBasicTests.java --- a/src/org/gfxtest/testsuites/BitBltBasicTests.java Tue Jun 11 12:40:44 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Thu Jun 13 14:06:13 2013 +0200 @@ -4550,6 +4550,158 @@ } /** + * Test basic BitBlt operation for vertical cyan gradient buffered image with type TYPE_USHORT_555_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalCyanGradientBufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB); + } + + /** + * Test basic BitBlt operation for vertical cyan gradient buffered image with type TYPE_USHORT_565_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalCyanGradientBufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB); + } + + /** + * Test basic BitBlt operation for vertical cyan gradient buffered image with type TYPE_USHORT_GRAY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltVerticalCyanGradientBufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalCyanGradientImage(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY); + } + + /** + * Test basic BitBlt operation for horizontal magenta gradient buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalMagentaGradientBufferedImageType3ByteBGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR); + } + + /** + * Test basic BitBlt operation for horizontal magenta gradient buffered image with type TYPE_4BYTE_ABGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalMagentaGradientBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR); + } + + /** + * Test basic BitBlt operation for horizontal magenta gradient buffered image with type TYPE_4BYTE_ABGR_PRE. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalMagentaGradientBufferedImageType4ByteABGR_PRE(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE); + } + + /** + * Test basic BitBlt operation for horizontal magenta gradient buffered image + * with type TYPE_BYTE_BINARY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalMagentaGradientBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); + } + + /** + * Test basic BitBlt operation for horizontal magenta gradient buffered image + * with type TYPE_BYTE_INDEXED. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalMagentaGradientBufferedImageTypeByteIndexed(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED); + } + + /** + * Test basic BitBlt operation for horizontal magenta gradient buffered image with type TYPE_BYTE_GRAY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalMagentaGradientBufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY); + } + + /** + * Test basic BitBlt operation for horizontal magenta gradient buffered image with type TYPE_INT_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltHorizontalMagentaGradientBufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithHorizontalMagentaGradientImage(image, graphics2d, BufferedImage.TYPE_INT_BGR); + } + + /** * Entry point to the test suite. * * @param args not used in this case From ptisnovs at icedtea.classpath.org Thu Jun 13 05:17:34 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 13 Jun 2013 12:17:34 +0000 Subject: /hg/rhino-tests: Updated four tests in ScriptEngineManagerClassT... Message-ID: changeset 7bd1fe8fb827 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=7bd1fe8fb827 author: Pavel Tisnovsky date: Thu Jun 13 14:21:04 2013 +0200 Updated four tests in ScriptEngineManagerClassTest for (Open)JDK8 API: getMethod, getMethods, getDeclaredMethod and getDeclaredMethods. diffstat: ChangeLog | 6 + src/org/RhinoTests/ScriptEngineManagerClassTest.java | 140 ++++++++++++++++++- 2 files changed, 142 insertions(+), 4 deletions(-) diffs (198 lines): diff -r ff30b92ad88a -r 7bd1fe8fb827 ChangeLog --- a/ChangeLog Tue Jun 11 12:45:16 2013 +0200 +++ b/ChangeLog Thu Jun 13 14:21:04 2013 +0200 @@ -1,3 +1,9 @@ +2013-06-13 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptEngineManagerClassTest.java: + Updated four tests in ScriptEngineManagerClassTest for (Open)JDK8 API: + getMethod, getMethods, getDeclaredMethod and getDeclaredMethods. + 2013-06-11 Pavel Tisnovsky * src/org/RhinoTests/ScriptEngineManagerClassTest.java: diff -r ff30b92ad88a -r 7bd1fe8fb827 src/org/RhinoTests/ScriptEngineManagerClassTest.java --- a/src/org/RhinoTests/ScriptEngineManagerClassTest.java Tue Jun 11 12:45:16 2013 +0200 +++ b/src/org/RhinoTests/ScriptEngineManagerClassTest.java Thu Jun 13 14:21:04 2013 +0200 @@ -722,6 +722,29 @@ "public void javax.script.ScriptEngineManager.setBindings(javax.script.Bindings)", }; + final String[] methodsThatShouldExist_jdk8 = { + "public boolean java.lang.Object.equals(java.lang.Object)", + "public final native java.lang.Class java.lang.Object.getClass()", + "public final native void java.lang.Object.notify()", + "public final native void java.lang.Object.notifyAll()", + "public final native void java.lang.Object.wait(long) throws java.lang.InterruptedException", + "public final void java.lang.Object.wait() throws java.lang.InterruptedException", + "public final void java.lang.Object.wait(long,int) throws java.lang.InterruptedException", + "public java.lang.Object javax.script.ScriptEngineManager.get(java.lang.String)", + "public java.lang.String java.lang.Object.toString()", + "public java.util.List javax.script.ScriptEngineManager.getEngineFactories()", + "public javax.script.Bindings javax.script.ScriptEngineManager.getBindings()", + "public javax.script.ScriptEngine javax.script.ScriptEngineManager.getEngineByExtension(java.lang.String)", + "public javax.script.ScriptEngine javax.script.ScriptEngineManager.getEngineByMimeType(java.lang.String)", + "public javax.script.ScriptEngine javax.script.ScriptEngineManager.getEngineByName(java.lang.String)", + "public native int java.lang.Object.hashCode()", + "public void javax.script.ScriptEngineManager.put(java.lang.String,java.lang.Object)", + "public void javax.script.ScriptEngineManager.registerEngineExtension(java.lang.String,javax.script.ScriptEngineFactory)", + "public void javax.script.ScriptEngineManager.registerEngineMimeType(java.lang.String,javax.script.ScriptEngineFactory)", + "public void javax.script.ScriptEngineManager.registerEngineName(java.lang.String,javax.script.ScriptEngineFactory)", + "public void javax.script.ScriptEngineManager.setBindings(javax.script.Bindings)", + }; + // get all inherited methods Method[] methods = this.scriptEngineManagerClass.getMethods(); // and transform the array into a list of method names @@ -729,7 +752,20 @@ for (Method method : methods) { methodsAsString.add(method.toString()); } - String[] methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + + String[] methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } + // check if all required methods really exists for (String methodThatShouldExists : methodsThatShouldExist) { assertTrue(methodsAsString.contains(methodThatShouldExists), @@ -782,6 +818,26 @@ "static void javax.script.ScriptEngineManager.access$000(javax.script.ScriptEngineManager,java.lang.ClassLoader)", }; + final String[] declaredMethodsThatShouldExist_jdk8 = { + "private boolean javax.script.ScriptEngineManager.canCallerAccessLoader(java.lang.ClassLoader)", + "private boolean javax.script.ScriptEngineManager.isAncestor(java.lang.ClassLoader,java.lang.ClassLoader)", + "private java.lang.ClassLoader javax.script.ScriptEngineManager.getCallerClassLoader()", + "private void javax.script.ScriptEngineManager.init(java.lang.ClassLoader)", + "private void javax.script.ScriptEngineManager.initEngines(java.lang.ClassLoader)", + "public java.lang.Object javax.script.ScriptEngineManager.get(java.lang.String)", + "public java.util.List javax.script.ScriptEngineManager.getEngineFactories()", + "public javax.script.Bindings javax.script.ScriptEngineManager.getBindings()", + "public javax.script.ScriptEngine javax.script.ScriptEngineManager.getEngineByExtension(java.lang.String)", + "public javax.script.ScriptEngine javax.script.ScriptEngineManager.getEngineByMimeType(java.lang.String)", + "public javax.script.ScriptEngine javax.script.ScriptEngineManager.getEngineByName(java.lang.String)", + "public void javax.script.ScriptEngineManager.put(java.lang.String,java.lang.Object)", + "public void javax.script.ScriptEngineManager.registerEngineExtension(java.lang.String,javax.script.ScriptEngineFactory)", + "public void javax.script.ScriptEngineManager.registerEngineMimeType(java.lang.String,javax.script.ScriptEngineFactory)", + "public void javax.script.ScriptEngineManager.registerEngineName(java.lang.String,javax.script.ScriptEngineFactory)", + "public void javax.script.ScriptEngineManager.setBindings(javax.script.Bindings)", + "static void javax.script.ScriptEngineManager.access$000(javax.script.ScriptEngineManager,java.lang.ClassLoader)", + }; + // get all declared methods Method[] declaredMethods = this.scriptEngineManagerClass.getDeclaredMethods(); // and transform the array into a list of method names @@ -789,7 +845,20 @@ for (Method method : declaredMethods) { methodsAsString.add(method.toString()); } - String[] declaredMethodsThatShouldExist = getJavaVersion() < 7 ? declaredMethodsThatShouldExist_jdk6 : declaredMethodsThatShouldExist_jdk7; + + String[] declaredMethodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk6; + break; + case 7: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk7; + break; + case 8: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk8; + break; + } + // check if all required methods really exists for (String methodThatShouldExists : declaredMethodsThatShouldExist) { assertTrue(methodsAsString.contains(methodThatShouldExists), @@ -846,7 +915,40 @@ methodsThatShouldExist_jdk7.put("notify", new Class[] {}); methodsThatShouldExist_jdk7.put("notifyAll", new Class[] {}); - Map methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + Map methodsThatShouldExist_jdk8 = new TreeMap(); + methodsThatShouldExist_jdk8.put("setBindings", new Class[] {javax.script.Bindings.class}); + methodsThatShouldExist_jdk8.put("getBindings", new Class[] {}); + methodsThatShouldExist_jdk8.put("getEngineByName", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("getEngineByExtension", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("getEngineByMimeType", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("getEngineFactories", new Class[] {}); + methodsThatShouldExist_jdk8.put("registerEngineName", new Class[] {java.lang.String.class, javax.script.ScriptEngineFactory.class}); + methodsThatShouldExist_jdk8.put("registerEngineMimeType", new Class[] {java.lang.String.class, javax.script.ScriptEngineFactory.class}); + methodsThatShouldExist_jdk8.put("registerEngineExtension", new Class[] {java.lang.String.class, javax.script.ScriptEngineFactory.class}); + methodsThatShouldExist_jdk8.put("get", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("put", new Class[] {java.lang.String.class, java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("wait", new Class[] {long.class, int.class}); + methodsThatShouldExist_jdk8.put("wait", new Class[] {long.class}); + methodsThatShouldExist_jdk8.put("wait", new Class[] {}); + methodsThatShouldExist_jdk8.put("equals", new Class[] {java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("toString", new Class[] {}); + methodsThatShouldExist_jdk8.put("hashCode", new Class[] {}); + methodsThatShouldExist_jdk8.put("getClass", new Class[] {}); + methodsThatShouldExist_jdk8.put("notify", new Class[] {}); + methodsThatShouldExist_jdk8.put("notifyAll", new Class[] {}); + + Map methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } // check if all required methods really exist for (Map.Entry methodThatShouldExists : methodsThatShouldExist.entrySet()) { @@ -910,7 +1012,37 @@ methodsThatShouldExist_jdk7.put("registerEngineMimeType", new Class[] {java.lang.String.class, javax.script.ScriptEngineFactory.class}); methodsThatShouldExist_jdk7.put("registerEngineName", new Class[] {java.lang.String.class, javax.script.ScriptEngineFactory.class}); - Map methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + Map methodsThatShouldExist_jdk8 = new TreeMap(); + methodsThatShouldExist_jdk8.put("setBindings", new Class[] {javax.script.Bindings.class}); + methodsThatShouldExist_jdk8.put("getBindings", new Class[] {}); + methodsThatShouldExist_jdk8.put("initEngines", new Class[] {java.lang.ClassLoader.class}); + methodsThatShouldExist_jdk8.put("getEngineByName", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("getEngineByExtension", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("getEngineByMimeType", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("getEngineFactories", new Class[] {}); + methodsThatShouldExist_jdk8.put("registerEngineName", new Class[] {java.lang.String.class, javax.script.ScriptEngineFactory.class}); + methodsThatShouldExist_jdk8.put("registerEngineMimeType", new Class[] {java.lang.String.class, javax.script.ScriptEngineFactory.class}); + methodsThatShouldExist_jdk8.put("registerEngineExtension", new Class[] {java.lang.String.class, javax.script.ScriptEngineFactory.class}); + methodsThatShouldExist_jdk8.put("canCallerAccessLoader", new Class[] {java.lang.ClassLoader.class}); + methodsThatShouldExist_jdk8.put("get", new Class[] {java.lang.String.class}); + methodsThatShouldExist_jdk8.put("put", new Class[] {java.lang.String.class, java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("getCallerClassLoader", new Class[] {}); + methodsThatShouldExist_jdk8.put("isAncestor", new Class[] {java.lang.ClassLoader.class, java.lang.ClassLoader.class}); + methodsThatShouldExist_jdk8.put("access$000", new Class[] {javax.script.ScriptEngineManager.class, java.lang.ClassLoader.class}); + methodsThatShouldExist_jdk8.put("init", new Class[] {java.lang.ClassLoader.class}); + + Map methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } // check if all required methods really exist for (Map.Entry methodThatShouldExists : methodsThatShouldExist.entrySet()) { From alex.kasko.lists at gmail.com Thu Jun 13 08:18:40 2013 From: alex.kasko.lists at gmail.com (Alex Kasko) Date: Thu, 13 Jun 2013 19:18:40 +0400 Subject: IcedTea 1.12.5 windows build errors Message-ID: <51B9E2D0.6040805@gmail.com> Hi, I'm trying to build IcedTea 1.12.5 for windows-i586. Ultimate goal is to get jdk6 GPL binaries for windows and linux with latest bugfixes. I have a virtual machine with proper environment for building openjdk6 [1] (it builds openjdk6-build27 successfully). I thought, that most IcedTea changes are linux-related, and windows-specific part should be close to openjdk6 build 27. So I ran "./configure" (in Linux) without specific options, abort the build after patching step and copy "icedtea6-1.12.5/openjdk" contents to windows machine. During the build on windows corba, jaxp, jaxws and hotspot modules works fine but jdk module aborted the build with AWT-related error [2] . Comparing AWT sources between IcedTea 1.12.5 and current openjdk6 mercurial tip I found a lot of windows-specific changes (Direct3D etc) in IcedTea. Questions about all that: 1) Is there something like "$ ./configure ; make download-openjdk" for IcedTea 1.12.5 to get patched openjdk sources? 2) Is there a switch (in 1.12.5) for using bundled zlib instead of system one (I changed makefiles to use bundled one)? 3) Am I understand right, that windows changes are the parts of jdk7 backports and may not work properly with older compiler (jdk6 is built with MSVS2003)? Or what are they for, giving that windows is not supported platform for icedtea? 4) Is it a good idea (for windows builds) to try to revert some windows specific AWT-related patches in IcedTea-1.12.5 to make it closer to openjdk6-build27? Or changes are too big for that? [1] http://hg.openjdk.java.net/jdk6/jdk6/raw-file/tip/README-builds.html#MBE [2] https://gist.github.com/alexkasko/5773264 -- Regards, Alex Kasko From bugzilla-daemon at icedtea.classpath.org Thu Jun 13 14:33:16 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 13 Jun 2013 21:33:16 +0000 Subject: [Bug 1478] New: Why my minecraft server crashes? Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1478 Bug ID: 1478 Summary: Why my minecraft server crashes? Classification: Unclassified Product: IcedTea Version: unspecified Hardware: x86 OS: Windows Status: NEW Severity: normal Priority: P3 Component: GCJWebPlugin Assignee: dbhole at redhat.com Reporter: matteo.sorre.M.S at gmail.com CC: unassigned at icedtea.classpath.org Created attachment 887 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=887&action=edit The file of crash My minecraft server has crashed for this problem. I need help please -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130613/e8659a57/attachment.html From alex.kasko.lists at gmail.com Thu Jun 13 16:16:12 2013 From: alex.kasko.lists at gmail.com (Alex Kasko) Date: Fri, 14 Jun 2013 03:16:12 +0400 Subject: IcedTea 1.12.5 windows build errors In-Reply-To: <51B9E2D0.6040805@gmail.com> References: <51B9E2D0.6040805@gmail.com> Message-ID: <51BA52BC.6030609@gmail.com> On 06/13/2013 07:18 PM, Alex Kasko wrote: > Hi, > > I'm trying to build IcedTea 1.12.5 for windows-i586. Ultimate goal is to > get jdk6 GPL binaries for windows and linux with latest bugfixes. I have > a virtual machine with proper environment for building openjdk6 [1] (it > builds openjdk6-build27 successfully). > > I thought, that most IcedTea changes are linux-related, and > windows-specific part should be close to openjdk6 build 27. So I ran > "./configure" (in Linux) without specific options, abort the build after > patching step and copy "icedtea6-1.12.5/openjdk" contents to windows > machine. > > During the build on windows corba, jaxp, jaxws and hotspot modules works > fine but jdk module aborted the build with AWT-related error [2] . Fixed this particular "Wheel95GetMsg" AWT error, have other AWT problems now, will report them later. > Comparing AWT sources between IcedTea 1.12.5 and current openjdk6 > mercurial tip I found a lot of windows-specific changes (Direct3D etc) > in IcedTea. > > Questions about all that: > 1) Is there something like "$ ./configure ; make download-openjdk" for > IcedTea 1.12.5 to get patched openjdk sources? > 2) Is there a switch (in 1.12.5) for using bundled zlib instead of > system one (I changed makefiles to use bundled one)? > 3) Am I understand right, that windows changes are the parts of jdk7 > backports and may not work properly with older compiler (jdk6 is built > with MSVS2003)? Or what are they for, giving that windows is not > supported platform for icedtea? > 4) Is it a good idea (for windows builds) to try to revert some windows > specific AWT-related patches in IcedTea-1.12.5 to make it closer to > openjdk6-build27? Or changes are too big for that? > > > [1] > http://hg.openjdk.java.net/jdk6/jdk6/raw-file/tip/README-builds.html#MBE > [2] https://gist.github.com/alexkasko/5773264 > -- Regards, Alex Kasko From ptisnovs at icedtea.classpath.org Fri Jun 14 01:01:20 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 14 Jun 2013 08:01:20 +0000 Subject: /hg/gfx-test: Added ten new tests into BitBltCropImage. Message-ID: changeset 9da4ad7fe2ec in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=9da4ad7fe2ec author: Pavel Tisnovsky date: Fri Jun 14 10:04:50 2013 +0200 Added ten new tests into BitBltCropImage. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltCropImage.java | 134 ++++++++++++++++++++++++ 2 files changed, 139 insertions(+), 0 deletions(-) diffs (156 lines): diff -r f0274d19f89f -r 9da4ad7fe2ec ChangeLog --- a/ChangeLog Thu Jun 13 14:06:13 2013 +0200 +++ b/ChangeLog Fri Jun 14 10:04:50 2013 +0200 @@ -1,3 +1,8 @@ +2013-06-14 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltCropImage.java: + Added ten new tests into BitBltCropImage. + 2013-06-13 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBasicTests.java: diff -r f0274d19f89f -r 9da4ad7fe2ec src/org/gfxtest/testsuites/BitBltCropImage.java --- a/src/org/gfxtest/testsuites/BitBltCropImage.java Thu Jun 13 14:06:13 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltCropImage.java Fri Jun 14 10:04:50 2013 +0200 @@ -182,6 +182,140 @@ /** * Test basic BitBlt operation for checker buffered image with type + * TYPE_4BYTE_ABGR. Image is cropped so only north-west quarter of it is rendered. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGRCropNW(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform BitBlt test using crop operation. + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR, + BitmapCropRegions.CROP_REGION_NW); + } + + /** + * Test basic BitBlt operation for checker buffered image with type + * TYPE_4BYTE_ABGR. Image is cropped so only north-east quarter of it is rendered. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGRCropNE(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform BitBlt test using crop operation. + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR, + BitmapCropRegions.CROP_REGION_NE); + } + + /** + * Test basic BitBlt operation for checker buffered image with type + * TYPE_4BYTE_ABGR. Image is cropped so only south-west quarter of it is rendered. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGRCropSW(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform BitBlt test using crop operation. + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR, + BitmapCropRegions.CROP_REGION_SW); + } + + /** + * Test basic BitBlt operation for checker buffered image with type + * TYPE_4BYTE_ABGR. Image is cropped so only south-east quarter of it is rendered. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGRCropSE(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform BitBlt test using crop operation. + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR, + BitmapCropRegions.CROP_REGION_SE); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR_PRE. + * No crop is performed to that image. + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGR_preNoCrop(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform BitBlt test using crop operation. + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE); + } + + /** + * Test basic BitBlt operation for checker buffered image with type + * TYPE_4BYTE_ABGR_PRE. Image is cropped so only north-west quarter of it is rendered. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGR_preCropNW(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform BitBlt test using crop operation. + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE, + BitmapCropRegions.CROP_REGION_NW); + } + + /** + * Test basic BitBlt operation for checker buffered image with type + * TYPE_4BYTE_ABGR_PRE. Image is cropped so only north-east quarter of it is rendered. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGR_preCropNE(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform BitBlt test using crop operation. + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE, + BitmapCropRegions.CROP_REGION_NE); + } + + /** + * Test basic BitBlt operation for checker buffered image with type + * TYPE_4BYTE_ABGR_PRE. Image is cropped so only south-west quarter of it is rendered. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType4ByteABGR_preCropSW(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform BitBlt test using crop operation. + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE, + BitmapCropRegions.CROP_REGION_SW); + } + + /** + * Test basic BitBlt operation for checker buffered image with type * TYPE_BYTE_BINARY. No crop is performed to that image. * * @param image From ptisnovs at icedtea.classpath.org Fri Jun 14 01:10:20 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 14 Jun 2013 08:10:20 +0000 Subject: /hg/rhino-tests: Updated SimpleScriptContextClassTest to work co... Message-ID: changeset 6fb422bd339f in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=6fb422bd339f author: Pavel Tisnovsky date: Fri Jun 14 10:13:51 2013 +0200 Updated SimpleScriptContextClassTest to work correctly in JDK6-JDK8. diffstat: ChangeLog | 5 ++ src/org/RhinoTests/SimpleScriptContextClassTest.java | 36 ++++++++++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diffs (79 lines): diff -r 7bd1fe8fb827 -r 6fb422bd339f ChangeLog --- a/ChangeLog Thu Jun 13 14:21:04 2013 +0200 +++ b/ChangeLog Fri Jun 14 10:13:51 2013 +0200 @@ -1,3 +1,8 @@ +2013-06-14 Pavel Tisnovsky + + * src/org/RhinoTests/SimpleScriptContextClassTest.java: + Updated SimpleScriptContextClassTest to work correctly in JDK6-JDK8. + 2013-06-13 Pavel Tisnovsky * src/org/RhinoTests/ScriptEngineManagerClassTest.java: diff -r 7bd1fe8fb827 -r 6fb422bd339f src/org/RhinoTests/SimpleScriptContextClassTest.java --- a/src/org/RhinoTests/SimpleScriptContextClassTest.java Thu Jun 13 14:21:04 2013 +0200 +++ b/src/org/RhinoTests/SimpleScriptContextClassTest.java Fri Jun 14 10:13:51 2013 +0200 @@ -1076,6 +1076,9 @@ final String[] annotationsThatShouldExists_jdk7 = { }; + final String[] annotationsThatShouldExists_jdk8 = { + }; + // get all annotations Annotation[] annotations = this.simpleScriptContextClass.getAnnotations(); // and transform the array into a list of annotation names @@ -1083,7 +1086,20 @@ for (Annotation annotation : annotations) { annotationsAsString.add(annotation.toString()); } - String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + + String[] annotationsThatShouldExists = null; + switch (getJavaVersion()) { + case 6: + annotationsThatShouldExists = annotationsThatShouldExists_jdk6; + break; + case 7: + annotationsThatShouldExists = annotationsThatShouldExists_jdk7; + break; + case 8: + annotationsThatShouldExists = annotationsThatShouldExists_jdk8; + break; + } + // check if all required annotations really exists for (String annotationThatShouldExists : annotationsThatShouldExists) { assertTrue(annotationsAsString.contains(annotationThatShouldExists), @@ -1102,6 +1118,9 @@ final String[] annotationsThatShouldExists_jdk7 = { }; + final String[] annotationsThatShouldExists_jdk8 = { + }; + // get all annotations Annotation[] annotations = this.simpleScriptContextClass.getDeclaredAnnotations(); // and transform the array into a list of annotation names @@ -1109,7 +1128,20 @@ for (Annotation annotation : annotations) { annotationsAsString.add(annotation.toString()); } - String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + + String[] annotationsThatShouldExists = null; + switch (getJavaVersion()) { + case 6: + annotationsThatShouldExists = annotationsThatShouldExists_jdk6; + break; + case 7: + annotationsThatShouldExists = annotationsThatShouldExists_jdk7; + break; + case 8: + annotationsThatShouldExists = annotationsThatShouldExists_jdk8; + break; + } + // check if all required annotations really exists for (String annotationThatShouldExists : annotationsThatShouldExists) { assertTrue(annotationsAsString.contains(annotationThatShouldExists), From aazores at redhat.com Fri Jun 14 06:45:41 2013 From: aazores at redhat.com (Andrew Azores) Date: Fri, 14 Jun 2013 09:45:41 -0400 Subject: [rfc][icedtea-web] Archive URL wrongly resolved - PR1204 Message-ID: <51BB1E85.4050909@redhat.com> Changelog: * netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java (getVersionedUrlUsingQuery): retain query strings in URLs * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java (requestPluginProxyInfo): do not add '/' character between hostname and path if the path is absolute * tests/reproducers/simple/AbsolutePathAndQueryStringApplet/testcases/AbsolutePathAndQueryStringAppletTest.java: tests in-browser launching of applets with absolute JAR paths and query strings in HTML embed tags * tests/reproducers/simple/AbsolutePathAndQueryStringApplet/srcs/AbsolutePathAndQueryStringApplet.java: same * tests/reproducers/simple/AbsolutePathAndQueryStringApplet/resources/AbsolutePathAndQueryStringApplet.html: same This patch fixes a bug where archive URLs would be incorrectly resolved in certain cases. If the archive path specified in an HTML Embed tag was of the form "/foo/bar.jar?i=1234abcd", on host some.site.com, then the plugin would attempt to resolve "http://some.site.com//foo/bar.jar". This was incorrect due to the doubled '/' character after the hostname as well as the removal of the query string. Thanks, Andrew -------------- next part -------------- A non-text attachment was scrubbed... Name: fix.patch Type: text/x-patch Size: 3844 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130614/bacbe652/fix.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: reproducer.patch Type: text/x-patch Size: 7933 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130614/bacbe652/reproducer.patch From bugzilla-daemon at icedtea.classpath.org Fri Jun 14 07:39:17 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 14 Jun 2013 14:39:17 +0000 Subject: [Bug 1204] Archive URL wrongly resolved In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1204 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED CC| |jvanek at redhat.com Assignee|adomurad at redhat.com |aazores at redhat.com --- Comment #8 from JiriVanek --- yes. Andrew Azores have nearly fixed it. But I'm not sure when this will bubble to stable release. I'm in favour to let this wait to 1.5 release last months of this year) -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130614/5a8847ff/attachment.html From jvanek at redhat.com Fri Jun 14 07:37:10 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 14 Jun 2013 16:37:10 +0200 Subject: [rfc][icedtea-web] Archive URL wrongly resolved - PR1204 In-Reply-To: <51BB1E85.4050909@redhat.com> References: <51BB1E85.4050909@redhat.com> Message-ID: <51BB2A96.4080701@redhat.com> On 06/14/2013 03:45 PM, Andrew Azores wrote: > Changelog: > > * netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java (getVersionedUrlUsingQuery): retain query > strings in URLs > * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java (requestPluginProxyInfo): do not add '/' > character between hostname and path if the path is absolute > > * > tests/reproducers/simple/AbsolutePathAndQueryStringApplet/testcases/AbsolutePathAndQueryStringAppletTest.java: > tests in-browser launching of applets with absolute JAR paths and query strings in HTML embed tags > * > tests/reproducers/simple/AbsolutePathAndQueryStringApplet/srcs/AbsolutePathAndQueryStringApplet.java: same > > * > tests/reproducers/simple/AbsolutePathAndQueryStringApplet/resources/AbsolutePathAndQueryStringApplet.html: > same > > This patch fixes a bug where archive URLs would be incorrectly resolved in certain cases. If the > archive path specified in an HTML Embed tag was of the form "/foo/bar.jar?i=1234abcd", on host > some.site.com, then the plugin would attempt to resolve "http://some.site.com//foo/bar.jar". This > was incorrect due to the doubled '/' character after the hostname as well as the removal of the > query string. > Hi! Looks moreover good :) I was not deep thinking aboout, but looks like much more complex patch then I thought it would be when I first time saw the bug. My initial thoughts were - (1) found where the query is lost, and do not lost it (but take care about caching) - and remove any leading "/" (2) for resources. As far as I have read. you are mostly doing it, but ...:) The most worrying is the placement of your code. I would search for one shared place for both javaws and applets... (see inline) > > fix.patch > > > diff --git a/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java b/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java > --- a/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java > +++ b/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java > @@ -38,6 +38,8 @@ exception statement from your version. * > package net.sourceforge.jnlp.cache; > > import java.net.MalformedURLException; > +import java.net.URI; > +import java.net.URISyntaxException; > import java.net.URL; > import java.util.LinkedList; > import java.util.List; > @@ -152,23 +154,24 @@ public class ResourceUrlCreator { > * @param resource the resource to get the url for > */ > protected URL getVersionedUrlUsingQuery(Resource resource) { > - String actualLocation = resource.getLocation().getProtocol() + "://" > - + resource.getLocation().getHost(); > - if (resource.getLocation().getPort() != -1) { > - actualLocation += ":" + resource.getLocation().getPort(); > + URL resourceUrl = resource.getLocation(); > + try { > + String query = resourceUrl.getQuery(); > + if (query == null) query = ""; > + if (resource.requestVersion != null > + && resource.requestVersion.isVersionId()) { > + if (!query.isEmpty()) { > + query += "&"; > + } > + query += "version-id=" + resource.requestVersion; > + } > + URI uri = new URI(resourceUrl.getProtocol(), null, resourceUrl.getHost(), resourceUrl.getPort(), resourceUrl.getPath(), query, null); > + return uri.toURL(); > + } catch (MalformedURLException e) { > + return resourceUrl; > + } catch (URISyntaxException e) { > + return resourceUrl; > } This is really deep change. It would need huge unittesting. (dont forget to negative cases and versioning) The new approach looks correct, but I'm afraid it can affect caching and versioned ajrs. You will have to prove that thay are still working correctly. > - actualLocation += resource.getLocation().getPath(); > - if (resource.requestVersion != null > - && resource.requestVersion.isVersionId()) { > - actualLocation += "?version-id=" + resource.requestVersion; > - } > - URL versionedURL; > - try { > - versionedURL = new URL(actualLocation); > - } catch (MalformedURLException e) { > - return resource.getLocation(); > - } > - return versionedURL; > } > > } > \ No newline at end of file > diff --git a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > @@ -1247,10 +1247,23 @@ public class PluginAppletViewer extends > > String scheme = uri.getScheme(); > String port = uri.getPort() != -1 ? ":" + uri.getPort() : ""; > - if (!uri.getScheme().startsWith("http") && !uri.getScheme().equals("ftp")) > + if (!scheme.startsWith("http") && !scheme.equals("ftp")) > scheme = "http"; > > - requestURI = UrlUtil.encode(scheme + "://" + uri.getHost() + port + "/" + uri.getPath(), "UTF-8"); > + String baseURI = scheme + "://" + uri.getHost() + port; > + if (!uri.getPath().startsWith("/")) { > + baseURI += "/"; > + } wrong indentation > + > + baseURI += uri.getPath(); > + > + if (uri.getQuery() != null) { > + baseURI += "?" + uri.getQuery(); > + } This code looks like duplicating logic with ResourceUrlCreator hunk. > + > + requestURI = UrlUtil.encode(baseURI, "UTF-8"); > + System.out.println("##### PluginAppletViewer requestPluginProxyInfo uri: " + uri.toString()); > + System.out.println("##### PluginAppletViewer requestPluginProxyInfo requestURI: " + requestURI); This debug should be removed, or moved to if debug, with some more informative output (eg was, is, should be...) - I'm however for removal your choice :) ANyway I think this is very wrong palce - especially just plugin (proxy?!?!?) is affected - This chanage should affect both javaws and appelt. (and so the query change, but its place looks more correct) > } catch (Exception e) { > PluginDebug.debug("Cannot construct URL from ", uri.toString(), " ... falling back to DIRECT proxy"); > e.printStackTrace(); > > > reproducer.patch > > The reproducer is nice. To current one just two nits - there should be @bug annotation on top of testcases with bug id (with PR) and links to this thread in mail archive. Second nit is reusing of already existing jars. Last time you have already wrote applet aproximatly same as your new AbsolutePathAndQueryStringApplet. So the best for this patch will be to get rid of this new, and reuse the same :) In jnlp and html files you can call the existing one. Also this test needs to be enhanced - - you need to test it for both javaws and for appelts. - you need to check how this behaves with versioned jars - you need to test if the cache is still ok (query) Also you should try that the reproducers run ruin without regressions with this new patch. > diff --git a/tests/reproducers/simple/AbsolutePathAndQueryStringApplet/resources/AbsolutePathAndQueryStringApplet.html b/tests/reproducers/simple/AbsolutePathAndQueryStringApplet/resources/AbsolutePathAndQueryStringApplet.html > new file mode 100644 > --- /dev/null > +++ b/tests/reproducers/simple/AbsolutePathAndQueryStringApplet/resources/AbsolutePathAndQueryStringApplet.html > @@ -0,0 +1,48 @@ > + > + > + > + > + + archive="/AbsolutePathAndQueryStringApplet.jar?i=1234abcd" > + type="application/x-java-applet;version=1.6" > + width="800" > + height="600"> > + > + > + > diff --git a/tests/reproducers/simple/AbsolutePathAndQueryStringApplet/srcs/AbsolutePathAndQueryStringApplet.java b/tests/reproducers/simple/AbsolutePathAndQueryStringApplet/srcs/AbsolutePathAndQueryStringApplet.java > new file mode 100644 > --- /dev/null > +++ b/tests/reproducers/simple/AbsolutePathAndQueryStringApplet/srcs/AbsolutePathAndQueryStringApplet.java > @@ -0,0 +1,51 @@ > +/* StripHttpPathParams.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; > + > +public class AbsolutePathAndQueryStringApplet extends Applet { > + private static final String appletCloseString = "*** APPLET FINISHED ***"; > + > + public static void main(String[] args) { > + System.out.println("running"); > + } > + > + @Override > + public void init() { > + System.out.println(appletCloseString); > + } init or start? :) > +} > diff --git a/tests/reproducers/simple/AbsolutePathAndQueryStringApplet/testcases/AbsolutePathAndQueryStringAppletTest.java b/tests/reproducers/simple/AbsolutePathAndQueryStringApplet/testcases/AbsolutePathAndQueryStringAppletTest.java > new file mode 100644 > --- /dev/null > +++ b/tests/reproducers/simple/AbsolutePathAndQueryStringApplet/testcases/AbsolutePathAndQueryStringAppletTest.java > @@ -0,0 +1,60 @@ > +/* StripHttpPathParamsTest.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 net.sourceforge.jnlp.ProcessResult; > +import net.sourceforge.jnlp.ServerAccess.AutoClose; > +import net.sourceforge.jnlp.annotations.KnownToFail; > +import net.sourceforge.jnlp.annotations.NeedsDisplay; > +import net.sourceforge.jnlp.annotations.TestInBrowsers; > +import net.sourceforge.jnlp.browsertesting.BrowserTest; > +import net.sourceforge.jnlp.browsertesting.Browsers; > +import net.sourceforge.jnlp.closinglisteners.AutoOkClosingListener; > + > +import org.junit.Assert; > +import org.junit.Test; > + > +public class AbsolutePathAndQueryStringAppletTest extends BrowserTest { > + > + private static final String appletCloseString = AutoOkClosingListener.MAGICAL_OK_CLOSING_STRING; > + > + @NeedsDisplay @Test @TestInBrowsers(testIn={Browsers.one}) just nit you dnon t need to follow - I think the annotations are better each on its own line > + public void testAbsolutePathAndQueryStringAppletLaunch() throws Exception { > + ProcessResult pr = server.executeBrowser("/AbsolutePathAndQueryStringApplet.html", AutoClose.CLOSE_ON_BOTH); > + Assert.assertTrue("stdout should contain " + appletCloseString + " but did not", pr.stdout.contains(appletCloseString)); > + } > + > +} > From bugzilla-daemon at icedtea.classpath.org Fri Jun 14 08:41:49 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 14 Jun 2013 15:41:49 +0000 Subject: [Bug 1479] New: JRE Fatal error in Java Swing application (SIGSEGV detected) Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1479 Bug ID: 1479 Summary: JRE Fatal error in Java Swing application (SIGSEGV detected) Classification: Unclassified Product: IcedTea Version: unspecified Hardware: x86 OS: Linux Status: NEW Severity: major Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: martlin at seznam.cz CC: unassigned at icedtea.classpath.org Created attachment 888 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=888&action=edit got log Log in attachment, have fun -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130614/51db4ca1/attachment.html From aazores at redhat.com Fri Jun 14 10:28:05 2013 From: aazores at redhat.com (Andrew Azores) Date: Fri, 14 Jun 2013 13:28:05 -0400 Subject: [rfc][icedtea-web] Archive URL wrongly resolved - PR1204 In-Reply-To: <51BB2A96.4080701@redhat.com> References: <51BB1E85.4050909@redhat.com> <51BB2A96.4080701@redhat.com> Message-ID: <51BB52A5.1060502@redhat.com> On 06/14/2013 10:37 AM, Jiri Vanek wrote: > >> fix.patch >> >> >> diff --git a/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java >> b/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java >> --- a/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java >> +++ b/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java >> @@ -38,6 +38,8 @@ exception statement from your version. * >> package net.sourceforge.jnlp.cache; >> >> import java.net.MalformedURLException; >> +import java.net.URI; >> +import java.net.URISyntaxException; >> import java.net.URL; >> import java.util.LinkedList; >> import java.util.List; >> @@ -152,23 +154,24 @@ public class ResourceUrlCreator { >> * @param resource the resource to get the url for >> */ >> protected URL getVersionedUrlUsingQuery(Resource resource) { >> - String actualLocation = resource.getLocation().getProtocol() >> + "://" >> - + resource.getLocation().getHost(); >> - if (resource.getLocation().getPort() != -1) { >> - actualLocation += ":" + resource.getLocation().getPort(); >> + URL resourceUrl = resource.getLocation(); >> + try { >> + String query = resourceUrl.getQuery(); >> + if (query == null) query = ""; >> + if (resource.requestVersion != null >> + && resource.requestVersion.isVersionId()) { >> + if (!query.isEmpty()) { >> + query += "&"; >> + } >> + query += "version-id=" + resource.requestVersion; >> + } >> + URI uri = new URI(resourceUrl.getProtocol(), null, >> resourceUrl.getHost(), resourceUrl.getPort(), resourceUrl.getPath(), >> query, null); >> + return uri.toURL(); >> + } catch (MalformedURLException e) { >> + return resourceUrl; >> + } catch (URISyntaxException e) { >> + return resourceUrl; >> } > > > This is really deep change. It would need huge unittesting. (dont > forget to negative cases and versioning) > > The new approach looks correct, but I'm afraid it can affect caching > and versioned ajrs. You will have to prove that thay are still working > correctly. Will do. Adam actually wrote this hunk (minus one line I added) so I will bother him if I need any help with it. >> + >> + requestURI = UrlUtil.encode(baseURI, "UTF-8"); >> + System.out.println("##### PluginAppletViewer >> requestPluginProxyInfo uri: " + uri.toString()); >> + System.out.println("##### PluginAppletViewer >> requestPluginProxyInfo requestURI: " + requestURI); > > This debug should be removed, or moved to if debug, with some more > informative output (eg was, is, should be...) - I'm however for > removal your choice :) Oops :) I meant to remove those. > ANyway I think this is very wrong palce - especially just plugin > (proxy?!?!?) is affected - This chanage should affect both javaws and > appelt. (and so the query change, but its place looks more correct) Based on my debugging and tracing, and the log messages I found output by the plugin (which matched those in the original bug report), the "//" part of the bug was occurring only in the plugin and specifically had to do with retrieving proxy info. I can move this fix somewhere else, but I put it here because this to me seems like the first place where the malformed URL occurs. > The reproducer is nice. To current one just two nits - there should be > @bug annotation on top of testcases with bug id (with PR) and links to > this thread in mail archive. > Second nit is reusing of already existing jars. Last time you have > already wrote applet aproximatly same as your new > AbsolutePathAndQueryStringApplet. So the best for this patch will be > to get rid of this new, and reuse the same :) > In jnlp and html files you can call the existing one. > > Also this test needs to be enhanced - > - you need to test it for both javaws and for appelts. > - you need to check how this behaves with versioned jars > - you need to test if the cache is still ok (query) Working on this. I have the first point done and I'll start looking into the other two. > >> diff --git >> a/tests/reproducers/simple/AbsolutePathAndQueryStringApplet/resources/AbsolutePathAndQueryStringApplet.html >> b/tests/reproducers/simple/AbsolutePathAndQueryStringApplet/resources/AbsolutePathAndQueryStringApplet.html >> >> new file mode 100644 >> --- /dev/null >> +++ >> b/tests/reproducers/simple/AbsolutePathAndQueryStringApplet/resources/AbsolutePathAndQueryStringApplet.html >> @@ -0,0 +1,48 @@ >> < snip > >> + @Override >> + public void init() { >> + System.out.println(appletCloseString); >> + } > > init or start? :) Ah, thank you. I thought it was init, and that's what I used last time as well. I've changed that now. Thanks, Andrew A From peterneubauer2 at gmail.com Fri Jun 14 11:35:41 2013 From: peterneubauer2 at gmail.com (Peter Neubauer) Date: Fri, 14 Jun 2013 20:35:41 +0200 Subject: Icedtea 2.4.0, build CACAO/OpenJDK -> 'ERROR: You seem to not have installed ALSA 0.9.1 or higher.' In-Reply-To: References: <51B91691.2040401@gmail.com> Message-ID: <51BB627D.8050506@gmail.com> > For tracking this down, you can look at these pieces of the magic: > > GetVersion: > http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk/file/29ce11184945/make/common/shared/Defs.gmk#l135 > > ALSA_VERSION: > http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk/file/29ce11184945/make/common/shared/Sanity.gmk#l117 > > What does the line with SND_LIB_VERSION_STR say in /usr/include/alsa/version.h? From my manual piecing-together of the GetVersion call, all seems fine on the ALSA side: $ egrep SND_LIB_VERSION_STR /usr/include/alsa/version.h #define SND_LIB_VERSION_STR "1.0.26" $ egrep SND_LIB_VERSION_STR /usr/include/alsa/version.h | sed -e 's at .*"\(.*\)".*@\1@' 1.0.26 $ egrep SND_LIB_VERSION_STR /usr/include/alsa/version.h | sed -e 's at .*"\(.*\)".*@\1@' | sed -e 's@[^0-9]*\([0-9][0-9]*\.[0-9][.0-9]*\).*@\1@' 1.0.26 I tried to add debug output to the relevant parts of the gmk files, but failed, so I don't have a sample of the actual runtime values of ALSA_VERSION etc. However, I noticed some errors in the build output that might be related, e.g. http://pastebin.com/F1gETRkH, line 1091: /bin/sh: /bin/egrep: No such file or directory On my system: $ which egrep /usr/bin/egrep Since the version string extraction depends on egrep, it would not find anything. I tried to trace the path definition: openjdk/jdk/make/common/shared/Defs-utils.gmk:95 EGREP = $(UTILS_COMMAND_PATH)egrep openjdk/jdk/make/common/shared/Defs-utils.gmk:50 UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH) openjdk/jdk/make/common/shared/Defs-linux.gmk:64 UNIXCOMMAND_PATH = /bin/ As a quick-fix attempt, I manually substituted 'UTILS_COMMAND_PATH=$(USRBIN_PATH)' in all Defs-utils.gmk files. At first, the build continued for a bit - but I seem to have overshot the goal: '/bin/sh: /usr/bin/sh: No such file or directory' I attempted no more manual quick-fixes because it could get quite tedious to check and correct the path to every tool. > I don't know what your intention is. If you just want a build, use an > older system and copy it over. I need to build new CACAO sources because I'm working on a related project as part of an undergrad course and later my Bachelor thesis. I have built it before with GNU Classpath and without IcedTea, but I wanted to try OpenJDK as well. If there is a way to build CACAO for OpenJDK without building OpenJDK itself and you could point it out to me, I might not give up on it now. In case you were there at that CACAO Meeting on 14.5. (?) at the complang library [I'm bad at remembering names and faces, sorry], I was there too, and I talked briefly about my intermediate representation interpreter project. From stefan at complang.tuwien.ac.at Fri Jun 14 12:15:11 2013 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Fri, 14 Jun 2013 21:15:11 +0200 Subject: Icedtea 2.4.0, build CACAO/OpenJDK -> 'ERROR: You seem to not have installed ALSA 0.9.1 or higher.' In-Reply-To: <51BB627D.8050506@gmail.com> References: <51B91691.2040401@gmail.com> <51BB627D.8050506@gmail.com> Message-ID: > However, I noticed some errors in the build output that might be related, > e.g. http://pastebin.com/F1gETRkH, line 1091: > /bin/sh: /bin/egrep: No such file or directory > > On my system: > $ which egrep > /usr/bin/egrep /bin, /usr/bin unification seems to be all the rage these days. On my Fedora system, /bin is actually a symlink to /usr/bin. In your case, I would create a fresh bin directory somewhere (in your home), symlink everything from both /bin and /usr/bin there and use that as UNIXCOMMAND_PATH. > I need to build new CACAO sources because I'm working on a related project > as part of an undergrad course and later my Bachelor thesis. I have built it > before with GNU Classpath and without IcedTea, but I wanted to try OpenJDK > as well. If there is a way to build CACAO for OpenJDK without building > OpenJDK itself and you could point it out to me, I might not give up on it > now. Build it with icedtea. Once you have a build, you'll not need to touch the icedtea/OpenJDK bits anymore. From guillaume at alaux.net Sat Jun 15 00:23:25 2013 From: guillaume at alaux.net (Guillaume Alaux) Date: Sat, 15 Jun 2013 09:23:25 +0200 Subject: Icedtea 2.4.0, build CACAO/OpenJDK -> 'ERROR: You seem to not have installed ALSA 0.9.1 or higher.' In-Reply-To: References: <51B91691.2040401@gmail.com> <51BB627D.8050506@gmail.com> Message-ID: On 14 June 2013 21:15, Stefan Ring wrote: > > > However, I noticed some errors in the build output that might be related, > > e.g. http://pastebin.com/F1gETRkH, line 1091: > > /bin/sh: /bin/egrep: No such file or directory > > > > On my system: > > $ which egrep > > /usr/bin/egrep > > /bin, /usr/bin unification seems to be all the rage these days. On my > Fedora system, /bin is actually a symlink to /usr/bin. In your case, I > would create a fresh bin directory somewhere (in your home), symlink > everything from both /bin and /usr/bin there and use that as > UNIXCOMMAND_PATH. > > > I need to build new CACAO sources because I'm working on a related project > > as part of an undergrad course and later my Bachelor thesis. I have built it > > before with GNU Classpath and without IcedTea, but I wanted to try OpenJDK > > as well. If there is a way to build CACAO for OpenJDK without building > > OpenJDK itself and you could point it out to me, I might not give up on it > > now. > > Build it with icedtea. Once you have a build, you'll not need to touch > the icedtea/OpenJDK bits anymore. As for binaries not beeing on the expected path, I would just like to point out that to build it for Arch, we patch these as shown here [0] [1]. You could have a look at the complete build process for Arch here BTW [2]. Also, downloading the sources of the Arch package and modifying them for your needs could be an easier start. [0] https://projects.archlinux.org/svntogit/packages.git/tree/trunk/01_fix_openjdk_cmds_path.diff?h=packages/java7-openjdk [1] https://projects.archlinux.org/svntogit/packages.git/tree/trunk/02_fix_corba_cmds_path.diff?h=packages/java7-openjdk [2] https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/java7-openjdk -- Guillaume From guillaume at alaux.net Sat Jun 15 01:59:13 2013 From: guillaume at alaux.net (Guillaume Alaux) Date: Sat, 15 Jun 2013 10:59:13 +0200 Subject: Icedtea 2.4.0, build CACAO/OpenJDK -> 'ERROR: You seem to not have installed ALSA 0.9.1 or higher.' In-Reply-To: References: <51B91691.2040401@gmail.com> <51BB627D.8050506@gmail.com> Message-ID: On 15 June 2013 09:23, Guillaume Alaux wrote: > On 14 June 2013 21:15, Stefan Ring wrote: >> >> > However, I noticed some errors in the build output that might be related, >> > e.g. http://pastebin.com/F1gETRkH, line 1091: >> > /bin/sh: /bin/egrep: No such file or directory >> > >> > On my system: >> > $ which egrep >> > /usr/bin/egrep >> >> /bin, /usr/bin unification seems to be all the rage these days. On my >> Fedora system, /bin is actually a symlink to /usr/bin. In your case, I >> would create a fresh bin directory somewhere (in your home), symlink >> everything from both /bin and /usr/bin there and use that as >> UNIXCOMMAND_PATH. >> >> > I need to build new CACAO sources because I'm working on a related project >> > as part of an undergrad course and later my Bachelor thesis. I have built it >> > before with GNU Classpath and without IcedTea, but I wanted to try OpenJDK >> > as well. If there is a way to build CACAO for OpenJDK without building >> > OpenJDK itself and you could point it out to me, I might not give up on it >> > now. >> >> Build it with icedtea. Once you have a build, you'll not need to touch >> the icedtea/OpenJDK bits anymore. > > As for binaries not beeing on the expected path, I would just like to > point out that to build it for Arch, we patch these as shown here [0] > [1]. You could have a look at the complete build process for Arch here > BTW [2]. > > Also, downloading the sources of the Arch package and modifying them > for your needs could be an easier start. > > [0] https://projects.archlinux.org/svntogit/packages.git/tree/trunk/01_fix_openjdk_cmds_path.diff?h=packages/java7-openjdk > [1] https://projects.archlinux.org/svntogit/packages.git/tree/trunk/02_fix_corba_cmds_path.diff?h=packages/java7-openjdk > [2] https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/java7-openjdk > > -- > Guillaume I have just checked and you don't even need these path fixing patches if you have performed the /usr/bin move. From bugzilla-daemon at icedtea.classpath.org Sun Jun 16 12:49:23 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 16 Jun 2013 19:49:23 +0000 Subject: [Bug 1480] New: My server has crashed for this error Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1480 Bug ID: 1480 Summary: My server has crashed for this error Classification: Unclassified Product: IcedTea Version: unspecified Hardware: x86 OS: Windows Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: matteo.sorre.M.S at gmail.com CC: unassigned at icedtea.classpath.org Created attachment 889 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=889&action=edit The file of crash -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130616/c6cdeec9/attachment.html From gnu.andrew at redhat.com Mon Jun 17 08:01:56 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Mon, 17 Jun 2013 11:01:56 -0400 (EDT) Subject: Icedtea 2.4.0, build CACAO/OpenJDK -> 'ERROR: You seem to not have installed ALSA 0.9.1 or higher.' In-Reply-To: References: <51B91691.2040401@gmail.com> <51BB627D.8050506@gmail.com> Message-ID: <1489985457.3796467.1371481316040.JavaMail.root@redhat.com> ----- Original Message ----- > On 15 June 2013 09:23, Guillaume Alaux wrote: > > On 14 June 2013 21:15, Stefan Ring wrote: > >> > >> > However, I noticed some errors in the build output that might be > >> > related, > >> > e.g. http://pastebin.com/F1gETRkH, line 1091: > >> > /bin/sh: /bin/egrep: No such file or directory > >> > > >> > On my system: > >> > $ which egrep > >> > /usr/bin/egrep > >> > >> /bin, /usr/bin unification seems to be all the rage these days. On my > >> Fedora system, /bin is actually a symlink to /usr/bin. In your case, I > >> would create a fresh bin directory somewhere (in your home), symlink > >> everything from both /bin and /usr/bin there and use that as > >> UNIXCOMMAND_PATH. > >> > >> > I need to build new CACAO sources because I'm working on a related > >> > project > >> > as part of an undergrad course and later my Bachelor thesis. I have > >> > built it > >> > before with GNU Classpath and without IcedTea, but I wanted to try > >> > OpenJDK > >> > as well. If there is a way to build CACAO for OpenJDK without building > >> > OpenJDK itself and you could point it out to me, I might not give up on > >> > it > >> > now. > >> > >> Build it with icedtea. Once you have a build, you'll not need to touch > >> the icedtea/OpenJDK bits anymore. > > > > As for binaries not beeing on the expected path, I would just like to > > point out that to build it for Arch, we patch these as shown here [0] > > [1]. You could have a look at the complete build process for Arch here > > BTW [2]. > > > > Also, downloading the sources of the Arch package and modifying them > > for your needs could be an easier start. > > > > [0] > > https://projects.archlinux.org/svntogit/packages.git/tree/trunk/01_fix_openjdk_cmds_path.diff?h=packages/java7-openjdk > > [1] > > https://projects.archlinux.org/svntogit/packages.git/tree/trunk/02_fix_corba_cmds_path.diff?h=packages/java7-openjdk > > [2] > > https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/java7-openjdk > > > > -- > > Guillaume > > I have just checked and you don't even need these path fixing patches > if you have performed the /usr/bin move. > The correct solution would be for IcedTea to detect and set these, I think. Please let us know if you have patches that could be adapted for IcedTea :) -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From bugzilla-daemon at icedtea.classpath.org Mon Jun 17 11:08:00 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 17 Jun 2013 18:08:00 +0000 Subject: [Bug 974] Classes available from JNLP extensions are not found when using jnlp_href In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=974 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dbhole at redhat.com Assignee|smohammad at redhat.com |aazores at redhat.com -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130617/52d6f42d/attachment.html From alex.kasko.lists at gmail.com Mon Jun 17 15:20:44 2013 From: alex.kasko.lists at gmail.com (Alex Kasko) Date: Tue, 18 Jun 2013 02:20:44 +0400 Subject: IcedTea 1.12.5 windows build errors In-Reply-To: <51BA52BC.6030609@gmail.com> References: <51B9E2D0.6040805@gmail.com> <51BA52BC.6030609@gmail.com> Message-ID: <51BF8BBC.5080909@gmail.com> I've built IcedTea 1.12.5 for windows-i586 successfully. If anybody want to test it, j2sdk-image is here - https://docs.google.com/file/d/0BwRxcq1fvxU6X2liMEVVQTFuVms/edit?usp=sharing (sha1: 25998c275159622bc22137f36ce1925da905e530). Tested with "make test" (on windows 2000) and running "bin/jconsole.exe" on (windows 2000 and windows 2003 x64). windows-amd64 build is in progress. I applied some patches, most of them are straightforward (use bundled zip/gif/png/jpeg, exclude rhino) only one is non-obvious (windows specific AWT problem, patched it "blindly", will look at it thoroughly). Patches are quite messy right now, I'll publish them later. I'm interesting in maintaining windows builds for IcedTea, is it possible to have windows-specific changes upstreamed into IcedTea? On 06/14/2013 03:16 AM, Alex Kasko wrote: > On 06/13/2013 07:18 PM, Alex Kasko wrote: >> Hi, >> >> I'm trying to build IcedTea 1.12.5 for windows-i586. Ultimate goal is to >> get jdk6 GPL binaries for windows and linux with latest bugfixes. I have >> a virtual machine with proper environment for building openjdk6 [1] (it >> builds openjdk6-build27 successfully). >> >> I thought, that most IcedTea changes are linux-related, and >> windows-specific part should be close to openjdk6 build 27. So I ran >> "./configure" (in Linux) without specific options, abort the build after >> patching step and copy "icedtea6-1.12.5/openjdk" contents to windows >> machine. >> >> During the build on windows corba, jaxp, jaxws and hotspot modules works >> fine but jdk module aborted the build with AWT-related error [2] . > Fixed this particular "Wheel95GetMsg" AWT error, have other AWT problems > now, will report them later. > >> Comparing AWT sources between IcedTea 1.12.5 and current openjdk6 >> mercurial tip I found a lot of windows-specific changes (Direct3D etc) >> in IcedTea. >> >> Questions about all that: >> 1) Is there something like "$ ./configure ; make download-openjdk" for >> IcedTea 1.12.5 to get patched openjdk sources? >> 2) Is there a switch (in 1.12.5) for using bundled zlib instead of >> system one (I changed makefiles to use bundled one)? >> 3) Am I understand right, that windows changes are the parts of jdk7 >> backports and may not work properly with older compiler (jdk6 is built >> with MSVS2003)? Or what are they for, giving that windows is not >> supported platform for icedtea? >> 4) Is it a good idea (for windows builds) to try to revert some windows >> specific AWT-related patches in IcedTea-1.12.5 to make it closer to >> openjdk6-build27? Or changes are too big for that? >> >> >> [1] >> http://hg.openjdk.java.net/jdk6/jdk6/raw-file/tip/README-builds.html#MBE >> [2] https://gist.github.com/alexkasko/5773264 >> > -- Regards, Alex Kasko From stefan at complang.tuwien.ac.at Mon Jun 17 23:43:09 2013 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Tue, 18 Jun 2013 08:43:09 +0200 Subject: IcedTea 1.12.5 windows build errors In-Reply-To: <51BF8BBC.5080909@gmail.com> References: <51B9E2D0.6040805@gmail.com> <51BA52BC.6030609@gmail.com> <51BF8BBC.5080909@gmail.com> Message-ID: On Tue, Jun 18, 2013 at 12:20 AM, Alex Kasko wrote: > I've built IcedTea 1.12.5 for windows-i586 successfully. If anybody want to > test it, j2sdk-image is here - > https://docs.google.com/file/d/0BwRxcq1fvxU6X2liMEVVQTFuVms/edit?usp=sharing > (sha1: 25998c275159622bc22137f36ce1925da905e530). Tested with "make test" > (on windows 2000) and running "bin/jconsole.exe" on (windows 2000 and > windows 2003 x64). windows-amd64 build is in progress. > > I applied some patches, most of them are straightforward (use bundled > zip/gif/png/jpeg, exclude rhino) only one is non-obvious (windows specific > AWT problem, patched it "blindly", will look at it thoroughly). Patches are > quite messy right now, I'll publish them later. Congratulations on your Windows build! From the output, it looks like you were using cygwin. How much of cygwin does it need? Just make and the shell? And I guess you did a non-bootstrap build? >>> Questions about all that: >>> 1) Is there something like "$ ./configure ; make download-openjdk" for >>> IcedTea 1.12.5 to get patched openjdk sources? I'd try make extract. From stefan at complang.tuwien.ac.at Mon Jun 17 23:48:03 2013 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Tue, 18 Jun 2013 08:48:03 +0200 Subject: IcedTea 1.12.5 windows build errors In-Reply-To: References: <51B9E2D0.6040805@gmail.com> <51BA52BC.6030609@gmail.com> <51BF8BBC.5080909@gmail.com> Message-ID: > How much of cygwin does it need? Just make and > the shell? Ah, never mind. These things are spelled out in README-builds.html. From bugzilla-daemon at icedtea.classpath.org Tue Jun 18 02:17:08 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 18 Jun 2013 09:17:08 +0000 Subject: [Bug 1481] New: Eclipse crashes while running gwt designer Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1481 Bug ID: 1481 Summary: Eclipse crashes while running gwt designer Classification: Unclassified Product: IcedTea Version: 6-1.12.5 Hardware: x86_64 OS: Linux Status: NEW Severity: blocker Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: nikiferrari88 at yahoo.it CC: unassigned at icedtea.classpath.org Created attachment 890 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=890&action=edit Eclipse fatal error log file Hi all guys! My problem is that every time I launch the GWT Designer in my web application, Eclipse runs a fatal error that causes JRE closing. Hope you can help me with this problem. I attach to you the log file. Thank you in advance, Best wishes, Niki -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130618/2cc27ab9/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Jun 18 03:10:18 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 18 Jun 2013 10:10:18 +0000 Subject: [Bug 1481] Eclipse crashes while running gwt designer In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1481 --- Comment #1 from Andrew Haley --- Comment on attachment 890 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=890 Eclipse fatal error log file This is very unlikely to be a bug in OpenJDK. I suggest you contact the author of GWT Designer. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130618/bd78acd1/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Jun 18 03:10:59 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 18 Jun 2013 10:10:59 +0000 Subject: [Bug 1481] Eclipse crashes while running gwt designer In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1481 Andrew Haley changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |aph at redhat.com Resolution|--- |INVALID Assignee|gnu.andrew at redhat.com |aph at redhat.com -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130618/98489c6c/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Jun 18 03:26:38 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 18 Jun 2013 10:26:38 +0000 Subject: [Bug 1481] Eclipse crashes while running gwt designer In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1481 --- Comment #2 from nikiferrari88 at yahoo.it --- You're probably right :) Thank you for the advice! Greetings, Niki -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130618/20333451/attachment.html From gnu.andrew at redhat.com Tue Jun 18 04:11:53 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Tue, 18 Jun 2013 07:11:53 -0400 (EDT) Subject: IcedTea 1.12.5 windows build errors In-Reply-To: <51BF8BBC.5080909@gmail.com> References: <51B9E2D0.6040805@gmail.com> <51BA52BC.6030609@gmail.com> <51BF8BBC.5080909@gmail.com> Message-ID: <2132619411.4318621.1371553913761.JavaMail.root@redhat.com> ----- Original Message ----- > I've built IcedTea 1.12.5 for windows-i586 successfully. If anybody want > to test it, j2sdk-image is here - > https://docs.google.com/file/d/0BwRxcq1fvxU6X2liMEVVQTFuVms/edit?usp=sharing > (sha1: 25998c275159622bc22137f36ce1925da905e530). Tested with "make > test" (on windows 2000) and running "bin/jconsole.exe" on (windows 2000 > and windows 2003 x64). windows-amd64 build is in progress. > > I applied some patches, most of them are straightforward (use bundled > zip/gif/png/jpeg, exclude rhino) only one is non-obvious (windows > specific AWT problem, patched it "blindly", will look at it thoroughly). > Patches are quite messy right now, I'll publish them later. > > I'm interesting in maintaining windows builds for IcedTea, is it > possible to have windows-specific changes upstreamed into IcedTea? This is great news! Yes, I'd love to get these changes into IcedTea for 1.13.0. We also do support for OpenJDK 7 (IcedTea 2.x) and are working on OpenJDK 8 (IcedTea 3.x), if you'd be interested in either at some point. 7 already has the option of turning off system library support and it's probably about time it was added to 1.x. Thanks for investing time in doing this :) > > On 06/14/2013 03:16 AM, Alex Kasko wrote: > > On 06/13/2013 07:18 PM, Alex Kasko wrote: > >> Hi, > >> > >> I'm trying to build IcedTea 1.12.5 for windows-i586. Ultimate goal is to > >> get jdk6 GPL binaries for windows and linux with latest bugfixes. I have > >> a virtual machine with proper environment for building openjdk6 [1] (it > >> builds openjdk6-build27 successfully). > >> > >> I thought, that most IcedTea changes are linux-related, and > >> windows-specific part should be close to openjdk6 build 27. So I ran > >> "./configure" (in Linux) without specific options, abort the build after > >> patching step and copy "icedtea6-1.12.5/openjdk" contents to windows > >> machine. > >> > >> During the build on windows corba, jaxp, jaxws and hotspot modules works > >> fine but jdk module aborted the build with AWT-related error [2] . > > Fixed this particular "Wheel95GetMsg" AWT error, have other AWT problems > > now, will report them later. > > > >> Comparing AWT sources between IcedTea 1.12.5 and current openjdk6 > >> mercurial tip I found a lot of windows-specific changes (Direct3D etc) > >> in IcedTea. > >> > >> Questions about all that: > >> 1) Is there something like "$ ./configure ; make download-openjdk" for > >> IcedTea 1.12.5 to get patched openjdk sources? > >> 2) Is there a switch (in 1.12.5) for using bundled zlib instead of > >> system one (I changed makefiles to use bundled one)? > >> 3) Am I understand right, that windows changes are the parts of jdk7 > >> backports and may not work properly with older compiler (jdk6 is built > >> with MSVS2003)? Or what are they for, giving that windows is not > >> supported platform for icedtea? > >> 4) Is it a good idea (for windows builds) to try to revert some windows > >> specific AWT-related patches in IcedTea-1.12.5 to make it closer to > >> openjdk6-build27? Or changes are too big for that? > >> > >> > >> [1] > >> http://hg.openjdk.java.net/jdk6/jdk6/raw-file/tip/README-builds.html#MBE > >> [2] https://gist.github.com/alexkasko/5773264 > >> > > > > > -- > Regards, > Alex Kasko > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From alex.kasko.lists at gmail.com Tue Jun 18 04:17:39 2013 From: alex.kasko.lists at gmail.com (Alex Kasko) Date: Tue, 18 Jun 2013 15:17:39 +0400 Subject: IcedTea 1.12.5 windows build errors In-Reply-To: References: <51B9E2D0.6040805@gmail.com> <51BA52BC.6030609@gmail.com> <51BF8BBC.5080909@gmail.com> Message-ID: <51C041D3.7040300@gmail.com> On 06/18/2013 10:43 AM, Stefan Ring wrote: > On Tue, Jun 18, 2013 at 12:20 AM, Alex Kasko wrote: >> I've built IcedTea 1.12.5 for windows-i586 successfully. If anybody want to >> test it, j2sdk-image is here - >> https://docs.google.com/file/d/0BwRxcq1fvxU6X2liMEVVQTFuVms/edit?usp=sharing >> (sha1: 25998c275159622bc22137f36ce1925da905e530). Tested with "make test" >> (on windows 2000) and running "bin/jconsole.exe" on (windows 2000 and >> windows 2003 x64). windows-amd64 build is in progress. >> >> I applied some patches, most of them are straightforward (use bundled >> zip/gif/png/jpeg, exclude rhino) only one is non-obvious (windows specific >> AWT problem, patched it "blindly", will look at it thoroughly). Patches are >> quite messy right now, I'll publish them later. > > Congratulations on your Windows build! Thanks! BTW amd64 build is done [1] (sha1: 6e1872aaeced3ba07f780b3a0583a4d6537a71a1) from the same sources as i586 one and I'm going to look at the patches. > From the output, it looks like > you were using cygwin. How much of cygwin does it need? Just make and > the shell? I'm using stripped down version of cygwin [2] with custom make binary [3] > And I guess you did a non-bootstrap build? I'm not sure, what exactly is "bootstrap build"? I copied patched openjdk sources into windows and built them calling "make" from the top directory (I guess this is called "control build"). > >>>> Questions about all that: >>>> 1) Is there something like "$ ./configure ; make download-openjdk" for >>>> IcedTea 1.12.5 to get patched openjdk sources? > > I'd try make extract. On the quick glance "make extract" leave "icedtea6-1.12.5/openjdk" directory unpatched. [1] https://docs.google.com/file/d/0BwRxcq1fvxU6MjlIVDVwNXRiRkk/edit?usp=sharing [2] https://github.com/alexkasko/openjdk-unofficial-builds/tree/master/utils/cygwin [3] https://github.com/alexkasko/openjdk-unofficial-builds/tree/master/utils/make -- Regards, Alex Kasko From stefan at complang.tuwien.ac.at Tue Jun 18 04:25:54 2013 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Tue, 18 Jun 2013 13:25:54 +0200 Subject: IcedTea 1.12.5 windows build errors In-Reply-To: <51C041D3.7040300@gmail.com> References: <51B9E2D0.6040805@gmail.com> <51BA52BC.6030609@gmail.com> <51BF8BBC.5080909@gmail.com> <51C041D3.7040300@gmail.com> Message-ID: >> And I guess you did a non-bootstrap build? > > I'm not sure, what exactly is "bootstrap build"? I copied patched openjdk > sources into windows and built them calling "make" from the top directory (I > guess this is called "control build"). icedtea can build an intermediate jdk, usually using gcj or ecj, and only after that, uses it to build the real jdk. I think that's the default behavior. It is controlled by --disable-bootstrap. The purposes of this intermediate step are to purge the resulting binaries of all proprietary stuff that might have crept in, and also to facilitate building on platforms where there was no Sun-provided JDK. >> I'd try make extract. > > On the quick glance "make extract" leave "icedtea6-1.12.5/openjdk" directory > unpatched. make patch looks more promising ;) From alex.kasko.lists at gmail.com Tue Jun 18 04:55:37 2013 From: alex.kasko.lists at gmail.com (Alex Kasko) Date: Tue, 18 Jun 2013 15:55:37 +0400 Subject: IcedTea 1.12.5 windows build errors In-Reply-To: <2132619411.4318621.1371553913761.JavaMail.root@redhat.com> References: <51B9E2D0.6040805@gmail.com> <51BA52BC.6030609@gmail.com> <51BF8BBC.5080909@gmail.com> <2132619411.4318621.1371553913761.JavaMail.root@redhat.com> Message-ID: <51C04AB9.3000404@gmail.com> On 06/18/2013 03:11 PM, Andrew Hughes wrote: > ----- Original Message ----- >> I've built IcedTea 1.12.5 for windows-i586 successfully. If anybody want >> to test it, j2sdk-image is here - >> https://docs.google.com/file/d/0BwRxcq1fvxU6X2liMEVVQTFuVms/edit?usp=sharing >> (sha1: 25998c275159622bc22137f36ce1925da905e530). Tested with "make >> test" (on windows 2000) and running "bin/jconsole.exe" on (windows 2000 >> and windows 2003 x64). windows-amd64 build is in progress. >> >> I applied some patches, most of them are straightforward (use bundled >> zip/gif/png/jpeg, exclude rhino) only one is non-obvious (windows >> specific AWT problem, patched it "blindly", will look at it thoroughly). >> Patches are quite messy right now, I'll publish them later. >> >> I'm interesting in maintaining windows builds for IcedTea, is it >> possible to have windows-specific changes upstreamed into IcedTea? > > This is great news! Yes, I'd love to get these changes into IcedTea for > 1.13.0. We also do support for OpenJDK 7 (IcedTea 2.x) and are working > on OpenJDK 8 (IcedTea 3.x), if you'd be interested in either at some point. > 7 already has the option of turning off system library support and it's > probably about time it was added to 1.x. Yes, I'm going to try 2.4.0 soon. And going to leave 3.x for later (openjdk8 new build system + MSYS will require some work). > > Thanks for investing time in doing this :) > >> >> On 06/14/2013 03:16 AM, Alex Kasko wrote: >>> On 06/13/2013 07:18 PM, Alex Kasko wrote: >>>> Hi, >>>> >>>> I'm trying to build IcedTea 1.12.5 for windows-i586. Ultimate goal is to >>>> get jdk6 GPL binaries for windows and linux with latest bugfixes. I have >>>> a virtual machine with proper environment for building openjdk6 [1] (it >>>> builds openjdk6-build27 successfully). >>>> >>>> I thought, that most IcedTea changes are linux-related, and >>>> windows-specific part should be close to openjdk6 build 27. So I ran >>>> "./configure" (in Linux) without specific options, abort the build after >>>> patching step and copy "icedtea6-1.12.5/openjdk" contents to windows >>>> machine. >>>> >>>> During the build on windows corba, jaxp, jaxws and hotspot modules works >>>> fine but jdk module aborted the build with AWT-related error [2] . >>> Fixed this particular "Wheel95GetMsg" AWT error, have other AWT problems >>> now, will report them later. >>> >>>> Comparing AWT sources between IcedTea 1.12.5 and current openjdk6 >>>> mercurial tip I found a lot of windows-specific changes (Direct3D etc) >>>> in IcedTea. >>>> >>>> Questions about all that: >>>> 1) Is there something like "$ ./configure ; make download-openjdk" for >>>> IcedTea 1.12.5 to get patched openjdk sources? >>>> 2) Is there a switch (in 1.12.5) for using bundled zlib instead of >>>> system one (I changed makefiles to use bundled one)? >>>> 3) Am I understand right, that windows changes are the parts of jdk7 >>>> backports and may not work properly with older compiler (jdk6 is built >>>> with MSVS2003)? Or what are they for, giving that windows is not >>>> supported platform for icedtea? >>>> 4) Is it a good idea (for windows builds) to try to revert some windows >>>> specific AWT-related patches in IcedTea-1.12.5 to make it closer to >>>> openjdk6-build27? Or changes are too big for that? >>>> >>>> >>>> [1] >>>> http://hg.openjdk.java.net/jdk6/jdk6/raw-file/tip/README-builds.html#MBE >>>> [2] https://gist.github.com/alexkasko/5773264 >>>> >>> >> >> >> -- >> Regards, >> Alex Kasko >> > -- Regards, Alex Kasko From ptisnovs at icedtea.classpath.org Tue Jun 18 05:07:07 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 18 Jun 2013 12:07:07 +0000 Subject: /hg/gfx-test: Added stubs for three new test suites. Added new t... Message-ID: changeset 3b4f1b1e8451 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=3b4f1b1e8451 author: Pavel Tisnovsky date: Tue Jun 18 14:10:38 2013 +0200 Added stubs for three new test suites. Added new transformation type. diffstat: ChangeLog | 11 + Makefile | 6 + src/org/gfxtest/framework/annotations/Transformations.java | 5 + src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java | 76 ++++++++++ src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java | 76 ++++++++++ src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java | 76 ++++++++++ 6 files changed, 250 insertions(+), 0 deletions(-) diffs (296 lines): diff -r 9da4ad7fe2ec -r 3b4f1b1e8451 ChangeLog --- a/ChangeLog Fri Jun 14 10:04:50 2013 +0200 +++ b/ChangeLog Tue Jun 18 14:10:38 2013 +0200 @@ -1,3 +1,14 @@ +2013-06-18 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java: + * src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java: + * src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java: + Added stubs for three new test suites. + * src/org/gfxtest/framework/annotations/Transformations.java: + Added new transformation type. + * Makefile: + Added new classes to compile and new tests to run. + 2013-06-14 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltCropImage.java: diff -r 9da4ad7fe2ec -r 3b4f1b1e8451 Makefile --- a/Makefile Fri Jun 14 10:04:50 2013 +0200 +++ b/Makefile Tue Jun 18 14:10:38 2013 +0200 @@ -150,6 +150,9 @@ $(CLASSES)/$(TESTSUITE_DIR)/BitBltUsingBgColor.class \ $(CLASSES)/$(TESTSUITE_DIR)/BitBltUsingBgColorAlpha.class \ $(CLASSES)/$(TESTSUITE_DIR)/BitBltAffineTransformOp.class \ + $(CLASSES)/$(TESTSUITE_DIR)/BitBltAffineIdentityTransformOp.class \ + $(CLASSES)/$(TESTSUITE_DIR)/BitBltAffineQuadrantRotateTransformOp.class \ + $(CLASSES)/$(TESTSUITE_DIR)/BitBltAffineRotateTransformOp.class \ $(CLASSES)/$(TESTSUITE_DIR)/BitBltColorConvertOp.class \ $(CLASSES)/$(TESTSUITE_DIR)/BitBltConvolveOp.class \ $(CLASSES)/$(TESTSUITE_DIR)/BitBltCustomOp.class \ @@ -256,6 +259,9 @@ $(RESULTS)/BitBltUsingBgColor \ $(RESULTS)/BitBltUsingBgColorAlpha \ $(RESULTS)/BitBltAffineTransformOp \ + $(RESULTS)/BitBltAffineIdentityTransformOp \ + $(RESULTS)/BitBltAffineQuadrantRotateTransformOp \ + $(RESULTS)/BitBltAffineRotateTransformOp \ $(RESULTS)/BitBltColorConvertOp \ $(RESULTS)/BitBltConvolveOp \ $(RESULTS)/BitBltCustomOp \ diff -r 9da4ad7fe2ec -r 3b4f1b1e8451 src/org/gfxtest/framework/annotations/Transformations.java --- a/src/org/gfxtest/framework/annotations/Transformations.java Fri Jun 14 10:04:50 2013 +0200 +++ b/src/org/gfxtest/framework/annotations/Transformations.java Tue Jun 18 14:10:38 2013 +0200 @@ -76,6 +76,11 @@ SKEW, /** + * Translate transformation is used. + */ + TRANSLATE, + + /** * Various linear transformation is used. */ VARIOUS, diff -r 9da4ad7fe2ec -r 3b4f1b1e8451 src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java Tue Jun 18 14:10:38 2013 +0200 @@ -0,0 +1,76 @@ +/* + Java gfx-test framework + + Copyright (C) 2013 Red Hat + +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. +*/ + +package org.gfxtest.testsuites; + +import org.gfxtest.framework.GfxTest; +import org.gfxtest.framework.annotations.BitBltOperation; +import org.gfxtest.framework.annotations.BitBltOperations; +import org.gfxtest.framework.annotations.GraphicsPrimitive; +import org.gfxtest.framework.annotations.GraphicsPrimitives; +import org.gfxtest.framework.annotations.RenderStyle; +import org.gfxtest.framework.annotations.RenderStyles; +import org.gfxtest.framework.annotations.TestType; +import org.gfxtest.framework.annotations.TestTypes; +import org.gfxtest.framework.annotations.Transformation; +import org.gfxtest.framework.annotations.Transformations; +import org.gfxtest.framework.annotations.Zoom; + + + + at TestType(TestTypes.RENDER_TEST) + at GraphicsPrimitive(GraphicsPrimitives.COMMON_BITMAP) + at RenderStyle(RenderStyles.NORMAL) + at BitBltOperation(BitBltOperations.BITBLT) + at Transformation(Transformations.NONE) + at Zoom(1) +public class BitBltAffineIdentityTransformOp extends GfxTest +{ + /** + * Entry point to the test suite. + * + * @param args not used in this case + */ + public static void main(String[] args) + { + new BitBltAffineIdentityTransformOp().runTestSuite(args); + } + +} diff -r 9da4ad7fe2ec -r 3b4f1b1e8451 src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java Tue Jun 18 14:10:38 2013 +0200 @@ -0,0 +1,76 @@ +/* + Java gfx-test framework + + Copyright (C) 2013 Red Hat + +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. +*/ + +package org.gfxtest.testsuites; + +import org.gfxtest.framework.GfxTest; +import org.gfxtest.framework.annotations.BitBltOperation; +import org.gfxtest.framework.annotations.BitBltOperations; +import org.gfxtest.framework.annotations.GraphicsPrimitive; +import org.gfxtest.framework.annotations.GraphicsPrimitives; +import org.gfxtest.framework.annotations.RenderStyle; +import org.gfxtest.framework.annotations.RenderStyles; +import org.gfxtest.framework.annotations.TestType; +import org.gfxtest.framework.annotations.TestTypes; +import org.gfxtest.framework.annotations.Transformation; +import org.gfxtest.framework.annotations.Transformations; +import org.gfxtest.framework.annotations.Zoom; + + + + at TestType(TestTypes.RENDER_TEST) + at GraphicsPrimitive(GraphicsPrimitives.COMMON_BITMAP) + at RenderStyle(RenderStyles.NORMAL) + at BitBltOperation(BitBltOperations.BITBLT) + at Transformation(Transformations.ROTATION) + at Zoom(1) +public class BitBltAffineQuadrantRotateTransformOp extends GfxTest +{ + /** + * Entry point to the test suite. + * + * @param args not used in this case + */ + public static void main(String[] args) + { + new BitBltAffineQuadrantRotateTransformOp().runTestSuite(args); + } + +} diff -r 9da4ad7fe2ec -r 3b4f1b1e8451 src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java Tue Jun 18 14:10:38 2013 +0200 @@ -0,0 +1,76 @@ +/* + Java gfx-test framework + + Copyright (C) 2013 Red Hat + +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. +*/ + +package org.gfxtest.testsuites; + +import org.gfxtest.framework.GfxTest; +import org.gfxtest.framework.annotations.BitBltOperation; +import org.gfxtest.framework.annotations.BitBltOperations; +import org.gfxtest.framework.annotations.GraphicsPrimitive; +import org.gfxtest.framework.annotations.GraphicsPrimitives; +import org.gfxtest.framework.annotations.RenderStyle; +import org.gfxtest.framework.annotations.RenderStyles; +import org.gfxtest.framework.annotations.TestType; +import org.gfxtest.framework.annotations.TestTypes; +import org.gfxtest.framework.annotations.Transformation; +import org.gfxtest.framework.annotations.Transformations; +import org.gfxtest.framework.annotations.Zoom; + + + + at TestType(TestTypes.RENDER_TEST) + at GraphicsPrimitive(GraphicsPrimitives.COMMON_BITMAP) + at RenderStyle(RenderStyles.NORMAL) + at BitBltOperation(BitBltOperations.BITBLT) + at Transformation(Transformations.ROTATION) + at Zoom(1) +public class BitBltAffineRotateTransformOp extends GfxTest +{ + /** + * Entry point to the test suite. + * + * @param args not used in this case + */ + public static void main(String[] args) + { + new BitBltAffineRotateTransformOp().runTestSuite(args); + } + +} From ptisnovs at icedtea.classpath.org Tue Jun 18 05:20:30 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 18 Jun 2013 12:20:30 +0000 Subject: /hg/rhino-tests: Updated four tests in ScriptExceptionClassTest ... Message-ID: changeset 620b718077c0 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=620b718077c0 author: Pavel Tisnovsky date: Tue Jun 18 14:24:02 2013 +0200 Updated four tests in ScriptExceptionClassTest for (Open)JDK8 API: getField, getFields, getDeclaredField and getDeclaredFields. diffstat: ChangeLog | 6 ++ src/org/RhinoTests/ScriptExceptionClassTest.java | 70 ++++++++++++++++++++++- 2 files changed, 72 insertions(+), 4 deletions(-) diffs (121 lines): diff -r 6fb422bd339f -r 620b718077c0 ChangeLog --- a/ChangeLog Fri Jun 14 10:13:51 2013 +0200 +++ b/ChangeLog Tue Jun 18 14:24:02 2013 +0200 @@ -1,3 +1,9 @@ +2013-06-18 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptExceptionClassTest.java: + Updated four tests in ScriptExceptionClassTest for (Open)JDK8 API: + getField, getFields, getDeclaredField and getDeclaredFields. + 2013-06-14 Pavel Tisnovsky * src/org/RhinoTests/SimpleScriptContextClassTest.java: diff -r 6fb422bd339f -r 620b718077c0 src/org/RhinoTests/ScriptExceptionClassTest.java --- a/src/org/RhinoTests/ScriptExceptionClassTest.java Fri Jun 14 10:13:51 2013 +0200 +++ b/src/org/RhinoTests/ScriptExceptionClassTest.java Tue Jun 18 14:24:02 2013 +0200 @@ -505,9 +505,22 @@ }; final String[] fieldsThatShouldExist_jdk7 = { }; + final String[] fieldsThatShouldExist_jdk8 = { + }; // get the right array of field signatures - final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7; + String[] fieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + fieldsThatShouldExist = fieldsThatShouldExist_jdk6; + break; + case 7: + fieldsThatShouldExist = fieldsThatShouldExist_jdk7; + break; + case 8: + fieldsThatShouldExist = fieldsThatShouldExist_jdk8; + break; + } // get all fields Field[] fields = this.scriptExceptionClass.getFields(); @@ -538,10 +551,27 @@ "private int javax.script.ScriptException.lineNumber", "private int javax.script.ScriptException.columnNumber", }; + final String[] declaredFieldsThatShouldExist_jdk8 = { + "private static final long javax.script.ScriptException.serialVersionUID", + "private java.lang.String javax.script.ScriptException.fileName", + "private int javax.script.ScriptException.lineNumber", + "private int javax.script.ScriptException.columnNumber", + }; // get the right array of field signatures // following fields should be declared - final String[] declaredFieldsThatShouldExist = getJavaVersion() < 7 ? declaredFieldsThatShouldExist_jdk6 : declaredFieldsThatShouldExist_jdk7; + String[] declaredFieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk6; + break; + case 7: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk7; + break; + case 8: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk8; + break; + } // get all declared fields Field[] declaredFields = this.scriptExceptionClass.getDeclaredFields(); @@ -566,8 +596,21 @@ }; final String[] fieldsThatShouldExist_jdk7 = { }; + final String[] fieldsThatShouldExist_jdk8 = { + }; - final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7; + String[] fieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + fieldsThatShouldExist = fieldsThatShouldExist_jdk6; + break; + case 7: + fieldsThatShouldExist = fieldsThatShouldExist_jdk7; + break; + case 8: + fieldsThatShouldExist = fieldsThatShouldExist_jdk8; + break; + } // check if all required fields really exists for (String fieldThatShouldExists : fieldsThatShouldExist) { @@ -599,8 +642,27 @@ "lineNumber", "columnNumber", }; + final String[] declaredFieldsThatShouldExist_jdk8 = { + "serialVersionUID", + "fileName", + "lineNumber", + "columnNumber", + }; - final String[] declaredFieldsThatShouldExist = getJavaVersion() < 7 ? declaredFieldsThatShouldExist_jdk6 : declaredFieldsThatShouldExist_jdk7; + // get the right array of field signatures + // following fields should be declared + String[] declaredFieldsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk6; + break; + case 7: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk7; + break; + case 8: + declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk8; + break; + } // check if all required declared fields really exists for (String declaredFieldThatShouldExists : declaredFieldsThatShouldExist) { From alex.kasko.lists at gmail.com Tue Jun 18 06:21:21 2013 From: alex.kasko.lists at gmail.com (Alex Kasko) Date: Tue, 18 Jun 2013 17:21:21 +0400 Subject: IcedTea 1.12.5 windows build errors In-Reply-To: References: <51B9E2D0.6040805@gmail.com> <51BA52BC.6030609@gmail.com> <51BF8BBC.5080909@gmail.com> <51C041D3.7040300@gmail.com> Message-ID: <51C05ED1.5020109@gmail.com> On 06/18/2013 03:25 PM, Stefan Ring wrote: >>> And I guess you did a non-bootstrap build? >> >> I'm not sure, what exactly is "bootstrap build"? I copied patched openjdk >> sources into windows and built them calling "make" from the top directory (I >> guess this is called "control build"). > > icedtea can build an intermediate jdk, usually using gcj or ecj, and > only after that, uses it to build the real jdk. I think that's the > default behavior. It is controlled by --disable-bootstrap. The > purposes of this intermediate step are to purge the resulting binaries > of all proprietary stuff that might have crept in, and also to > facilitate building on platforms where there was no Sun-provided JDK. Got it. Yes this is a non-bootstrap build. OpenSCG's GPL openjdk6-build24 is used as a bootstrap jdk for all windows builds - http://openscg.com/se/openjdk/archive.jsp > >>> I'd try make extract. >> >> On the quick glance "make extract" leave "icedtea6-1.12.5/openjdk" directory >> unpatched. > > make patch > looks more promising ;) This one really patches openjdk directory. But results have some differences with openjdk directory obtained by running icedtea build with "make" and aborting it when patches are applied and actual openjdk build is started. I collected the differences and not sure how to interpret them (most of them are binary files): - different files list - https://gist.github.com/alexkasko/5805123 - actual diff for these files - https://gist.github.com/alexkasko/5805147 -- Regards, Alex Kasko From gnu.andrew at redhat.com Tue Jun 18 08:33:59 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Tue, 18 Jun 2013 11:33:59 -0400 (EDT) Subject: IcedTea 1.12.5 windows build errors In-Reply-To: <51C041D3.7040300@gmail.com> References: <51B9E2D0.6040805@gmail.com> <51BA52BC.6030609@gmail.com> <51BF8BBC.5080909@gmail.com> <51C041D3.7040300@gmail.com> Message-ID: <1245484709.4491846.1371569639321.JavaMail.root@redhat.com> ----- Original Message ----- > On 06/18/2013 10:43 AM, Stefan Ring wrote: > > On Tue, Jun 18, 2013 at 12:20 AM, Alex Kasko > > wrote: > >> I've built IcedTea 1.12.5 for windows-i586 successfully. If anybody want > >> to > >> test it, j2sdk-image is here - > >> https://docs.google.com/file/d/0BwRxcq1fvxU6X2liMEVVQTFuVms/edit?usp=sharing > >> (sha1: 25998c275159622bc22137f36ce1925da905e530). Tested with "make test" > >> (on windows 2000) and running "bin/jconsole.exe" on (windows 2000 and > >> windows 2003 x64). windows-amd64 build is in progress. > >> > >> I applied some patches, most of them are straightforward (use bundled > >> zip/gif/png/jpeg, exclude rhino) only one is non-obvious (windows specific > >> AWT problem, patched it "blindly", will look at it thoroughly). Patches > >> are > >> quite messy right now, I'll publish them later. > > > > Congratulations on your Windows build! > Thanks! BTW amd64 build is done [1] (sha1: > 6e1872aaeced3ba07f780b3a0583a4d6537a71a1) from the same sources as i586 > one and I'm going to look at the patches. > > > From the output, it looks like > > you were using cygwin. How much of cygwin does it need? Just make and > > the shell? > I'm using stripped down version of cygwin [2] with custom make binary [3] > > > And I guess you did a non-bootstrap build? > I'm not sure, what exactly is "bootstrap build"? I copied patched > openjdk sources into windows and built them calling "make" from the top > directory (I guess this is called "control build"). IcedTea's normal build is to build with the system JDK first, then rebuild with itself to ensure it works. That's called a bootstrap build. It sounds like you used IcedTea on another machine to patch, then transported the sources. Is that correct? > > > > >>>> Questions about all that: > >>>> 1) Is there something like "$ ./configure ; make download-openjdk" for > >>>> IcedTea 1.12.5 to get patched openjdk sources? > > > > I'd try make extract. > On the quick glance "make extract" leave "icedtea6-1.12.5/openjdk" > directory unpatched. > Well, yes. "make patch" does the patching ;-) > > [1] > https://docs.google.com/file/d/0BwRxcq1fvxU6MjlIVDVwNXRiRkk/edit?usp=sharing > [2] > https://github.com/alexkasko/openjdk-unofficial-builds/tree/master/utils/cygwin > [3] > https://github.com/alexkasko/openjdk-unofficial-builds/tree/master/utils/make > > -- > Regards, > Alex Kasko > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From gnu.andrew at redhat.com Tue Jun 18 08:34:46 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Tue, 18 Jun 2013 11:34:46 -0400 (EDT) Subject: IcedTea 1.12.5 windows build errors In-Reply-To: References: <51B9E2D0.6040805@gmail.com> <51BA52BC.6030609@gmail.com> <51BF8BBC.5080909@gmail.com> <51C041D3.7040300@gmail.com> Message-ID: <1722762302.4492081.1371569686202.JavaMail.root@redhat.com> ----- Original Message ----- > >> And I guess you did a non-bootstrap build? > > > > I'm not sure, what exactly is "bootstrap build"? I copied patched openjdk > > sources into windows and built them calling "make" from the top directory > > (I > > guess this is called "control build"). > > icedtea can build an intermediate jdk, usually using gcj or ecj, and > only after that, uses it to build the real jdk. I think that's the > default behavior. It is controlled by --disable-bootstrap. The > purposes of this intermediate step are to purge the resulting binaries > of all proprietary stuff that might have crept in, and also to > facilitate building on platforms where there was no Sun-provided JDK. > Recent versions support bootstrapping with any JDK. Please file bugs if that doesn't work. > >> I'd try make extract. > > > > On the quick glance "make extract" leave "icedtea6-1.12.5/openjdk" > > directory > > unpatched. > > make patch > looks more promising ;) > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From gnu.andrew at redhat.com Tue Jun 18 08:35:24 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Tue, 18 Jun 2013 11:35:24 -0400 (EDT) Subject: IcedTea 1.12.5 windows build errors In-Reply-To: <51C04AB9.3000404@gmail.com> References: <51B9E2D0.6040805@gmail.com> <51BA52BC.6030609@gmail.com> <51BF8BBC.5080909@gmail.com> <2132619411.4318621.1371553913761.JavaMail.root@redhat.com> <51C04AB9.3000404@gmail.com> Message-ID: <1805598949.4493025.1371569724172.JavaMail.root@redhat.com> ----- Original Message ----- > On 06/18/2013 03:11 PM, Andrew Hughes wrote: > > ----- Original Message ----- > >> I've built IcedTea 1.12.5 for windows-i586 successfully. If anybody want > >> to test it, j2sdk-image is here - > >> https://docs.google.com/file/d/0BwRxcq1fvxU6X2liMEVVQTFuVms/edit?usp=sharing > >> (sha1: 25998c275159622bc22137f36ce1925da905e530). Tested with "make > >> test" (on windows 2000) and running "bin/jconsole.exe" on (windows 2000 > >> and windows 2003 x64). windows-amd64 build is in progress. > >> > >> I applied some patches, most of them are straightforward (use bundled > >> zip/gif/png/jpeg, exclude rhino) only one is non-obvious (windows > >> specific AWT problem, patched it "blindly", will look at it thoroughly). > >> Patches are quite messy right now, I'll publish them later. > >> > >> I'm interesting in maintaining windows builds for IcedTea, is it > >> possible to have windows-specific changes upstreamed into IcedTea? > > > > This is great news! Yes, I'd love to get these changes into IcedTea for > > 1.13.0. We also do support for OpenJDK 7 (IcedTea 2.x) and are working > > on OpenJDK 8 (IcedTea 3.x), if you'd be interested in either at some point. > > 7 already has the option of turning off system library support and it's > > probably about time it was added to 1.x. > Yes, I'm going to try 2.4.0 soon. And going to leave 3.x for later > (openjdk8 new build system + MSYS will require some work). Yeah, 3.x is still a work-in-progress for use on x86_64 GNU/Linux, never mind Windows! :-D > > > > > Thanks for investing time in doing this :) > > > >> > >> On 06/14/2013 03:16 AM, Alex Kasko wrote: > >>> On 06/13/2013 07:18 PM, Alex Kasko wrote: > >>>> Hi, > >>>> > >>>> I'm trying to build IcedTea 1.12.5 for windows-i586. Ultimate goal is to > >>>> get jdk6 GPL binaries for windows and linux with latest bugfixes. I have > >>>> a virtual machine with proper environment for building openjdk6 [1] (it > >>>> builds openjdk6-build27 successfully). > >>>> > >>>> I thought, that most IcedTea changes are linux-related, and > >>>> windows-specific part should be close to openjdk6 build 27. So I ran > >>>> "./configure" (in Linux) without specific options, abort the build after > >>>> patching step and copy "icedtea6-1.12.5/openjdk" contents to windows > >>>> machine. > >>>> > >>>> During the build on windows corba, jaxp, jaxws and hotspot modules works > >>>> fine but jdk module aborted the build with AWT-related error [2] . > >>> Fixed this particular "Wheel95GetMsg" AWT error, have other AWT problems > >>> now, will report them later. > >>> > >>>> Comparing AWT sources between IcedTea 1.12.5 and current openjdk6 > >>>> mercurial tip I found a lot of windows-specific changes (Direct3D etc) > >>>> in IcedTea. > >>>> > >>>> Questions about all that: > >>>> 1) Is there something like "$ ./configure ; make download-openjdk" for > >>>> IcedTea 1.12.5 to get patched openjdk sources? > >>>> 2) Is there a switch (in 1.12.5) for using bundled zlib instead of > >>>> system one (I changed makefiles to use bundled one)? > >>>> 3) Am I understand right, that windows changes are the parts of jdk7 > >>>> backports and may not work properly with older compiler (jdk6 is built > >>>> with MSVS2003)? Or what are they for, giving that windows is not > >>>> supported platform for icedtea? > >>>> 4) Is it a good idea (for windows builds) to try to revert some windows > >>>> specific AWT-related patches in IcedTea-1.12.5 to make it closer to > >>>> openjdk6-build27? Or changes are too big for that? > >>>> > >>>> > >>>> [1] > >>>> http://hg.openjdk.java.net/jdk6/jdk6/raw-file/tip/README-builds.html#MBE > >>>> [2] https://gist.github.com/alexkasko/5773264 > >>>> > >>> > >> > >> > >> -- > >> Regards, > >> Alex Kasko > >> > > > > > -- > Regards, > Alex Kasko > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From alex.kasko.lists at gmail.com Tue Jun 18 09:01:58 2013 From: alex.kasko.lists at gmail.com (Alex Kasko) Date: Tue, 18 Jun 2013 20:01:58 +0400 Subject: IcedTea 1.12.5 windows build errors In-Reply-To: <1245484709.4491846.1371569639321.JavaMail.root@redhat.com> References: <51B9E2D0.6040805@gmail.com> <51BA52BC.6030609@gmail.com> <51BF8BBC.5080909@gmail.com> <51C041D3.7040300@gmail.com> <1245484709.4491846.1371569639321.JavaMail.root@redhat.com> Message-ID: <51C08476.8000909@gmail.com> On 06/18/2013 07:33 PM, Andrew Hughes wrote: > ----- Original Message ----- >> On 06/18/2013 10:43 AM, Stefan Ring wrote: >>> On Tue, Jun 18, 2013 at 12:20 AM, Alex Kasko >>> wrote: >>>> I've built IcedTea 1.12.5 for windows-i586 successfully. If anybody want >>>> to >>>> test it, j2sdk-image is here - >>>> https://docs.google.com/file/d/0BwRxcq1fvxU6X2liMEVVQTFuVms/edit?usp=sharing >>>> (sha1: 25998c275159622bc22137f36ce1925da905e530). Tested with "make test" >>>> (on windows 2000) and running "bin/jconsole.exe" on (windows 2000 and >>>> windows 2003 x64). windows-amd64 build is in progress. >>>> >>>> I applied some patches, most of them are straightforward (use bundled >>>> zip/gif/png/jpeg, exclude rhino) only one is non-obvious (windows specific >>>> AWT problem, patched it "blindly", will look at it thoroughly). Patches >>>> are >>>> quite messy right now, I'll publish them later. >>> >>> Congratulations on your Windows build! >> Thanks! BTW amd64 build is done [1] (sha1: >> 6e1872aaeced3ba07f780b3a0583a4d6537a71a1) from the same sources as i586 >> one and I'm going to look at the patches. >> >>> From the output, it looks like >>> you were using cygwin. How much of cygwin does it need? Just make and >>> the shell? >> I'm using stripped down version of cygwin [2] with custom make binary [3] >> >>> And I guess you did a non-bootstrap build? >> I'm not sure, what exactly is "bootstrap build"? I copied patched >> openjdk sources into windows and built them calling "make" from the top >> directory (I guess this is called "control build"). > > IcedTea's normal build is to build with the system JDK first, then rebuild > with itself to ensure it works. That's called a bootstrap build. > > It sounds like you used IcedTea on another machine to patch, then transported > the sources. Is that correct? Yes, to make clear the whole current process: 1) run "./configure" on debian wheezy amd64 2) run "make" (from the same icedtea dir), wait for all icedtea patches applied, abort build 3) copy "openjdk" dir to windows box 4) apply windows-specific patches, run windows build as a normal openjdk6 control build I think step (2) could be simplified with "make patch" I asked about details in other email in this thread - http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-June/023719.html > >> >>> >>>>>> Questions about all that: >>>>>> 1) Is there something like "$ ./configure ; make download-openjdk" for >>>>>> IcedTea 1.12.5 to get patched openjdk sources? >>> >>> I'd try make extract. >> On the quick glance "make extract" leave "icedtea6-1.12.5/openjdk" >> directory unpatched. >> > > Well, yes. "make patch" does the patching ;-) > >> >> [1] >> https://docs.google.com/file/d/0BwRxcq1fvxU6MjlIVDVwNXRiRkk/edit?usp=sharing >> [2] >> https://github.com/alexkasko/openjdk-unofficial-builds/tree/master/utils/cygwin >> [3] >> https://github.com/alexkasko/openjdk-unofficial-builds/tree/master/utils/make >> >> -- >> Regards, >> Alex Kasko >> > -- Regards, Alex Kasko From adomurad at icedtea.classpath.org Tue Jun 18 12:57:26 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Tue, 18 Jun 2013 19:57:26 +0000 Subject: /hg/icedtea-web: Extract URL to file logic in TinyHttpdImpl.java... Message-ID: changeset fa6a80c73e0d in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=fa6a80c73e0d author: Andrew Azores date: Tue Jun 18 15:57:01 2013 -0400 Extract URL to file logic in TinyHttpdImpl.java, with unit tests diffstat: ChangeLog | 7 + tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java | 38 ++++++++++ tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java | 28 ++++++- 3 files changed, 69 insertions(+), 4 deletions(-) diffs (121 lines): diff -r 1a327a09262e -r fa6a80c73e0d ChangeLog --- a/ChangeLog Mon Jun 10 13:22:53 2013 +0200 +++ b/ChangeLog Tue Jun 18 15:57:01 2013 -0400 @@ -1,3 +1,10 @@ +2013-06-18 Andrew Azores + + * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: + extracted some lines out of run() into new method urlToFilePath() + * tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java: + unit tests added for new urlToFilePath() + 2013-06-06 Jiri Vanek Andrew Azores diff -r 1a327a09262e -r fa6a80c73e0d tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java --- a/tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java Mon Jun 10 13:22:53 2013 +0200 +++ b/tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java Tue Jun 18 15:57:01 2013 -0400 @@ -39,6 +39,8 @@ import java.io.File; import java.io.FileInputStream; import java.net.URL; +import java.net.URLDecoder; + import org.junit.Assert; import org.junit.Test; @@ -217,6 +219,42 @@ Assert.assertArrayEquals(b2, bb[1]); Assert.assertArrayEquals(b3, bb[2]); } + + private static final String[] filePathTestUrls = { + "/foo.html", + "/foo/", + "/foo/bar.jar", + "/foo/bar.jar;path_param", + "/foo/bar.jar%3Bpath_param", + "/foo/bar?query=string&red=hat" + }; + + @Test + public void urlToFilePathTest() throws Exception { + for (String url : filePathTestUrls) { + String newUrl = TinyHttpdImpl.urlToFilePath(url); + + Assert.assertFalse("File path should not contain query string: " + newUrl, newUrl.contains("?")); + Assert.assertTrue("File path should be relative: " + newUrl, newUrl.startsWith("./")); + Assert.assertFalse("File path should not contain \"/XslowX\":" + newUrl, + newUrl.toLowerCase().contains("/XslowX".toLowerCase())); + + if (url.endsWith("/")) { + Assert.assertTrue(newUrl.endsWith("/index.html")); + } + } + } + + @Test + public void urlToFilePathUrlDecodeTest() throws Exception { + // This test may fail with strange original URLs, eg those containing the substring "%253B", + // which can be decoded into "%3B", then decoded again into ';'. + + for (String url : filePathTestUrls) { + String newUrl = TinyHttpdImpl.urlToFilePath(url); + Assert.assertEquals(newUrl, URLDecoder.decode(newUrl, "UTF-8")); + } + } @Test public void stripHttpPathParamTest() { diff -r 1a327a09262e -r fa6a80c73e0d tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java --- a/tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java Mon Jun 10 13:22:53 2013 +0200 +++ b/tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java Tue Jun 18 15:57:01 2013 -0400 @@ -42,6 +42,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; import java.net.HttpURLConnection; import java.net.Socket; import java.net.SocketException; @@ -124,10 +125,7 @@ p = p.replace(XSX, "/"); } ServerAccess.logNoReprint("Getting: " + p); - p = URLDecoder.decode(p, "UTF-8"); - p = p.replaceAll("\\?.*", ""); - p = (".".concat((p.endsWith("/")) ? p.concat("index.html") : p)).replace('/', File.separatorChar); - p = stripHttpPathParams(p); + p = urlToFilePath(p); ServerAccess.logNoReprint("Serving: " + p); File pp = new File(dir, p); int l = (int) pp.length(); @@ -206,6 +204,28 @@ } /** + * This function transforms a request URL into a path to a file which the server + * will return to the requester. + * @param url - the request URL + * @return a String representation of the local path to the file + * @throws UnsupportedEncodingException + */ + public static String urlToFilePath(String url) throws UnsupportedEncodingException { + url = URLDecoder.decode(url, "UTF-8"); // Decode URL encoded charaters, eg "%3B" b ecomes ';' + if (url.startsWith(XSX)) { + url = url.replace(XSX, "/"); + } + url = url.replaceAll("\\?.*", ""); // Remove query string from URL + url = ".".concat(url); // Change path into relative path + if (url.endsWith("/")) { + url += "index.html"; + } + url = url.replace('/', File.separatorChar); // If running on Windows, replace '/' in path with "\\" + url = stripHttpPathParams(url); + return url; + } + + /** * This function removes the HTTP Path Parameter from a given JAR URL, assuming that the * path param delimiter is a semicolon * @param url - the URL from which to remove the path parameter From guillaume at alaux.net Tue Jun 18 13:25:01 2013 From: guillaume at alaux.net (Guillaume Alaux) Date: Tue, 18 Jun 2013 22:25:01 +0200 Subject: Icedtea 2.4.0, build CACAO/OpenJDK -> 'ERROR: You seem to not have installed ALSA 0.9.1 or higher.' In-Reply-To: <1489985457.3796467.1371481316040.JavaMail.root@redhat.com> References: <51B91691.2040401@gmail.com> <51BB627D.8050506@gmail.com> <1489985457.3796467.1371481316040.JavaMail.root@redhat.com> Message-ID: On 17 June 2013 17:01, Andrew Hughes wrote: > > ----- Original Message ----- > > On 15 June 2013 09:23, Guillaume Alaux wrote: > > > On 14 June 2013 21:15, Stefan Ring wrote: > > >> > > >> > However, I noticed some errors in the build output that might be > > >> > related, > > >> > e.g. http://pastebin.com/F1gETRkH, line 1091: > > >> > /bin/sh: /bin/egrep: No such file or directory > > >> > > > >> > On my system: > > >> > $ which egrep > > >> > /usr/bin/egrep > > >> > > >> /bin, /usr/bin unification seems to be all the rage these days. On my > > >> Fedora system, /bin is actually a symlink to /usr/bin. In your case, I > > >> would create a fresh bin directory somewhere (in your home), symlink > > >> everything from both /bin and /usr/bin there and use that as > > >> UNIXCOMMAND_PATH. > > >> > > >> > I need to build new CACAO sources because I'm working on a related > > >> > project > > >> > as part of an undergrad course and later my Bachelor thesis. I have > > >> > built it > > >> > before with GNU Classpath and without IcedTea, but I wanted to try > > >> > OpenJDK > > >> > as well. If there is a way to build CACAO for OpenJDK without building > > >> > OpenJDK itself and you could point it out to me, I might not give up on > > >> > it > > >> > now. > > >> > > >> Build it with icedtea. Once you have a build, you'll not need to touch > > >> the icedtea/OpenJDK bits anymore. > > > > > > As for binaries not beeing on the expected path, I would just like to > > > point out that to build it for Arch, we patch these as shown here [0] > > > [1]. You could have a look at the complete build process for Arch here > > > BTW [2]. > > > > > > Also, downloading the sources of the Arch package and modifying them > > > for your needs could be an easier start. > > > > > > [0] > > > https://projects.archlinux.org/svntogit/packages.git/tree/trunk/01_fix_openjdk_cmds_path.diff?h=packages/java7-openjdk > > > [1] > > > https://projects.archlinux.org/svntogit/packages.git/tree/trunk/02_fix_corba_cmds_path.diff?h=packages/java7-openjdk > > > [2] > > > https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/java7-openjdk > > > > > > -- > > > Guillaume > > > > I have just checked and you don't even need these path fixing patches > > if you have performed the /usr/bin move. > > > > The correct solution would be for IcedTea to detect and set these, I think. > > Please let us know if you have patches that could be adapted for IcedTea :) > -- > Andrew :) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > PGP Key: 248BDC07 (https://keys.indymedia.org/) > Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 > Well I just got rid of the two patches we had in Arch for these paths as now /bin, /sbin and /usr/sbin all point at /usr/bin. @OP: managed to build a running CACAO OpenJDK with this Arch package source [0]: % java -version java version "1.7.0_40" IcedTea Runtime Environment (2.4.0) (ArchLinux build 7.u40_2.4.0.cacao-1-x86_64) CACAO (build 1.6.1pre+re215e36be9fc, compiled mode) % javac -version javac 1.7.0_40 [0] http://pkgbuild.com/~guillaume/misc/java7-openjdk-7.u40_2.4.0.cacao-1.src.tar.gz -- Guillaume From andrew at icedtea.classpath.org Tue Jun 18 14:09:46 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 18 Jun 2013 21:09:46 +0000 Subject: /hg/release/icedtea7-forest-2.1/corba: 2 new changesets Message-ID: changeset a8b5c32af54e in /hg/release/icedtea7-forest-2.1/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/corba?cmd=changeset;node=a8b5c32af54e author: andrew date: Wed Jun 12 12:00:25 2013 +0100 8000642: Better handling of objects for transportation Summary: Also reviewed by alexander.fomin Reviewed-by: alanb, mchung, skoivu changeset ce773a499f3a in /hg/release/icedtea7-forest-2.1/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/corba?cmd=changeset;node=ce773a499f3a author: andrew date: Wed Jun 12 12:03:45 2013 +0100 8001032: Restrict object access Summary: Restrict object access; fix reviewed also by Alexander Fomin Reviewed-by: alanb, ahgross diffstat: make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk | 3 +- src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java | 3 +- src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java | 12 +- src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java | 5 +- src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java | 4 +- src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java | 8 +- src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java | 5 +- src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java | 3 +- src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java | 18 +- src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java | 8 +- src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java | 10 +- src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java | 2 +- src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java | 2 +- src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java | 10 +- src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java | 3 +- src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java | 5 +- src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java | 8 +- src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java | 3 +- src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java | 5 +- src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java | 5 +- src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java | 7 +- src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java | 11 +- src/share/classes/com/sun/corba/se/impl/orb/ORBDataParserImpl.java | 3 +- src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java | 5 +- src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java | 4 +- src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java | 22 +- src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java | 8 +- src/share/classes/com/sun/corba/se/impl/protocol/CorbaMessageMediatorImpl.java | 22 +- src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_2.java | 3 +- src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageBase.java | 8 +- src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_0.java | 3 +- src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_1.java | 3 +- src/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoBase.java | 4 +- src/share/classes/com/sun/corba/se/impl/transport/SharedCDRContactInfoImpl.java | 4 +- src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java | 8 +- src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java | 6 +- src/share/classes/com/sun/corba/se/spi/ior/TaggedComponentBase.java | 5 +- src/share/classes/com/sun/corba/se/spi/orb/ORB.java | 6 +- src/share/classes/com/sun/corba/se/spi/orb/OperationFactory.java | 8 +- src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContext.java | 5 +- src/share/classes/org/omg/CORBA_2_3/portable/OutputStream.java | 40 ++- src/share/classes/sun/corba/JavaCorbaAccess.java | 3 +- src/share/classes/sun/corba/OutputStreamFactory.java | 149 ++++++++++ 43 files changed, 339 insertions(+), 120 deletions(-) diffs (truncated from 1285 to 500 lines): diff -r 2302bd5191fe -r ce773a499f3a make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk --- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk Wed May 22 18:20:25 2013 +0100 +++ b/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -39,7 +39,6 @@ com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java \ com/sun/corba/se/impl/orbutil/ORBConstants.java \ com/sun/corba/se/impl/orbutil/ORBUtility.java \ - com/sun/corba/se/impl/orbutil/ORBClassLoader.java \ com/sun/corba/se/impl/orbutil/RepIdDelegator.java \ com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java \ com/sun/corba/se/impl/orbutil/RepositoryIdStrings.java \ diff -r 2302bd5191fe -r ce773a499f3a src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java --- a/src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java Wed May 22 18:20:25 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -81,7 +81,6 @@ import com.sun.corba.se.impl.oa.poa.BadServerIdHandler; import com.sun.corba.se.impl.orbutil.ORBConstants; -import com.sun.corba.se.impl.orbutil.ORBClassLoader; import com.sun.corba.se.impl.orbutil.ORBUtility; import com.sun.corba.se.impl.util.Utility; diff -r 2302bd5191fe -r ce773a499f3a src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java --- a/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Wed May 22 18:20:25 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,6 +33,8 @@ import java.io.Serializable; import java.math.BigDecimal; +import java.security.AccessController; +import java.security.PrivilegedAction; import java.util.List ; import java.util.ArrayList ; @@ -504,7 +506,13 @@ public org.omg.CORBA.portable.OutputStream create_output_stream() { //debug.log ("create_output_stream"); - return new AnyOutputStream(orb); + final ORB finalorb = this.orb; + return AccessController.doPrivileged(new PrivilegedAction() { + @Override + public AnyOutputStream run() { + return new AnyOutputStream(finalorb); + } + }); } /** diff -r 2302bd5191fe -r ce773a499f3a src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java --- a/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java Wed May 22 18:20:25 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -600,7 +600,8 @@ } public static CDROutputStream newOutputStream(ORB orb) { - TypeCodeOutputStream tcos = new TypeCodeOutputStream((ORB)orb); + TypeCodeOutputStream tcos = + sun.corba.OutputStreamFactory.newTypeCodeOutputStream(orb); //if (debug) System.out.println("Created TypeCodeOutputStream " + tcos + // " with no parent"); return tcos; diff -r 2302bd5191fe -r ce773a499f3a src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java --- a/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java Wed May 22 18:20:25 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -66,7 +66,7 @@ * * @author Ram Jeyaraman */ -public class IDLJavaSerializationOutputStream extends CDROutputStreamBase { +final class IDLJavaSerializationOutputStream extends CDROutputStreamBase { private ORB orb; private byte encodingVersion; diff -r 2302bd5191fe -r ce773a499f3a src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java --- a/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java Wed May 22 18:20:25 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -196,7 +196,8 @@ } public TypeCodeOutputStream createEncapsulation(org.omg.CORBA.ORB _orb) { - TypeCodeOutputStream encap = new TypeCodeOutputStream((ORB)_orb, isLittleEndian()); + TypeCodeOutputStream encap = + sun.corba.OutputStreamFactory.newTypeCodeOutputStream((ORB)_orb, isLittleEndian()); encap.setEnclosingOutputStream(this); encap.makeEncapsulation(); //if (TypeCodeImpl.debug) System.out.println("Created TypeCodeOutputStream " + encap + " with parent " + this); @@ -211,7 +212,8 @@ public static TypeCodeOutputStream wrapOutputStream(OutputStream os) { boolean littleEndian = ((os instanceof CDROutputStream) ? ((CDROutputStream)os).isLittleEndian() : false); - TypeCodeOutputStream tos = new TypeCodeOutputStream((ORB)os.orb(), littleEndian); + TypeCodeOutputStream tos = + sun.corba.OutputStreamFactory.newTypeCodeOutputStream((ORB)os.orb(), littleEndian); tos.setEnclosingOutputStream(os); //if (TypeCodeImpl.debug) System.out.println("Created TypeCodeOutputStream " + tos + " with parent " + os); return tos; diff -r 2302bd5191fe -r ce773a499f3a src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java --- a/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java Wed May 22 18:20:25 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -155,7 +155,8 @@ // be versioned. This can be handled once this work is complete. // Create output stream with default endianness. - EncapsOutputStream cdrOut = new EncapsOutputStream( + EncapsOutputStream cdrOut = + sun.corba.OutputStreamFactory.newEncapsOutputStream( (com.sun.corba.se.spi.orb.ORB)orb, giopVersion ); // This is an encapsulation, so put out the endian: diff -r 2302bd5191fe -r ce773a499f3a src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java --- a/src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java Wed May 22 18:20:25 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -77,7 +77,6 @@ import com.sun.corba.se.impl.logging.ORBUtilSystemException; import com.sun.corba.se.impl.logging.OMGSystemException; import com.sun.corba.se.impl.corba.RequestImpl; -import com.sun.corba.se.impl.orbutil.ORBClassLoader; import com.sun.corba.se.impl.orbutil.ORBConstants; import com.sun.corba.se.impl.orbutil.ORBUtility; import com.sun.corba.se.impl.orbutil.StackImpl; diff -r 2302bd5191fe -r ce773a499f3a src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java --- a/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java Wed May 22 18:20:25 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -86,13 +86,14 @@ import com.sun.corba.se.impl.encoding.EncapsOutputStream; import com.sun.corba.se.impl.orbutil.ORBUtility; -import com.sun.corba.se.impl.orbutil.ORBClassLoader; import com.sun.corba.se.impl.util.RepositoryId; import com.sun.corba.se.impl.logging.InterceptorsSystemException; import com.sun.corba.se.impl.logging.OMGSystemException; +import sun.corba.SharedSecrets; + /** * Implementation of the RequestInfo interface as specified in * orbos/99-12-02 section 5.4.1. @@ -452,7 +453,8 @@ // Find the read method on the helper class: String helperClassName = className + "Helper"; - Class helperClass = ORBClassLoader.loadClass( helperClassName ); + Class helperClass = + SharedSecrets.getJavaCorbaAccess().loadClass( helperClassName ); Class[] readParams = new Class[1]; readParams[0] = org.omg.CORBA.portable.InputStream.class; Method readMethod = helperClass.getMethod( "read", readParams ); @@ -512,7 +514,8 @@ Class exceptionClass = userException.getClass(); String className = exceptionClass.getName(); String helperClassName = className + "Helper"; - Class helperClass = ORBClassLoader.loadClass( helperClassName ); + Class helperClass = + SharedSecrets.getJavaCorbaAccess().loadClass( helperClassName ); // Find insert( Any, class ) method Class[] insertMethodParams = new Class[2]; @@ -656,7 +659,8 @@ // Convert the "core" service context to an // "IOP" ServiceContext by writing it to a // CDROutputStream and reading it back. - EncapsOutputStream out = new EncapsOutputStream(myORB); + EncapsOutputStream out = + sun.corba.OutputStreamFactory.newEncapsOutputStream(myORB); context.write( out, GIOPVersion.V1_2 ); InputStream inputStream = out.create_input_stream(); @@ -692,8 +696,8 @@ { int id = 0 ; // Convert IOP.service_context to core.ServiceContext: - EncapsOutputStream outputStream = new EncapsOutputStream( - myORB ); + EncapsOutputStream outputStream = + sun.corba.OutputStreamFactory.newEncapsOutputStream(myORB); InputStream inputStream = null; UnknownServiceContext coreServiceContext = null; ServiceContextHelper.write( outputStream, service_context ); diff -r 2302bd5191fe -r ce773a499f3a src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java --- a/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Wed May 22 18:20:25 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Wed Jun 12 12:03:45 2013 +0100 @@ -300,11 +300,11 @@ resetStream(); } - public final void setOrbStream(org.omg.CORBA_2_3.portable.InputStream os) { + final void setOrbStream(org.omg.CORBA_2_3.portable.InputStream os) { orbStream = os; } - public final org.omg.CORBA_2_3.portable.InputStream getOrbStream() { + final org.omg.CORBA_2_3.portable.InputStream getOrbStream() { return orbStream; } @@ -327,11 +327,11 @@ return (javax.rmi.CORBA.ValueHandler) vhandler; } - public final void increaseRecursionDepth(){ + final void increaseRecursionDepth(){ recursionDepth++; } - public final int decreaseRecursionDepth(){ + final int decreaseRecursionDepth(){ return --recursionDepth; } diff -r 2302bd5191fe -r ce773a499f3a src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java --- a/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java Wed May 22 18:20:25 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -124,19 +124,19 @@ } } - public final void setOrbStream(org.omg.CORBA_2_3.portable.OutputStream os) { + final void setOrbStream(org.omg.CORBA_2_3.portable.OutputStream os) { orbStream = os; } - public final org.omg.CORBA_2_3.portable.OutputStream getOrbStream() { + final org.omg.CORBA_2_3.portable.OutputStream getOrbStream() { return orbStream; } - public final void increaseRecursionDepth(){ + final void increaseRecursionDepth(){ recursionDepth++; } - public final int decreaseRecursionDepth(){ + final int decreaseRecursionDepth(){ return --recursionDepth; } diff -r 2302bd5191fe -r ce773a499f3a src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java --- a/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java Wed May 22 18:20:25 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java Wed Jun 12 12:03:45 2013 +0100 @@ -251,7 +251,7 @@ } protected abstract byte getStreamFormatVersion(); - protected abstract org.omg.CORBA_2_3.portable.InputStream getOrbStream(); + abstract org.omg.CORBA_2_3.portable.InputStream getOrbStream(); // Description of possible actions protected static class ReadObjectState { diff -r 2302bd5191fe -r ce773a499f3a src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java --- a/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java Wed May 22 18:20:25 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java Wed Jun 12 12:03:45 2013 +0100 @@ -179,7 +179,7 @@ putFields.write(this); } - public abstract org.omg.CORBA_2_3.portable.OutputStream getOrbStream(); + abstract org.omg.CORBA_2_3.portable.OutputStream getOrbStream(); protected abstract void beginOptionalCustomData(); diff -r 2302bd5191fe -r ce773a499f3a src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java --- a/src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java Wed May 22 18:20:25 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -98,6 +98,14 @@ public ValueHandlerImpl newValueHandlerImpl() { return ValueHandlerImpl.getInstance(); } + public Class loadClass(String className) throws ClassNotFoundException { + if (Thread.currentThread().getContextClassLoader() != null) { + return Thread.currentThread().getContextClassLoader(). + loadClass(className); + } else { + return ClassLoader.getSystemClassLoader().loadClass(className); + } + } }); } diff -r 2302bd5191fe -r ce773a499f3a src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java --- a/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java Wed May 22 18:20:25 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java Wed Jun 12 12:03:45 2013 +0100 @@ -128,7 +128,8 @@ static public void writeEncapsulation( WriteContents obj, OutputStream os ) { - EncapsOutputStream out = new EncapsOutputStream( (ORB)os.orb() ) ; + EncapsOutputStream out = + sun.corba.OutputStreamFactory.newEncapsOutputStream((ORB)os.orb()); out.putEndian() ; diff -r 2302bd5191fe -r ce773a499f3a src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java --- a/src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java Wed May 22 18:20:25 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -95,7 +95,8 @@ public org.omg.IOP.TaggedProfile getIOPProfile() { - EncapsOutputStream os = new EncapsOutputStream( orb ) ; + EncapsOutputStream os = + sun.corba.OutputStreamFactory.newEncapsOutputStream(orb); write( os ) ; InputStream is = (InputStream)(os.create_input_stream()) ; return org.omg.IOP.TaggedProfileHelper.read( is ) ; diff -r 2302bd5191fe -r ce773a499f3a src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java --- a/src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java Wed May 22 18:20:25 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -213,7 +213,8 @@ { StringWriter bs; - MarshalOutputStream s = new EncapsOutputStream(factory); + MarshalOutputStream s = + sun.corba.OutputStreamFactory.newEncapsOutputStream(factory); s.putEndian(); write( (OutputStream)s ); bs = new StringWriter(); @@ -237,7 +238,8 @@ } public org.omg.IOP.IOR getIOPIOR() { - EncapsOutputStream os = new EncapsOutputStream(factory); + EncapsOutputStream os = + sun.corba.OutputStreamFactory.newEncapsOutputStream(factory); write(os); InputStream is = (InputStream) (os.create_input_stream()); return org.omg.IOP.IORHelper.read(is); diff -r 2302bd5191fe -r ce773a499f3a src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java --- a/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java Wed May 22 18:20:25 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java Wed Jun 12 12:03:45 2013 +0100 @@ -87,7 +87,8 @@ public byte[] getBytes( org.omg.CORBA.ORB orb ) { - EncapsOutputStream os = new EncapsOutputStream( (ORB)orb ) ; + EncapsOutputStream os = + sun.corba.OutputStreamFactory.newEncapsOutputStream((ORB)orb); write( os ) ; return os.toByteArray() ; } diff -r 2302bd5191fe -r ce773a499f3a src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java --- a/src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java Wed May 22 18:20:25 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -61,7 +61,8 @@ public TaggedComponent create( org.omg.CORBA.ORB orb, org.omg.IOP.TaggedComponent comp ) { - EncapsOutputStream os = new EncapsOutputStream( (ORB)orb ) ; + EncapsOutputStream os = + sun.corba.OutputStreamFactory.newEncapsOutputStream((ORB)orb); org.omg.IOP.TaggedComponentHelper.write( os, comp ) ; InputStream is = (InputStream)(os.create_input_stream() ) ; // Skip the component ID: we just wrote it out above diff -r 2302bd5191fe -r ce773a499f3a src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java --- a/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java Wed May 22 18:20:25 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -247,7 +247,8 @@ public org.omg.IOP.TaggedProfile getIOPProfile() { - EncapsOutputStream os = new EncapsOutputStream( orb ) ; + EncapsOutputStream os = + sun.corba.OutputStreamFactory.newEncapsOutputStream(orb); os.write_long( getId() ) ; write( os ) ; InputStream is = (InputStream)(os.create_input_stream()) ; diff -r 2302bd5191fe -r ce773a499f3a src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java --- a/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java Wed May 22 18:20:25 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -132,8 +132,9 @@ // Note that this cannot be accomplished with a codec! // Use the byte order of the given stream - OutputStream encapsulatedOS = new EncapsOutputStream( (ORB)os.orb(), - ((CDROutputStream)os).isLittleEndian() ) ; + OutputStream encapsulatedOS = + sun.corba.OutputStreamFactory.newEncapsOutputStream( + (ORB)os.orb(), ((CDROutputStream)os).isLittleEndian() ) ; okeyTemplate.write( id, encapsulatedOS ) ; EncapsulationUtility.writeOutputStream( encapsulatedOS, os ) ; diff -r 2302bd5191fe -r ce773a499f3a src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java --- a/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java Wed May 22 18:20:25 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ From andrew at icedtea.classpath.org Tue Jun 18 14:09:57 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 18 Jun 2013 21:09:57 +0000 Subject: /hg/release/icedtea7-forest-2.1/jaxws: 8009008: Better manage ma... Message-ID: changeset 3532f4415fd5 in /hg/release/icedtea7-forest-2.1/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jaxws?cmd=changeset;node=3532f4415fd5 author: mkos date: Thu Mar 21 11:08:05 2013 -0400 8009008: Better manage management-api Summary: Preventing management-api methods from invoking reflection on inappropriate methods; fix reviewed also by Alexander Fomin Reviewed-by: mullan, skoivu diffstat: sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java | 6 ++-- sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java | 6 ++-- sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java | 6 ++-- sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java | 6 ++-- sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java | 6 ++-- sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java | 15 ++++++++-- sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java | 5 ++- sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java | 6 ++-- 8 files changed, 33 insertions(+), 23 deletions(-) diffs (272 lines): diff -r 3b68ea3b56d8 -r 3532f4415fd5 sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java --- a/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java Wed May 22 18:20:24 2013 +0100 +++ b/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java Thu Mar 21 11:08:05 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,6 @@ package com.sun.org.glassfish.external.statistics.impl; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; import com.sun.org.glassfish.external.statistics.AverageRangeStatistic; @@ -139,6 +138,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + checkMethod(method); + Object result; try { result = method.invoke(this, args); @@ -147,7 +148,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 3b68ea3b56d8 -r 3532f4415fd5 sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java --- a/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java Wed May 22 18:20:24 2013 +0100 +++ b/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java Thu Mar 21 11:08:05 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.BoundaryStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -81,6 +80,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -89,7 +90,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 3b68ea3b56d8 -r 3532f4415fd5 sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java --- a/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java Wed May 22 18:20:24 2013 +0100 +++ b/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java Thu Mar 21 11:08:05 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.BoundedRangeStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -145,6 +144,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -153,7 +154,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 3b68ea3b56d8 -r 3532f4415fd5 sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java --- a/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java Wed May 22 18:20:24 2013 +0100 +++ b/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java Thu Mar 21 11:08:05 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.CountStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -103,6 +102,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -111,7 +112,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 3b68ea3b56d8 -r 3532f4415fd5 sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java --- a/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java Wed May 22 18:20:24 2013 +0100 +++ b/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java Thu Mar 21 11:08:05 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.RangeStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -125,6 +124,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -133,7 +134,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 3b68ea3b56d8 -r 3532f4415fd5 sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java --- a/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java Wed May 22 18:20:24 2013 +0100 +++ b/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java Thu Mar 21 11:08:05 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,8 +26,8 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.Statistic; -import java.io.Serializable; -import java.util.concurrent.atomic.AtomicLong; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -133,4 +133,13 @@ protected static boolean isValidString(String str) { return (str!=null && str.length()>0); } + + protected void checkMethod(Method method) { + if (method == null || method.getDeclaringClass() == null + || !Statistic.class.isAssignableFrom(method.getDeclaringClass()) + || Modifier.isStatic(method.getModifiers())) { + throw new RuntimeException("Invalid method on invoke"); + } + } + } diff -r 3b68ea3b56d8 -r 3532f4415fd5 sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java --- a/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java Wed May 22 18:20:24 2013 +0100 +++ b/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java Thu Mar 21 11:08:05 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -90,6 +90,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -98,7 +100,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 3b68ea3b56d8 -r 3532f4415fd5 sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java --- a/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java Wed May 22 18:20:24 2013 +0100 +++ b/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java Thu Mar 21 11:08:05 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,7 +28,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.TimeStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -145,6 +144,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -153,7 +154,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } From andrew at icedtea.classpath.org Tue Jun 18 14:10:04 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 18 Jun 2013 21:10:04 +0000 Subject: /hg/release/icedtea7-forest-2.1/langtools: 2 new changesets Message-ID: changeset c8c0f2fc2038 in /hg/release/icedtea7-forest-2.1/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/langtools?cmd=changeset;node=c8c0f2fc2038 author: andrew date: Wed Jun 12 12:23:44 2013 +0100 8012375: Improve Javadoc framing Reviewed-by: mduigou, jlaskey changeset 26a29796b374 in /hg/release/icedtea7-forest-2.1/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/langtools?cmd=changeset;node=26a29796b374 author: bpatel date: Wed Jun 05 14:31:54 2013 -0700 8015997: Additional improvement in Javadoc framing Reviewed-by: jjg diffstat: src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java | 38 +++++++++- 1 files changed, 36 insertions(+), 2 deletions(-) diffs (54 lines): diff -r 9a3628594576 -r 26a29796b374 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Wed May 22 18:20:23 2013 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Wed Jun 05 14:31:54 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -309,8 +309,42 @@ String scriptCode = DocletConstants.NL + " targetPage = \"\" + window.location.search;" + DocletConstants.NL + " if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL + " targetPage = targetPage.substring(1);" + DocletConstants.NL + - " if (targetPage.indexOf(\":\") != -1)" + DocletConstants.NL + + " if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + DocletConstants.NL + " targetPage = \"undefined\";" + DocletConstants.NL + + " function validURL(url) {" + DocletConstants.NL + + " var pos = url.indexOf(\".html\");" + DocletConstants.NL + + " if (pos == -1 || pos != url.length - 5)" + DocletConstants.NL + + " return false;" + DocletConstants.NL + + " var allowNumber = false;" + DocletConstants.NL + + " var allowSep = false;" + DocletConstants.NL + + " var seenDot = false;" + DocletConstants.NL + + " for (var i = 0; i < url.length - 5; i++) {" + DocletConstants.NL + + " var ch = url.charAt(i);" + DocletConstants.NL + + " if ('a' <= ch && ch <= 'z' ||" + DocletConstants.NL + + " 'A' <= ch && ch <= 'Z' ||" + DocletConstants.NL + + " ch == '$' ||" + DocletConstants.NL + + " ch == '_') {" + DocletConstants.NL + + " allowNumber = true;" + DocletConstants.NL + + " allowSep = true;" + DocletConstants.NL + + " } else if ('0' <= ch && ch <= '9'" + DocletConstants.NL + + " || ch == '-') {" + DocletConstants.NL + + " if (!allowNumber)" + DocletConstants.NL + + " return false;" + DocletConstants.NL + + " } else if (ch == '/' || ch == '.') {" + DocletConstants.NL + + " if (!allowSep)" + DocletConstants.NL + + " return false;" + DocletConstants.NL + + " allowNumber = false;" + DocletConstants.NL + + " allowSep = false;" + DocletConstants.NL + + " if (ch == '.')" + DocletConstants.NL + + " seenDot = true;" + DocletConstants.NL + + " if (ch == '/' && seenDot)" + DocletConstants.NL + + " return false;" + DocletConstants.NL + + " } else {" + DocletConstants.NL + + " return false;"+ DocletConstants.NL + + " }" + DocletConstants.NL + + " }" + DocletConstants.NL + + " return true;" + DocletConstants.NL + + " }" + DocletConstants.NL + " function loadFrames() {" + DocletConstants.NL + " if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL + " top.classFrame.location = top.targetPage;" + DocletConstants.NL + From andrew at icedtea.classpath.org Tue Jun 18 14:10:11 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 18 Jun 2013 21:10:11 +0000 Subject: /hg/release/icedtea7-forest-2.1/hotspot: 3 new changesets Message-ID: changeset 8ffc52aa2e4d in /hg/release/icedtea7-forest-2.1/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot?cmd=changeset;node=8ffc52aa2e4d author: andrew date: Wed Apr 17 21:26:58 2013 +0100 PR1378: Add AArch64 support to Zero changeset 0d81d5904952 in /hg/release/icedtea7-forest-2.1/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot?cmd=changeset;node=0d81d5904952 author: hseigel date: Tue Mar 12 16:23:30 2013 -0400 7158805: Better rewriting of nested subroutine calls Reviewed-by: mschoene, coleenp changeset 8a0d63301cfd in /hg/release/icedtea7-forest-2.1/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot?cmd=changeset;node=8a0d63301cfd author: andrew date: Wed Jun 12 15:22:15 2013 +0100 8001330: Improve on checking order Reviewed-by: acorn, hawtin diffstat: src/os/linux/vm/os_linux.cpp | 10 +++- src/share/vm/classfile/javaClasses.cpp | 28 +++++++++- src/share/vm/classfile/javaClasses.hpp | 11 +++- src/share/vm/classfile/vmSymbols.hpp | 4 +- src/share/vm/memory/allocation.cpp | 43 +++++++++------ src/share/vm/memory/allocation.hpp | 63 ++++++++++++++++------ src/share/vm/memory/allocation.inline.hpp | 14 +++- src/share/vm/memory/resourceArea.cpp | 15 ++-- src/share/vm/memory/resourceArea.hpp | 6 +- src/share/vm/memory/universe.cpp | 23 ++++++++- src/share/vm/memory/universe.hpp | 4 +- src/share/vm/oops/generateOopMap.cpp | 21 +++++-- src/share/vm/prims/jvm.cpp | 85 ++++++++++++++++++++++++++++-- 13 files changed, 256 insertions(+), 71 deletions(-) diffs (truncated from 858 to 500 lines): diff -r 04c3fb903cf3 -r 8a0d63301cfd src/os/linux/vm/os_linux.cpp --- a/src/os/linux/vm/os_linux.cpp Tue May 28 19:43:58 2013 +0200 +++ b/src/os/linux/vm/os_linux.cpp Wed Jun 12 15:22:15 2013 +0100 @@ -132,6 +132,11 @@ #define SEC_IN_NANOSECS 1000000000LL #define LARGEPAGES_BIT (1 << 6) + +#ifndef EM_AARCH64 +#define EM_AARCH64 183 /* ARM AARCH64 */ +#endif + //////////////////////////////////////////////////////////////////////////////// // global variables julong os::Linux::_physical_memory = 0; @@ -1893,7 +1898,8 @@ {EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"}, {EM_PARISC, EM_PARISC, ELFCLASS32, ELFDATA2MSB, (char*)"PARISC"}, {EM_68K, EM_68K, ELFCLASS32, ELFDATA2MSB, (char*)"M68k"}, - {EM_SH, EM_SH, ELFCLASS32, ELFDATA2LSB, (char*)"SH"} /* Support little endian only*/ + {EM_SH, EM_SH, ELFCLASS32, ELFDATA2LSB, (char*)"SH"}, /* Support little endian only*/ + {EM_AARCH64, EM_AARCH64, ELFCLASS64, ELFDATA2LSB, (char*)"AARCH64"} /* Support little endian only*/ }; #if (defined IA32) @@ -1926,6 +1932,8 @@ static Elf32_Half running_arch_code=EM_68K; #elif (defined SH) static Elf32_Half running_arch_code=EM_SH; + #elif (defined AARCH64) + static Elf32_Half running_arch_code=EM_AARCH64; #else #error Method os::dll_load requires that one of following is defined:\ IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K, SH diff -r 04c3fb903cf3 -r 8a0d63301cfd src/share/vm/classfile/javaClasses.cpp --- a/src/share/vm/classfile/javaClasses.cpp Tue May 28 19:43:58 2013 +0200 +++ b/src/share/vm/classfile/javaClasses.cpp Wed Jun 12 15:22:15 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -2720,6 +2720,7 @@ int java_security_AccessControlContext::_context_offset = 0; int java_security_AccessControlContext::_privilegedContext_offset = 0; int java_security_AccessControlContext::_isPrivileged_offset = 0; +int java_security_AccessControlContext::_isAuthorized_offset = -1; void java_security_AccessControlContext::compute_offsets() { assert(_isPrivileged_offset == 0, "offsets should be initialized only once"); @@ -2740,9 +2741,20 @@ fatal("Invalid layout of java.security.AccessControlContext"); } _isPrivileged_offset = fd.offset(); + + // The offset may not be present for bootstrapping with older JDK. + if (ik->find_local_field(vmSymbols::isAuthorized_name(), vmSymbols::bool_signature(), &fd)) { + _isAuthorized_offset = fd.offset(); + } } +bool java_security_AccessControlContext::is_authorized(Handle context) { + assert(context.not_null() && context->klass() == SystemDictionary::AccessControlContext_klass(), "Invalid type"); + assert(_isAuthorized_offset != -1, "should be set"); + return context->bool_field(_isAuthorized_offset) != 0; +} + oop java_security_AccessControlContext::create(objArrayHandle context, bool isPrivileged, Handle privileged_context, TRAPS) { assert(_isPrivileged_offset != 0, "offsets should have been initialized"); // Ensure klass is initialized @@ -2753,6 +2765,8 @@ result->obj_field_put(_context_offset, context()); result->obj_field_put(_privilegedContext_offset, privileged_context()); result->bool_field_put(_isPrivileged_offset, isPrivileged); + // whitelist AccessControlContexts created by the JVM. + result->bool_field_put(_isAuthorized_offset, true); return result; } @@ -2833,6 +2847,15 @@ } +bool java_lang_System::has_security_manager() { + instanceKlass* ik = instanceKlass::cast(SystemDictionary::System_klass()); + address addr = ik->static_field_addr(static_security_offset); + if (UseCompressedOops) { + return oopDesc::load_decode_heap_oop((narrowOop *)addr) != NULL; + } else { + return oopDesc::load_decode_heap_oop((oop*)addr) != NULL; + } +} int java_lang_String::value_offset; int java_lang_String::offset_offset; @@ -2890,6 +2913,7 @@ int java_lang_System::static_in_offset; int java_lang_System::static_out_offset; int java_lang_System::static_err_offset; +int java_lang_System::static_security_offset; int java_lang_StackTraceElement::declaringClass_offset; int java_lang_StackTraceElement::methodName_offset; int java_lang_StackTraceElement::fileName_offset; @@ -3037,6 +3061,7 @@ java_lang_System::static_in_offset = java_lang_System::hc_static_in_offset * x; java_lang_System::static_out_offset = java_lang_System::hc_static_out_offset * x; java_lang_System::static_err_offset = java_lang_System::hc_static_err_offset * x; + java_lang_System::static_security_offset = java_lang_System::hc_static_security_offset * x; // java_lang_StackTraceElement java_lang_StackTraceElement::declaringClass_offset = java_lang_StackTraceElement::hc_declaringClass_offset * x + header; @@ -3235,6 +3260,7 @@ CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, in, "Ljava/io/InputStream;"); CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, out, "Ljava/io/PrintStream;"); CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, err, "Ljava/io/PrintStream;"); + CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, security, "Ljava/lang/SecurityManager;"); // java.lang.StackTraceElement diff -r 04c3fb903cf3 -r 8a0d63301cfd src/share/vm/classfile/javaClasses.hpp --- a/src/share/vm/classfile/javaClasses.hpp Tue May 28 19:43:58 2013 +0200 +++ b/src/share/vm/classfile/javaClasses.hpp Wed Jun 12 15:22:15 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1200,11 +1200,14 @@ static int _context_offset; static int _privilegedContext_offset; static int _isPrivileged_offset; + static int _isAuthorized_offset; static void compute_offsets(); public: static oop create(objArrayHandle context, bool isPrivileged, Handle privileged_context, TRAPS); + static bool is_authorized(Handle context); + // Debugging/initialization friend class JavaClasses; }; @@ -1247,18 +1250,22 @@ enum { hc_static_in_offset = 0, hc_static_out_offset = 1, - hc_static_err_offset = 2 + hc_static_err_offset = 2, + hc_static_security_offset = 3 }; static int static_in_offset; static int static_out_offset; static int static_err_offset; + static int static_security_offset; public: static int in_offset_in_bytes(); static int out_offset_in_bytes(); static int err_offset_in_bytes(); + static bool has_security_manager(); + // Debugging friend class JavaClasses; }; diff -r 04c3fb903cf3 -r 8a0d63301cfd src/share/vm/classfile/vmSymbols.hpp --- a/src/share/vm/classfile/vmSymbols.hpp Tue May 28 19:43:58 2013 +0200 +++ b/src/share/vm/classfile/vmSymbols.hpp Wed Jun 12 15:22:15 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -91,6 +91,7 @@ template(java_lang_CharSequence, "java/lang/CharSequence") \ template(java_security_AccessControlContext, "java/security/AccessControlContext") \ template(java_security_ProtectionDomain, "java/security/ProtectionDomain") \ + template(impliesCreateAccessControlContext_name, "impliesCreateAccessControlContext") \ template(java_io_OutputStream, "java/io/OutputStream") \ template(java_io_Reader, "java/io/Reader") \ template(java_io_BufferedReader, "java/io/BufferedReader") \ @@ -322,6 +323,7 @@ template(contextClassLoader_name, "contextClassLoader") \ template(inheritedAccessControlContext_name, "inheritedAccessControlContext") \ template(isPrivileged_name, "isPrivileged") \ + template(isAuthorized_name, "isAuthorized") \ template(wait_name, "wait") \ template(checkPackageAccess_name, "checkPackageAccess") \ template(stackSize_name, "stackSize") \ diff -r 04c3fb903cf3 -r 8a0d63301cfd src/share/vm/memory/allocation.cpp --- a/src/share/vm/memory/allocation.cpp Tue May 28 19:43:58 2013 +0200 +++ b/src/share/vm/memory/allocation.cpp Wed Jun 12 15:22:15 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -207,7 +207,7 @@ ChunkPool(size_t size) : _size(size) { _first = NULL; _num_chunks = _num_used = 0; } // Allocate a new chunk from the pool (might expand the pool) - void* allocate(size_t bytes) { + void* allocate(size_t bytes, AllocFailType alloc_failmode) { assert(bytes == _size, "bad size"); void* p = NULL; { ThreadCritical tc; @@ -215,9 +215,9 @@ p = get_first(); if (p == NULL) p = os::malloc(bytes); } - if (p == NULL) + if (p == NULL && alloc_failmode == AllocFailStrategy::EXIT_OOM) { vm_exit_out_of_memory(bytes, "ChunkPool::allocate"); - + } return p; } @@ -308,7 +308,7 @@ //-------------------------------------------------------------------------------------- // Chunk implementation -void* Chunk::operator new(size_t requested_size, size_t length) { +void* Chunk::operator new(size_t requested_size, AllocFailType alloc_failmode, size_t length) { // requested_size is equal to sizeof(Chunk) but in order for the arena // allocations to come out aligned as expected the size must be aligned // to expected arean alignment. @@ -316,13 +316,14 @@ assert(ARENA_ALIGN(requested_size) == aligned_overhead_size(), "Bad alignment"); size_t bytes = ARENA_ALIGN(requested_size) + length; switch (length) { - case Chunk::size: return ChunkPool::large_pool()->allocate(bytes); - case Chunk::medium_size: return ChunkPool::medium_pool()->allocate(bytes); - case Chunk::init_size: return ChunkPool::small_pool()->allocate(bytes); + case Chunk::size: return ChunkPool::large_pool()->allocate(bytes, alloc_failmode); + case Chunk::medium_size: return ChunkPool::medium_pool()->allocate(bytes, alloc_failmode); + case Chunk::init_size: return ChunkPool::small_pool()->allocate(bytes, alloc_failmode); default: { - void *p = os::malloc(bytes); - if (p == NULL) + void* p = os::malloc(bytes); + if (p == NULL && alloc_failmode == AllocFailStrategy::EXIT_OOM) { vm_exit_out_of_memory(bytes, "Chunk::new"); + } return p; } } @@ -375,14 +376,14 @@ Arena::Arena(size_t init_size) { size_t round_size = (sizeof (char *)) - 1; init_size = (init_size+round_size) & ~round_size; - _first = _chunk = new (init_size) Chunk(init_size); + _first = _chunk = new (AllocFailStrategy::EXIT_OOM, init_size) Chunk(init_size); _hwm = _chunk->bottom(); // Save the cached hwm, max _max = _chunk->top(); set_size_in_bytes(init_size); } Arena::Arena() { - _first = _chunk = new (Chunk::init_size) Chunk(Chunk::init_size); + _first = _chunk = new (AllocFailStrategy::EXIT_OOM, Chunk::init_size) Chunk(Chunk::init_size); _hwm = _chunk->bottom(); // Save the cached hwm, max _max = _chunk->top(); set_size_in_bytes(Chunk::init_size); @@ -435,15 +436,15 @@ } // Grow a new Chunk -void* Arena::grow( size_t x ) { +void* Arena::grow(size_t x, AllocFailType alloc_failmode) { // Get minimal required size. Either real big, or even bigger for giant objs size_t len = MAX2(x, (size_t) Chunk::size); Chunk *k = _chunk; // Get filled-up chunk address - _chunk = new (len) Chunk(len); + _chunk = new (alloc_failmode, len) Chunk(len); if (_chunk == NULL) { - signal_out_of_memory(len * Chunk::aligned_overhead_size(), "Arena::grow"); + return NULL; } if (k) k->set_next(_chunk); // Append new chunk to end of linked list @@ -459,13 +460,16 @@ // Reallocate storage in Arena. -void *Arena::Arealloc(void* old_ptr, size_t old_size, size_t new_size) { +void *Arena::Arealloc(void* old_ptr, size_t old_size, size_t new_size, AllocFailType alloc_failmode) { assert(new_size >= 0, "bad size"); if (new_size == 0) return NULL; #ifdef ASSERT if (UseMallocOnly) { // always allocate a new object (otherwise we'll free this one twice) - char* copy = (char*)Amalloc(new_size); + char* copy = (char*)Amalloc(new_size, alloc_failmode); + if (copy == NULL) { + return NULL; + } size_t n = MIN2(old_size, new_size); if (n > 0) memcpy(copy, old_ptr, n); Afree(old_ptr,old_size); // Mostly done to keep stats accurate @@ -491,7 +495,10 @@ } // Oops, got to relocate guts - void *new_ptr = Amalloc(new_size); + void *new_ptr = Amalloc(new_size, alloc_failmode); + if (new_ptr == NULL) { + return NULL; + } memcpy( new_ptr, c_old, old_size ); Afree(c_old,old_size); // Mostly done to keep stats accurate return new_ptr; diff -r 04c3fb903cf3 -r 8a0d63301cfd src/share/vm/memory/allocation.hpp --- a/src/share/vm/memory/allocation.hpp Tue May 28 19:43:58 2013 +0200 +++ b/src/share/vm/memory/allocation.hpp Wed Jun 12 15:22:15 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,6 +40,12 @@ #define ARENA_ALIGN_MASK (~((size_t)ARENA_ALIGN_M1)) #define ARENA_ALIGN(x) ((((size_t)(x)) + ARENA_ALIGN_M1) & ARENA_ALIGN_MASK) +class AllocFailStrategy { +public: + enum AllocFailEnum { EXIT_OOM, RETURN_NULL }; +}; +typedef AllocFailStrategy::AllocFailEnum AllocFailType; + // All classes in the virtual machine must be subclassed // by one of the following allocation classes: // @@ -157,7 +163,7 @@ Chunk* _next; // Next Chunk in list const size_t _len; // Size of this Chunk public: - void* operator new(size_t size, size_t length); + void* operator new(size_t size, AllocFailType alloc_failmode, size_t length); void operator delete(void* p); Chunk(size_t length); @@ -207,7 +213,8 @@ Chunk *_first; // First chunk Chunk *_chunk; // current chunk char *_hwm, *_max; // High water mark and max in current chunk - void* grow(size_t x); // Get a new Chunk of at least size x + // Get a new Chunk of at least size x + void* grow(size_t x, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM); NOT_PRODUCT(size_t _size_in_bytes;) // Size of arena (used for memory usage tracing) NOT_PRODUCT(static julong _bytes_allocated;) // total #bytes allocated since start friend class AllocStats; @@ -217,10 +224,15 @@ void signal_out_of_memory(size_t request, const char* whence) const; - void check_for_overflow(size_t request, const char* whence) const { + bool check_for_overflow(size_t request, const char* whence, + AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) const { if (UINTPTR_MAX - request < (uintptr_t)_hwm) { + if (alloc_failmode == AllocFailStrategy::RETURN_NULL) { + return false; + } signal_out_of_memory(request, whence); } + return true; } public: @@ -232,14 +244,15 @@ char* hwm() const { return _hwm; } // Fast allocate in the arena. Common case is: pointer test + increment. - void* Amalloc(size_t x) { + void* Amalloc(size_t x, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) { assert(is_power_of_2(ARENA_AMALLOC_ALIGNMENT) , "should be a power of 2"); x = ARENA_ALIGN(x); debug_only(if (UseMallocOnly) return malloc(x);) - check_for_overflow(x, "Arena::Amalloc"); + if (!check_for_overflow(x, "Arena::Amalloc", alloc_failmode)) + return NULL; NOT_PRODUCT(inc_bytes_allocated(x);) if (_hwm + x > _max) { - return grow(x); + return grow(x, alloc_failmode); } else { char *old = _hwm; _hwm += x; @@ -247,13 +260,14 @@ } } // Further assume size is padded out to words - void *Amalloc_4(size_t x) { + void *Amalloc_4(size_t x, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) { assert( (x&(sizeof(char*)-1)) == 0, "misaligned size" ); debug_only(if (UseMallocOnly) return malloc(x);) - check_for_overflow(x, "Arena::Amalloc_4"); + if (!check_for_overflow(x, "Arena::Amalloc_4", alloc_failmode)) + return NULL; NOT_PRODUCT(inc_bytes_allocated(x);) if (_hwm + x > _max) { - return grow(x); + return grow(x, alloc_failmode); } else { char *old = _hwm; _hwm += x; @@ -263,7 +277,7 @@ // Allocate with 'double' alignment. It is 8 bytes on sparc. // In other cases Amalloc_D() should be the same as Amalloc_4(). - void* Amalloc_D(size_t x) { + void* Amalloc_D(size_t x, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) { assert( (x&(sizeof(char*)-1)) == 0, "misaligned size" ); debug_only(if (UseMallocOnly) return malloc(x);) #if defined(SPARC) && !defined(_LP64) @@ -271,10 +285,11 @@ size_t delta = (((size_t)_hwm + DALIGN_M1) & ~DALIGN_M1) - (size_t)_hwm; x += delta; #endif - check_for_overflow(x, "Arena::Amalloc_D"); + if (!check_for_overflow(x, "Arena::Amalloc_D", alloc_failmode)) + return NULL; NOT_PRODUCT(inc_bytes_allocated(x);) if (_hwm + x > _max) { - return grow(x); // grow() returns a result aligned >= 8 bytes. + return grow(x, alloc_failmode); // grow() returns a result aligned >= 8 bytes. } else { char *old = _hwm; _hwm += x; @@ -294,7 +309,8 @@ if (((char*)ptr) + size == _hwm) _hwm = (char*)ptr; } - void *Arealloc( void *old_ptr, size_t old_size, size_t new_size ); + void *Arealloc( void *old_ptr, size_t old_size, size_t new_size, + AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM); // Move contents of this arena into an empty arena Arena *move_contents(Arena *empty_arena); @@ -336,9 +352,12 @@ //%note allocation_1 -extern char* resource_allocate_bytes(size_t size); -extern char* resource_allocate_bytes(Thread* thread, size_t size); -extern char* resource_reallocate_bytes( char *old, size_t old_size, size_t new_size); +extern char* resource_allocate_bytes(size_t size, + AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM); +extern char* resource_allocate_bytes(Thread* thread, size_t size, + AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM); +extern char* resource_reallocate_bytes( char *old, size_t old_size, size_t new_size, + AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM); extern void resource_free_bytes( char *old, size_t size ); //---------------------------------------------------------------------- @@ -384,6 +403,13 @@ DEBUG_ONLY(set_allocation_type(res, RESOURCE_AREA);) return res; } + + void* operator new(size_t size, const std::nothrow_t& nothrow_constant) { + address res = (address)resource_allocate_bytes(size, AllocFailStrategy::RETURN_NULL); + DEBUG_ONLY(if (res != NULL) set_allocation_type(res, RESOURCE_AREA);) + return res; + } + void operator delete(void* p); }; @@ -394,6 +420,9 @@ #define NEW_RESOURCE_ARRAY(type, size)\ (type*) resource_allocate_bytes((size) * sizeof(type)) +#define NEW_RESOURCE_ARRAY_RETURN_NULL(type, size)\ + (type*) resource_allocate_bytes((size) * sizeof(type), AllocFailStrategy::RETURN_NULL) + #define NEW_RESOURCE_ARRAY_IN_THREAD(thread, type, size)\ (type*) resource_allocate_bytes(thread, (size) * sizeof(type)) diff -r 04c3fb903cf3 -r 8a0d63301cfd src/share/vm/memory/allocation.inline.hpp --- a/src/share/vm/memory/allocation.inline.hpp Tue May 28 19:43:58 2013 +0200 +++ b/src/share/vm/memory/allocation.inline.hpp Wed Jun 12 15:22:15 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. From bugzilla-daemon at icedtea.classpath.org Tue Jun 18 14:10:17 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 18 Jun 2013 21:10:17 +0000 Subject: [Bug 1378] [IcedTea7] Add AArch64 support to Zero In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1378 --- Comment #4 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-forest-2.1/hotspot?cmd=changeset;node=8ffc52aa2e4d author: andrew date: Wed Apr 17 21:26:58 2013 +0100 PR1378: Add AArch64 support to Zero -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130618/05f17104/attachment.html From andrew at icedtea.classpath.org Tue Jun 18 14:10:35 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 18 Jun 2013 21:10:35 +0000 Subject: /hg/release/icedtea7-forest-2.1/jdk: 67 new changesets Message-ID: changeset d567e1a9b596 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=d567e1a9b596 author: mbankal date: Fri Sep 14 09:38:27 2012 -0700 7195301: XML Signature DOM implementation should not use instanceof to determine type of Node Reviewed-by: mullan changeset edc4404c1938 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=edc4404c1938 author: andrew date: Wed Jun 12 14:56:51 2013 +0100 6741606: Integrate Apache Santuario Reviewed-by: vinnie, hawtin changeset 9c9991e940a2 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=9c9991e940a2 author: andrew date: Wed Jun 12 14:57:30 2013 +0100 7170730: Improve Windows network stack support. Summary: Enable exclusive binding of ports on Windows Reviewed-by: alanb, chegar, ahgross changeset 9a5782006b61 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=9a5782006b61 author: dmocek date: Mon Mar 04 14:34:15 2013 -0800 8000638: Improve deserialization Reviewed-by: smarks, hawtin, mchung changeset 56b8579d4ff5 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=56b8579d4ff5 author: andrew date: Wed Jun 12 14:58:31 2013 +0100 8001032: Restrict object access Summary: Restrict object access; fix reviewed also by Alexander Fomin Reviewed-by: alanb, ahgross changeset 412901ba0aaf in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=412901ba0aaf author: dmocek date: Wed Mar 13 17:24:34 2013 -0700 8001033: Refactor network address handling in virtual machine identifiers Reviewed-by: smarks, hawtin, mchung changeset cfaac8a34398 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=cfaac8a34398 author: bae date: Wed Feb 27 11:53:10 2013 +0400 8001034: Memory management improvements Reviewed-by: prr, jgodinez changeset f04ccacdf305 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=f04ccacdf305 author: bae date: Thu Mar 28 22:17:04 2013 +0400 8001038: Resourcefully handle resources Reviewed-by: mschoene, prr, bae Contributed-by: jia-hong.chen at oracle.com changeset 41699e6f328f in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=41699e6f328f author: dfuchs date: Fri Mar 15 17:59:10 2013 +0100 8001043: Clarify definition restrictions Reviewed-by: alanb, skoivu, smarks changeset 6e5d9d0cfcc9 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=6e5d9d0cfcc9 author: andrew date: Wed Jun 12 15:05:39 2013 +0100 8001308: Update display of applet windows Summary: Implemented security warning for OS X port Reviewed-by: art, anthony, serb, skoivu changeset c87f9d33fde6 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=c87f9d33fde6 author: dmeetry date: Mon Mar 25 12:41:55 2013 +0400 8001309: Better handling of annotation interfaces Reviewed-by: darcy changeset 5dd926007336 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=5dd926007336 author: khazra date: Thu Mar 28 14:59:22 2013 -0700 8001318: Socket.getLocalAddress not consistent with InetAddress.getLocalHost Reviewed-by: alanb, chegar, hawtin changeset a68d49b9b053 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=a68d49b9b053 author: mullan date: Fri Apr 05 08:33:25 2013 -0400 8001330: Improve on checking order Reviewed-by: acorn, hawtin changeset 234cf2f595bf in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=234cf2f595bf author: sla date: Mon Mar 18 15:22:51 2013 +0100 8003703: Update RMI connection dialog box Reviewed-by: skoivu, ahgross, mchung, jbachorik changeset 278d2d39eed8 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=278d2d39eed8 author: alanb date: Wed Feb 27 11:50:30 2013 +0000 8004288: (fs) Files.probeContentType problems Reviewed-by: ahgross, sherman changeset 0805ccc98362 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=0805ccc98362 author: andrew date: Wed Jun 12 15:09:03 2013 +0100 8004584: Augment applet contextualization Summary: Do not create the main AppContext for applets Reviewed-by: art, ahgross changeset 524837816f3e in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=524837816f3e author: prr date: Sun Mar 31 09:05:58 2013 -0700 8005007: Better glyph processing Reviewed-by: srl, mschoene, bae changeset df371bf8d9a4 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=df371bf8d9a4 author: serb date: Sat Mar 30 22:45:54 2013 +0400 8006328: Improve robustness of sound classes 8009057: Improve MIDI event handling Reviewed-by: amenkov, art, skoivu changeset b4d1ed547a75 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=b4d1ed547a75 author: sundar date: Fri Apr 05 15:39:25 2013 +0530 8006611: Improve scripting Reviewed-by: mchung, jdn changeset 02cba1c3572a in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=02cba1c3572a author: sjiang date: Tue Mar 19 18:45:19 2013 +0100 8007467: Improve robustness of JMX internal APIs Reviewed-by: dfuchs, mchung, skoivu changeset d22aa05d0e4c in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=d22aa05d0e4c author: dsamersoff date: Thu Mar 21 22:32:42 2013 +0400 8007471: Improve MBean notifications Summary: Improve MBean notifications Reviewed-by: dfuchs, mchung, alanb, skoivu changeset 0a66867d6baa in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=0a66867d6baa author: jfranck date: Mon Mar 25 20:18:21 2013 +0100 8007812: (reflect) Class.getEnclosingMethod problematic for some classes Summary: Better checking in getEnclosing(Method|Constructor|Class) Reviewed-by: darcy, ahgross, mchung changeset 38c68381e29f in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=38c68381e29f author: bae date: Thu Mar 28 23:01:08 2013 +0400 8007925: Improve cmsStageAllocLabV2ToV4curves 8007926: Improve cmsPipelineDup Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset 62348d83f9c9 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=62348d83f9c9 author: bae date: Thu Mar 21 11:52:10 2013 +0400 8007927: Improve cmsAllocProfileSequenceDescription Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset 78d2622e362e in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=78d2622e362e author: bae date: Thu Mar 21 12:02:04 2013 +0400 8007929: Improve CurvesAlloc Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset f421e2622e84 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=f421e2622e84 author: dsamersoff date: Wed Mar 27 14:32:58 2013 +0400 8008120: Improve JMX class checking Summary: Improve JMX class checking Reviewed-by: mchung, dfuchs, alanb, skoivu changeset bbabb695cc3a in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=bbabb695cc3a author: dsamersoff date: Thu Mar 28 23:39:28 2013 +0400 8008124: Better compliance testing Summary: Better compliance testing Reviewed-by: dfuchs, jfdenise, skoivu, alanb changeset 05df38046a8a in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=05df38046a8a author: andrew date: Tue Jun 11 13:13:12 2013 +0100 8008128: Better API coherence for JMX Summary: Permission for getting classloader Reviewed-by: alanb, dfuchs, skoivu Contributed-by: jean-francois.denise at oracle.com changeset e23bdc1f27d4 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=e23bdc1f27d4 author: smarks date: Mon Mar 25 17:05:30 2013 +0000 8008132: Better serialization support Reviewed-by: alanb, hawtin changeset 53e0fee6e381 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=53e0fee6e381 author: jbachorik date: Thu Mar 14 14:42:12 2013 +0100 8008585: Better JMX data handling Reviewed-by: alanb, dfuchs, jfdenise, skoivu, sjiang changeset d8c25838734f in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=d8c25838734f author: andrew date: Wed Jun 12 15:11:46 2013 +0100 8004584: Augment applet contextualization Summary: Do not create the main AppContext for applets Reviewed-by: art, ahgross changeset 05e7f2135bca in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=05e7f2135bca author: jbachorik date: Thu Mar 07 14:05:05 2013 +0100 8008603: Improve provision of JMX providers Reviewed-by: alanb, dfuchs, jfdenise, skoivu changeset 53d83931a29f in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=53d83931a29f author: jbachorik date: Thu Mar 14 14:45:55 2013 +0100 8008607: Better input checking in JMX Reviewed-by: dfuchs, mchung, skoivu, sjiang changeset 0fe7dd24c5bb in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=0fe7dd24c5bb author: egahlin date: Thu Mar 21 13:56:28 2013 +0100 8008611: Better handling of annotations in JMX Reviewed-by: skoivu, dholmes, jfdenise changeset c4a8017b0818 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=c4a8017b0818 author: sjiang date: Thu Mar 21 18:27:25 2013 +0100 8008615: Improve robustness of JMX internal APIs Reviewed-by: dfuchs, skoivu, dholmes changeset 5fc193fbdff4 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=5fc193fbdff4 author: jbachorik date: Thu Mar 21 09:26:55 2013 +0100 8008623: Better handling of MBeanServers Reviewed-by: dfuchs, dholmes, skoivu changeset 62474ae38ea3 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=62474ae38ea3 author: mullan date: Wed May 01 17:19:04 2013 -0400 8008744: Rework part of fix for JDK-6741606 Reviewed-by: xuelei, ahgross changeset 460677aae016 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=460677aae016 author: jbachorik date: Thu Mar 28 09:39:26 2013 +0100 8008982: Adjust JMX for underlying interface changes Reviewed-by: mchung, dholmes, dfuchs, skoivu changeset 816837369ee5 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=816837369ee5 author: jfdenise date: Mon Mar 18 13:50:19 2013 +0100 8009004: Better implementation of RMI connections Summary: Better class handling. Reviewed-by: alanb, dfuchs, skoivu, jbachorik Contributed-by: jean-francois.denise at oracle.com changeset fbfcbc8fa136 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=fbfcbc8fa136 author: bae date: Tue Mar 26 11:56:00 2013 +0400 8009013: Better handling of T2K glyphs Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset 8f3def9cab48 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=8f3def9cab48 author: jbachorik date: Tue Mar 12 11:09:37 2013 +0100 8009034: Improve resulting notifications in JMX Summary: Disallowing access to mutable shared arrays Reviewed-by: dfuchs, mchung, skoivu changeset d6cdeea8b194 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=d6cdeea8b194 author: jbachorik date: Tue Mar 12 09:34:26 2013 +0100 8009038: Improve JMX notification support Summary: Disallowing access to mutable shared arrays Reviewed-by: dfuchs, mchung, skoivu changeset 1b844fe1bb58 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=1b844fe1bb58 author: vinnie date: Thu Mar 21 10:42:36 2013 +0000 8009067: Improve storing keys in KeyStore Reviewed-by: mullan, skoivu changeset 94aeaa544fd0 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=94aeaa544fd0 author: andrew date: Wed Jun 12 15:13:37 2013 +0100 8009071: Improve shape handling Reviewed-by: art, mschoene changeset d5b0fafe5008 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=d5b0fafe5008 author: vinnie date: Mon Apr 08 21:17:57 2013 +0100 8009235: Improve handling of TSA data Reviewed-by: ahgross, mullan changeset 777c7be511a7 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=777c7be511a7 author: andrew date: Wed Jun 12 15:16:26 2013 +0100 8009424: Adapt Nashorn to JSR-292 implementation change Reviewed-by: jrose, twisti, jdn, mchung changeset a2a7730dff8a in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=a2a7730dff8a author: lancea date: Fri Mar 22 15:40:16 2013 -0400 8009554: Improve SerialJavaObject.getFields Reviewed-by: alanb, skoivu changeset ccc9d6467f7a in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=ccc9d6467f7a author: andrew date: Tue Jun 11 14:44:01 2013 +0100 8009654: Improve stability of cmsnamed Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset c9b81c0d3b0d in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=c9b81c0d3b0d author: jbachorik date: Wed Mar 27 13:29:22 2013 +0100 8010209: Better provision of factories Reviewed-by: dcubed, ahgross changeset d7d3b36cba41 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=d7d3b36cba41 author: bae date: Tue Apr 09 15:03:29 2013 +0400 8011243: Improve ImagingLib Reviewed-by: mschoene, prr, vadim changeset a684a2b459cb in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=a684a2b459cb author: prr date: Mon Apr 08 12:41:09 2013 -0700 8011248: Better Component Rasters Reviewed-by: bae, vadim, mschoene changeset ad770ca9e9f6 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=ad770ca9e9f6 author: prr date: Mon Apr 08 12:46:20 2013 -0700 8011253: Better Short Component Rasters Reviewed-by: bae, vadim, mschoene changeset 52080db9cd97 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=52080db9cd97 author: prr date: Mon Apr 08 12:48:19 2013 -0700 8011257: Better Byte Component Rasters Reviewed-by: bae, vadim, mschoene changeset d03d07eea280 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=d03d07eea280 author: mchung date: Fri Apr 05 08:43:00 2013 -0700 8011557: Improve reflection utility classes Reviewed-by: ahgross, alanb changeset a03c8f40cbc6 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=a03c8f40cbc6 author: prr date: Fri Apr 19 15:40:03 2013 -0700 8012421: Better positioning of PairPositioning Reviewed-by: srl, mschoene, vadim changeset 785c2a96d910 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=785c2a96d910 author: bae date: Wed Apr 24 15:23:44 2013 +0400 8012438: Better image validation Reviewed-by: mschoene, prr, vadim changeset f50ec548334f in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=f50ec548334f author: bae date: Tue Apr 30 04:20:46 2013 +0400 8012597: Better image channel verification Reviewed-by: ahgross, vadim, prr changeset 137930f4666f in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=137930f4666f author: bae date: Fri Apr 26 09:30:54 2013 +0400 8012601: Better validation of image layouts Reviewed-by: mschoene, prr, vadim changeset b56b4751faf0 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=b56b4751faf0 author: xuelei date: Mon May 13 18:30:45 2013 -0700 8014281: Better checking of XML signature Summary: also reviewed by Andrew Gross and Christophe Ravel Reviewed-by: mullan changeset 27e8f5644011 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=27e8f5644011 author: andrew date: Wed Jun 12 15:18:06 2013 +0100 8014618: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement Reviewed-by: xuelei Contributed-by: Pasi Eronen changeset db23fdcb8244 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=db23fdcb8244 author: andrew date: Wed Jun 12 11:46:50 2013 +0100 7151434: java -jar -XX crashes java launcher Reviewed-by: mchung, darcy, jjh, dholmes changeset 649b424bb842 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=649b424bb842 author: andrew date: Wed Jun 12 11:48:21 2013 +0100 7142596: RMI JPRT tests are failing Summary: Changed RMI tests to use random port numbers for the RMI Registry and RMID so the tests can be run concurrently without test failures due to tests using the same port numbers. Reviewed-by: smarks, alanb Contributed-by: olivier.lagneau at oracle.com changeset c00efeece9f2 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=c00efeece9f2 author: andrew date: Fri Jun 14 10:05:04 2013 +0100 Handle NullPointerException in getNotificationInfo changeset 0ab2712a035a in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=0ab2712a035a author: andrew date: Tue Jun 18 08:09:59 2013 -0500 8010118: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive Reviewed-by: alanb, twisti, jrose, kvn changeset e28599cbc0d4 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=e28599cbc0d4 author: andrew date: Tue Jun 18 08:15:49 2013 -0500 8009424: Adapt Nashorn to JSR-292 implementation change Reviewed-by: jrose, twisti, jdn, mchung changeset b2325315c6ec in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=b2325315c6ec author: andrew date: Tue Jun 18 08:18:57 2013 -0500 7077803: java.lang.InternalError in java.lang.invoke.MethodHandleNatives.init Summary: Use correct access token for unreflecting MHs where setAccessible(true) Reviewed-by: never, twisti changeset 4a67dd684bc2 in /hg/release/icedtea7-forest-2.1/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=4a67dd684bc2 author: andrew date: Tue Jun 18 08:07:48 2013 -0500 8002070: Remove the stack search for a resource bundle for Logger to use Summary: The fragile, vulnerable, stack crawling has been eliminated from findResourceBundle(String) Reviewed-by: mchung, alanb diffstat: make/java/java/FILES_c.gmk | 2 - make/java/java/mapfile-vers | 3 - make/java/java/reorder-i586 | 1 - make/java/java/reorder-sparc | 1 - make/java/java/reorder-sparcv9 | 1 - make/java/nio/mapfile-linux | 1 + make/java/nio/mapfile-solaris | 1 + make/java/zip/mapfile-vers | 1 + make/java/zip/reorder-i586 | 1 + make/java/zip/reorder-sparc | 1 + make/java/zip/reorder-sparcv9 | 1 + make/sun/awt/Makefile | 81 +- make/sun/awt/ToBin.java | 59 + make/sun/xawt/Makefile | 67 +- make/sun/xawt/ToBin.java | 59 - src/share/bin/java.c | 7 + src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java | 7 +- src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java | 15 +- src/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java | 16 +- src/share/classes/com/sun/jmx/mbeanserver/ConvertingMethod.java | 3 +- src/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java | 15 +- src/share/classes/com/sun/jmx/mbeanserver/Introspector.java | 14 +- src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java | 21 +- src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java | 46 +- src/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java | 4 +- src/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java | 3 +- src/share/classes/com/sun/jmx/mbeanserver/StandardMBeanIntrospector.java | 3 +- src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java | 16 +- src/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java | 18 +- src/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java | 7 +- src/share/classes/com/sun/media/sound/AbstractDataLine.java | 45 +- src/share/classes/com/sun/media/sound/AbstractLine.java | 69 +- src/share/classes/com/sun/media/sound/AbstractMidiDevice.java | 44 +- src/share/classes/com/sun/media/sound/AbstractMidiDeviceProvider.java | 16 +- src/share/classes/com/sun/media/sound/AbstractMixer.java | 54 +- src/share/classes/com/sun/media/sound/AiffFileFormat.java | 10 +- src/share/classes/com/sun/media/sound/AiffFileReader.java | 34 +- src/share/classes/com/sun/media/sound/AiffFileWriter.java | 14 +- src/share/classes/com/sun/media/sound/AlawCodec.java | 14 +- src/share/classes/com/sun/media/sound/AuFileFormat.java | 6 +- src/share/classes/com/sun/media/sound/AuFileReader.java | 34 +- src/share/classes/com/sun/media/sound/AuFileWriter.java | 16 +- src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java | 4 +- src/share/classes/com/sun/media/sound/AudioFloatConverter.java | 39 +- src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java | 51 +- src/share/classes/com/sun/media/sound/AudioFloatInputStream.java | 26 +- src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java | 4 +- src/share/classes/com/sun/media/sound/DLSInfo.java | 4 +- src/share/classes/com/sun/media/sound/DLSInstrument.java | 18 +- src/share/classes/com/sun/media/sound/DLSModulator.java | 16 +- src/share/classes/com/sun/media/sound/DLSRegion.java | 28 +- src/share/classes/com/sun/media/sound/DLSSample.java | 14 +- src/share/classes/com/sun/media/sound/DLSSampleLoop.java | 10 +- src/share/classes/com/sun/media/sound/DLSSampleOptions.java | 14 +- src/share/classes/com/sun/media/sound/DLSSoundbank.java | 12 +- src/share/classes/com/sun/media/sound/DLSSoundbankReader.java | 4 +- src/share/classes/com/sun/media/sound/DataPusher.java | 8 +- src/share/classes/com/sun/media/sound/DirectAudioDevice.java | 44 +- src/share/classes/com/sun/media/sound/DirectAudioDeviceProvider.java | 68 +- src/share/classes/com/sun/media/sound/EmergencySoundbank.java | 4 +- src/share/classes/com/sun/media/sound/EventDispatcher.java | 34 +- src/share/classes/com/sun/media/sound/FFT.java | 12 +- src/share/classes/com/sun/media/sound/FastShortMessage.java | 6 +- src/share/classes/com/sun/media/sound/JARSoundbankReader.java | 22 +- src/share/classes/com/sun/media/sound/JDK13Services.java | 16 +- src/share/classes/com/sun/media/sound/JSSecurityManager.java | 103 +- src/share/classes/com/sun/media/sound/JavaSoundAudioClip.java | 12 +- src/share/classes/com/sun/media/sound/MidiDeviceReceiverEnvelope.java | 4 +- src/share/classes/com/sun/media/sound/MidiDeviceTransmitterEnvelope.java | 4 +- src/share/classes/com/sun/media/sound/MidiInDevice.java | 9 +- src/share/classes/com/sun/media/sound/MidiInDeviceProvider.java | 15 +- src/share/classes/com/sun/media/sound/MidiOutDevice.java | 6 +- src/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java | 15 +- src/share/classes/com/sun/media/sound/MidiUtils.java | 11 +- src/share/classes/com/sun/media/sound/ModelByteBuffer.java | 8 +- src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java | 12 +- src/share/classes/com/sun/media/sound/ModelConnectionBlock.java | 4 +- src/share/classes/com/sun/media/sound/ModelDestination.java | 4 +- src/share/classes/com/sun/media/sound/ModelIdentifier.java | 4 +- src/share/classes/com/sun/media/sound/ModelInstrument.java | 8 +- src/share/classes/com/sun/media/sound/ModelInstrumentComparator.java | 4 +- src/share/classes/com/sun/media/sound/ModelMappedInstrument.java | 6 +- src/share/classes/com/sun/media/sound/ModelPatch.java | 4 +- src/share/classes/com/sun/media/sound/ModelPerformer.java | 6 +- src/share/classes/com/sun/media/sound/ModelSource.java | 4 +- src/share/classes/com/sun/media/sound/ModelStandardDirector.java | 4 +- src/share/classes/com/sun/media/sound/ModelStandardIndexedDirector.java | 4 +- src/share/classes/com/sun/media/sound/ModelStandardTransform.java | 4 +- src/share/classes/com/sun/media/sound/PCMtoPCMCodec.java | 10 +- src/share/classes/com/sun/media/sound/Platform.java | 25 +- src/share/classes/com/sun/media/sound/PortMixer.java | 28 +- src/share/classes/com/sun/media/sound/PortMixerProvider.java | 46 +- src/share/classes/com/sun/media/sound/Printer.java | 10 +- src/share/classes/com/sun/media/sound/RIFFInvalidDataException.java | 4 +- src/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java | 4 +- src/share/classes/com/sun/media/sound/RIFFReader.java | 8 +- src/share/classes/com/sun/media/sound/RIFFWriter.java | 16 +- src/share/classes/com/sun/media/sound/RealTimeSequencer.java | 78 +- src/share/classes/com/sun/media/sound/RealTimeSequencerProvider.java | 4 +- src/share/classes/com/sun/media/sound/SF2GlobalRegion.java | 4 +- src/share/classes/com/sun/media/sound/SF2Instrument.java | 22 +- src/share/classes/com/sun/media/sound/SF2InstrumentRegion.java | 6 +- src/share/classes/com/sun/media/sound/SF2Layer.java | 10 +- src/share/classes/com/sun/media/sound/SF2LayerRegion.java | 6 +- src/share/classes/com/sun/media/sound/SF2Modulator.java | 14 +- src/share/classes/com/sun/media/sound/SF2Sample.java | 24 +- src/share/classes/com/sun/media/sound/SF2Soundbank.java | 36 +- src/share/classes/com/sun/media/sound/SF2SoundbankReader.java | 4 +- src/share/classes/com/sun/media/sound/SoftAbstractResampler.java | 6 +- src/share/classes/com/sun/media/sound/SoftAudioBuffer.java | 4 +- src/share/classes/com/sun/media/sound/SoftAudioPusher.java | 8 +- src/share/classes/com/sun/media/sound/SoftChannel.java | 44 +- src/share/classes/com/sun/media/sound/SoftChannelProxy.java | 4 +- src/share/classes/com/sun/media/sound/SoftChorus.java | 14 +- src/share/classes/com/sun/media/sound/SoftCubicResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java | 38 +- src/share/classes/com/sun/media/sound/SoftFilter.java | 6 +- src/share/classes/com/sun/media/sound/SoftInstrument.java | 8 +- src/share/classes/com/sun/media/sound/SoftJitterCorrector.java | 8 +- src/share/classes/com/sun/media/sound/SoftLanczosResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftLimiter.java | 4 +- src/share/classes/com/sun/media/sound/SoftLinearResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftLinearResampler2.java | 4 +- src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java | 24 +- src/share/classes/com/sun/media/sound/SoftMainMixer.java | 26 +- src/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java | 4 +- src/share/classes/com/sun/media/sound/SoftMixingClip.java | 8 +- src/share/classes/com/sun/media/sound/SoftMixingDataLine.java | 88 +- src/share/classes/com/sun/media/sound/SoftMixingMainMixer.java | 34 +- src/share/classes/com/sun/media/sound/SoftMixingMixer.java | 34 +- src/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java | 6 +- src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java | 10 +- src/share/classes/com/sun/media/sound/SoftPerformer.java | 4 +- src/share/classes/com/sun/media/sound/SoftPointResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftProvider.java | 8 +- src/share/classes/com/sun/media/sound/SoftReceiver.java | 14 +- src/share/classes/com/sun/media/sound/SoftReverb.java | 10 +- src/share/classes/com/sun/media/sound/SoftShortMessage.java | 4 +- src/share/classes/com/sun/media/sound/SoftSincResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftSynthesizer.java | 60 +- src/share/classes/com/sun/media/sound/SoftTuning.java | 6 +- src/share/classes/com/sun/media/sound/SoftVoice.java | 134 +- src/share/classes/com/sun/media/sound/StandardMidiFileReader.java | 29 +- src/share/classes/com/sun/media/sound/StandardMidiFileWriter.java | 10 +- src/share/classes/com/sun/media/sound/SunCodec.java | 18 +- src/share/classes/com/sun/media/sound/SunFileReader.java | 33 +- src/share/classes/com/sun/media/sound/SunFileWriter.java | 17 +- src/share/classes/com/sun/media/sound/Toolkit.java | 9 +- src/share/classes/com/sun/media/sound/UlawCodec.java | 9 +- src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java | 14 +- src/share/classes/com/sun/media/sound/WaveFileFormat.java | 22 +- src/share/classes/com/sun/media/sound/WaveFileReader.java | 34 +- src/share/classes/com/sun/media/sound/WaveFileWriter.java | 14 +- src/share/classes/com/sun/media/sound/WaveFloatFileReader.java | 4 +- src/share/classes/com/sun/media/sound/WaveFloatFileWriter.java | 8 +- src/share/classes/com/sun/org/apache/xml/internal/security/Init.java | 643 +++---- src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/ClassLoaderUtils.java | 280 +++ src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java | 403 +++- src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java | 812 ++++---- src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java | 237 +- src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java | 7 +- src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java | 22 +- src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java | 34 +- src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java | 240 +- src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java | 622 +++--- src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java | 10 +- src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties | 249 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java | 5 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java | 10 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java | 3 + src/share/classes/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderUtils.java | 280 +++ src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java | 420 ++-- src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java | 9 +- src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java | 23 +- src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java | 32 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java | 838 ++++----- src/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java | 338 +-- src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java | 2 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java | 395 +++- src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java | 534 +++--- src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java | 12 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverFragment.java | 98 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverXPointer.java | 66 +- src/share/classes/java/awt/Font.java | 40 +- src/share/classes/java/awt/image/BufferedImage.java | 30 +- src/share/classes/java/awt/image/ComponentSampleModel.java | 16 +- src/share/classes/java/awt/image/PixelInterleavedSampleModel.java | 10 +- src/share/classes/java/awt/image/Raster.java | 14 +- src/share/classes/java/io/ObjectOutputStream.java | 13 + src/share/classes/java/io/ObjectStreamClass.java | 18 + src/share/classes/java/io/ObjectStreamField.java | 8 + src/share/classes/java/lang/Class.java | 140 +- src/share/classes/java/lang/ClassLoader.java | 60 +- src/share/classes/java/lang/Package.java | 11 +- src/share/classes/java/lang/Runtime.java | 8 +- src/share/classes/java/lang/System.java | 13 +- src/share/classes/java/lang/Thread.java | 11 +- src/share/classes/java/lang/invoke/MemberName.java | 13 +- src/share/classes/java/lang/invoke/MethodHandleImpl.java | 8 +- src/share/classes/java/lang/invoke/MethodHandleNatives.java | 68 +- src/share/classes/java/lang/invoke/MethodHandleProxies.java | 5 +- src/share/classes/java/lang/invoke/MethodHandles.java | 193 +- src/share/classes/java/lang/reflect/Constructor.java | 5 +- src/share/classes/java/lang/reflect/Field.java | 129 +- src/share/classes/java/lang/reflect/Method.java | 19 +- src/share/classes/java/lang/reflect/Proxy.java | 68 +- src/share/classes/java/net/NetUtil.java | 74 + src/share/classes/java/net/ServerSocket.java | 25 +- src/share/classes/java/net/Socket.java | 8 + src/share/classes/java/net/SocksSocketImpl.java | 9 +- src/share/classes/java/nio/file/Files.java | 11 +- src/share/classes/java/rmi/dgc/VMID.java | 69 +- src/share/classes/java/security/AccessControlContext.java | 13 +- src/share/classes/java/security/AccessController.java | 27 +- src/share/classes/java/security/KeyStore.java | 2 +- src/share/classes/java/security/ProtectionDomain.java | 7 +- src/share/classes/java/sql/DriverManager.java | 68 +- src/share/classes/java/util/ResourceBundle.java | 29 +- src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java | 11 +- src/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java | 18 +- src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java | 13 +- src/share/classes/java/util/logging/LogManager.java | 39 +- src/share/classes/java/util/logging/Logger.java | 99 +- src/share/classes/java/util/zip/ZipFile.java | 26 +- src/share/classes/javax/management/JMX.java | 90 +- src/share/classes/javax/management/MBeanServerFactory.java | 3 +- src/share/classes/javax/management/MBeanServerInvocationHandler.java | 15 +- src/share/classes/javax/management/StandardEmitterMBean.java | 35 +- src/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java | 2 + src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java | 10 +- src/share/classes/javax/management/relation/RelationNotification.java | 255 +- src/share/classes/javax/management/remote/JMXConnectorFactory.java | 39 +- src/share/classes/javax/management/remote/NotificationResult.java | 4 +- src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java | 2 + src/share/classes/javax/management/remote/rmi/RMIConnector.java | 5 +- src/share/classes/javax/script/ScriptEngineManager.java | 48 +- src/share/classes/javax/sound/midi/MetaMessage.java | 18 +- src/share/classes/javax/sound/sampled/Mixer.java | 8 +- src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java | 19 +- src/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java | 19 +- src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java | 2 +- src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheTransform.java | 12 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java | 18 + src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java | 9 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMManifest.java | 21 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java | 36 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java | 18 + src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java | 9 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java | 9 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java | 35 + src/share/classes/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java | 42 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMUtils.java | 4 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLObject.java | 10 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java | 9 +- src/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java | 10 + src/share/classes/sun/applet/AppletSecurity.java | 4 +- src/share/classes/sun/audio/AudioData.java | 4 +- src/share/classes/sun/audio/AudioDataStream.java | 10 +- src/share/classes/sun/audio/AudioDevice.java | 16 +- src/share/classes/sun/audio/AudioPlayer.java | 15 +- src/share/classes/sun/audio/AudioStream.java | 14 +- src/share/classes/sun/audio/AudioStreamSequence.java | 7 +- src/share/classes/sun/audio/AudioTranslatorStream.java | 9 +- src/share/classes/sun/audio/ContinuousAudioDataStream.java | 7 +- src/share/classes/sun/audio/InvalidAudioFormatException.java | 8 +- src/share/classes/sun/awt/AppContext.java | 111 +- src/share/classes/sun/awt/IconInfo.java | 237 ++ src/share/classes/sun/awt/SunToolkit.java | 4 + src/share/classes/sun/awt/image/ByteBandedRaster.java | 73 +- src/share/classes/sun/awt/image/ByteComponentRaster.java | 23 +- src/share/classes/sun/awt/image/BytePackedRaster.java | 3 +- src/share/classes/sun/awt/image/IntegerComponentRaster.java | 23 +- src/share/classes/sun/awt/image/ShortBandedRaster.java | 66 +- src/share/classes/sun/awt/image/ShortComponentRaster.java | 23 +- src/share/classes/sun/awt/resources/security-icon-bw16.png | Bin src/share/classes/sun/awt/resources/security-icon-bw24.png | Bin src/share/classes/sun/awt/resources/security-icon-bw32.png | Bin src/share/classes/sun/awt/resources/security-icon-bw48.png | Bin src/share/classes/sun/awt/resources/security-icon-interim16.png | Bin src/share/classes/sun/awt/resources/security-icon-interim24.png | Bin src/share/classes/sun/awt/resources/security-icon-interim32.png | Bin src/share/classes/sun/awt/resources/security-icon-interim48.png | Bin src/share/classes/sun/awt/resources/security-icon-yellow16.png | Bin src/share/classes/sun/awt/resources/security-icon-yellow24.png | Bin src/share/classes/sun/awt/resources/security-icon-yellow32.png | Bin src/share/classes/sun/awt/resources/security-icon-yellow48.png | Bin src/share/classes/sun/font/CreatedFontTracker.java | 119 +- src/share/classes/sun/font/ExtendedTextSourceLabel.java | 13 +- src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java | 41 +- src/share/classes/sun/misc/JavaUtilZipFileAccess.java | 32 + src/share/classes/sun/misc/SharedSecrets.java | 11 + src/share/classes/sun/misc/URLClassPath.java | 21 +- src/share/classes/sun/misc/Unsafe.java | 12 +- src/share/classes/sun/net/NetworkClient.java | 8 +- src/share/classes/sun/net/ftp/impl/FtpClient.java | 21 +- src/share/classes/sun/net/httpserver/ServerImpl.java | 11 +- src/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java | 23 +- src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java | 27 +- src/share/classes/sun/nio/ch/DatagramChannelImpl.java | 29 +- src/share/classes/sun/nio/ch/Net.java | 107 +- src/share/classes/sun/nio/ch/ServerSocketAdaptor.java | 3 +- src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java | 40 +- src/share/classes/sun/nio/ch/SocketAdaptor.java | 4 +- src/share/classes/sun/nio/ch/SocketChannelImpl.java | 30 +- src/share/classes/sun/reflect/CallerSensitive.java | 41 + src/share/classes/sun/reflect/Reflection.java | 38 +- src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java | 9 +- src/share/classes/sun/reflect/misc/ReflectUtil.java | 54 +- src/share/classes/sun/rmi/server/Activation.java | 16 +- src/share/classes/sun/rmi/server/LoaderHandler.java | 33 +- src/share/classes/sun/rmi/transport/proxy/WrappedSocket.java | 11 +- src/share/classes/sun/security/pkcs11/P11KeyAgreement.java | 6 +- src/share/classes/sun/security/pkcs11/P11Signature.java | 7 +- src/share/classes/sun/security/pkcs11/P11Util.java | 16 +- src/share/classes/sun/security/timestamp/TimestampToken.java | 6 +- src/share/classes/sun/security/util/KeyUtil.java | 21 +- src/share/classes/sun/security/util/SignatureFileVerifier.java | 29 +- src/share/classes/sun/tools/jconsole/ProxyClient.java | 15 +- src/share/classes/sun/tools/jconsole/VMPanel.java | 11 +- src/share/classes/sun/tools/jconsole/resources/JConsoleResources.java | 5 + src/share/classes/sun/tracing/ProviderSkeleton.java | 31 +- src/share/classes/sun/tracing/dtrace/DTraceProvider.java | 15 +- src/share/lib/security/java.security | 8 +- src/share/lib/security/java.security-solaris | 8 +- src/share/lib/security/java.security-windows | 4 + src/share/native/common/sizecalc.h | 118 + src/share/native/java/lang/ClassLoader.c | 17 - src/share/native/java/lang/SecurityManager.c | 1 - src/share/native/java/util/zip/ZipFile.c | 8 + src/share/native/java/util/zip/zip_util.c | 8 + src/share/native/java/util/zip/zip_util.h | 1 + src/share/native/sun/awt/image/awt_parseImage.c | 167 +- src/share/native/sun/awt/medialib/awt_ImagingLib.c | 466 +++- src/share/native/sun/awt/medialib/mlib_ImageCreate.c | 31 +- src/share/native/sun/awt/splashscreen/java_awt_SplashScreen.c | 3 +- src/share/native/sun/awt/splashscreen/splashscreen_gif.c | 6 +- src/share/native/sun/font/freetypeScaler.c | 13 +- src/share/native/sun/font/layout/LEGlyphStorage.cpp | 16 +- src/share/native/sun/font/layout/LookupProcessor.cpp | 2 +- src/share/native/sun/font/layout/PairPositioningSubtables.cpp | 27 +- src/share/native/sun/font/layout/PairPositioningSubtables.h | 5 +- src/share/native/sun/java2d/cmm/lcms/cmslut.c | 3 + src/share/native/sun/java2d/cmm/lcms/cmsnamed.c | 10 +- src/share/native/sun/java2d/cmm/lcms/cmsopt.c | 9 + src/share/native/sun/java2d/pipe/Region.c | 5 +- src/share/native/sun/reflect/Reflection.c | 6 +- src/solaris/classes/sun/awt/X11/XDecoratedPeer.java | 5 +- src/solaris/classes/sun/awt/X11/XIconInfo.java | 237 -- src/solaris/classes/sun/awt/X11/XIconWindow.java | 9 +- src/solaris/classes/sun/awt/X11/XNETProtocol.java | 12 +- src/solaris/classes/sun/awt/X11/XWM.java | 5 +- src/solaris/classes/sun/awt/X11/XWarningWindow.java | 65 +- src/solaris/classes/sun/awt/X11/XWindowAttributesData.java | 7 +- src/solaris/classes/sun/awt/X11/XWindowPeer.java | 47 +- src/solaris/classes/sun/awt/X11/security-icon-bw16.png | Bin src/solaris/classes/sun/awt/X11/security-icon-bw24.png | Bin src/solaris/classes/sun/awt/X11/security-icon-bw32.png | Bin src/solaris/classes/sun/awt/X11/security-icon-bw48.png | Bin src/solaris/classes/sun/awt/X11/security-icon-interim16.png | Bin src/solaris/classes/sun/awt/X11/security-icon-interim24.png | Bin src/solaris/classes/sun/awt/X11/security-icon-interim32.png | Bin src/solaris/classes/sun/awt/X11/security-icon-interim48.png | Bin src/solaris/classes/sun/awt/X11/security-icon-yellow16.png | Bin src/solaris/classes/sun/awt/X11/security-icon-yellow24.png | Bin src/solaris/classes/sun/awt/X11/security-icon-yellow32.png | Bin src/solaris/classes/sun/awt/X11/security-icon-yellow48.png | Bin src/solaris/classes/sun/nio/ch/SctpNet.java | 62 +- src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java | 2 +- src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java | 3 +- src/solaris/native/sun/awt/awt_GraphicsEnv.c | 5 +- src/solaris/native/sun/awt/awt_GraphicsEnv.h | 3 + src/solaris/native/sun/awt/awt_Robot.c | 8 +- src/solaris/native/sun/awt/awt_UNIXToolkit.c | 10 +- src/solaris/native/sun/awt/fontpath.c | 12 +- src/solaris/native/sun/awt/gtk2_interface.c | 4 +- src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c | 22 +- src/solaris/native/sun/java2d/x11/X11SurfaceData.c | 11 +- src/solaris/native/sun/nio/ch/Net.c | 9 +- src/solaris/native/sun/xawt/XlibWrapper.c | 10 +- src/windows/classes/java/net/DefaultDatagramSocketImplFactory.java | 51 +- src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java | 32 +- src/windows/classes/java/net/DualStackPlainSocketImpl.java | 32 +- src/windows/classes/java/net/PlainSocketImpl.java | 25 +- src/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java | 47 +- src/windows/classes/java/net/TwoStacksPlainSocketImpl.java | 39 +- src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java | 4 +- src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c | 5 +- src/windows/native/java/net/DualStackPlainSocketImpl.c | 6 +- src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c | 11 +- src/windows/native/java/net/TwoStacksPlainSocketImpl.c | 13 +- src/windows/native/java/net/net_util_md.c | 65 +- src/windows/native/java/net/net_util_md.h | 5 +- src/windows/native/sun/awt/splashscreen/splashscreen_sys.c | 31 +- src/windows/native/sun/font/lcdglyph.c | 10 +- src/windows/native/sun/java2d/opengl/WGLSurfaceData.c | 3 +- src/windows/native/sun/java2d/windows/GDIBlitLoops.cpp | 1 + src/windows/native/sun/java2d/windows/GDIRenderer.cpp | 2 +- src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp | 5 +- src/windows/native/sun/nio/ch/Net.c | 18 +- src/windows/native/sun/windows/CmdIDList.cpp | 6 +- src/windows/native/sun/windows/Devices.cpp | 7 +- src/windows/native/sun/windows/ShellFolder2.cpp | 6 + src/windows/native/sun/windows/WPrinterJob.cpp | 2 +- src/windows/native/sun/windows/alloc.h | 3 + src/windows/native/sun/windows/awt.h | 6 +- src/windows/native/sun/windows/awt_BitmapUtil.cpp | 14 +- src/windows/native/sun/windows/awt_Component.cpp | 45 +- src/windows/native/sun/windows/awt_Cursor.cpp | 6 +- src/windows/native/sun/windows/awt_DataTransferer.cpp | 12 +- src/windows/native/sun/windows/awt_DesktopProperties.cpp | 6 +- src/windows/native/sun/windows/awt_DnDDT.cpp | 4 +- src/windows/native/sun/windows/awt_InputMethod.cpp | 8 +- src/windows/native/sun/windows/awt_PrintControl.cpp | 4 +- src/windows/native/sun/windows/awt_PrintJob.cpp | 17 +- src/windows/native/sun/windows/awt_Robot.cpp | 5 + test/Makefile | 4 +- test/ProblemList.txt | 1 - test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java | 22 +- test/com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java | 45 +- test/java/rmi/Naming/LookupNameWithColon.java | 18 +- test/java/rmi/Naming/RmiIsNoScheme.java | 12 +- test/java/rmi/Naming/UnderscoreHost.java | 71 +- test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java | 6 +- test/java/rmi/activation/Activatable/checkActivateRef/security.policy | 3 +- test/java/rmi/activation/Activatable/checkAnnotations/security.policy | 3 +- test/java/rmi/activation/Activatable/checkImplClassLoader/security.policy | 3 +- test/java/rmi/activation/Activatable/checkRegisterInLog/security.policy | 5 +- test/java/rmi/activation/Activatable/createPrivateActivable/security.policy | 3 +- test/java/rmi/activation/Activatable/downloadParameterClass/security.policy | 3 +- test/java/rmi/activation/Activatable/elucidateNoSuchMethod/security.policy | 3 +- test/java/rmi/activation/Activatable/extLoadedImpl/security.policy | 3 +- test/java/rmi/activation/Activatable/forceLogSnapshot/security.policy | 3 +- test/java/rmi/activation/Activatable/inactiveGroup/security.policy | 5 +- test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java | 4 +- test/java/rmi/activation/Activatable/nestedActivate/security.policy | 5 +- test/java/rmi/activation/Activatable/nonExistentActivatable/security.policy | 3 +- test/java/rmi/activation/Activatable/restartCrashedService/security.policy | 3 +- test/java/rmi/activation/Activatable/restartLatecomer/security.policy | 3 +- test/java/rmi/activation/Activatable/restartService/security.policy | 3 +- test/java/rmi/activation/Activatable/shutdownGracefully/security.policy | 3 +- test/java/rmi/activation/Activatable/unregisterInactive/security.policy | 3 +- test/java/rmi/activation/ActivateFailedException/activateFails/security.policy | 3 +- test/java/rmi/activation/ActivationSystem/activeGroup/security.policy | 3 +- test/java/rmi/activation/ActivationSystem/modifyDescriptor/security.policy | 3 +- test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java | 10 +- test/java/rmi/activation/ActivationSystem/stubClassesPermitted/security.policy | 9 +- test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java | 9 +- test/java/rmi/activation/ActivationSystem/unregisterGroup/security.policy | 3 +- test/java/rmi/activation/CommandEnvironment/SetChildEnv.java | 37 +- test/java/rmi/activation/CommandEnvironment/security.policy | 1 + test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java | 20 +- test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java | 23 +- test/java/rmi/activation/rmidViaInheritedChannel/rmid.security.policy | 1 + test/java/rmi/registry/altSecurityManager/AltSecurityManager.java | 45 +- test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java | 11 +- test/java/rmi/registry/emptyName/EmptyName.java | 6 +- test/java/rmi/registry/interfaceHash/InterfaceHash.java | 6 +- test/java/rmi/registry/multipleRegistries/MultipleRegistries.java | 15 +- test/java/rmi/registry/readTest/readTest.java | 9 +- test/java/rmi/registry/readTest/readTest.sh | 5 +- test/java/rmi/registry/reexport/Reexport.java | 25 +- test/java/rmi/reliability/juicer/AppleUserImpl.java | 22 +- test/java/rmi/reliability/juicer/ApplicationServer.java | 27 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/EchoImpl.java | 7 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java | 16 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy | 3 + test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl.java | 5 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java | 14 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy | 2 + test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/EchoImpl.java | 5 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java | 15 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/security.policy | 9 + test/java/rmi/server/RemoteServer/AddrInUse.java | 12 +- test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java | 10 +- test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownImpl.java | 5 +- test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java | 12 +- test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java | 9 +- test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java | 8 +- test/java/rmi/server/Unreferenced/leaseCheckInterval/SelfTerminator.java | 6 +- test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java | 8 +- test/java/rmi/server/useCustomRef/UseCustomRef.java | 8 +- test/java/rmi/server/useCustomRef/security.policy | 3 + test/java/rmi/testlibrary/ActivationLibrary.java | 39 +- test/java/rmi/testlibrary/RMID.java | 25 +- test/java/rmi/testlibrary/RegistryRunner.java | 9 +- test/java/rmi/testlibrary/StreamPipe.java | 2 +- test/java/rmi/testlibrary/TestLibrary.java | 132 +- test/java/rmi/transport/checkFQDN/CheckFQDN.java | 13 +- test/java/rmi/transport/checkFQDN/CheckFQDNClient.java | 5 +- test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java | 13 +- test/java/rmi/transport/checkLeaseInfoLeak/LeaseLeakClient.java | 6 +- test/java/rmi/transport/checkLeaseInfoLeak/security.policy | 1 + test/java/rmi/transport/closeServerSocket/CloseServerSocket.java | 10 +- test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java | 13 +- test/java/rmi/transport/dgcDeadLock/TestImpl.java | 10 +- test/java/rmi/transport/handshakeFailure/HandshakeFailure.java | 7 +- test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java | 7 +- test/java/rmi/transport/httpSocket/HttpSocketTest.java | 16 +- test/java/rmi/transport/httpSocket/security.policy | 4 + test/java/rmi/transport/pinClientSocketFactory/PinClientSocketFactory.java | 6 +- test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java | 9 +- test/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java | 7 +- test/javax/xml/crypto/dsig/GenerationTests.java | 6 +- test/javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java | 7 +- test/javax/xml/crypto/dsig/ValidationTests.java | 4 +- test/sun/reflect/CallerSensitive/CallerSensitiveFinder.java | 248 ++ test/sun/reflect/CallerSensitive/ClassFileReader.java | 338 ++++ test/sun/reflect/CallerSensitive/MethodFinder.java | 201 ++ test/sun/reflect/CallerSensitive/MissingCallerSensitive.java | 73 + test/sun/rmi/rmic/newrmic/equivalence/AppleUserImpl.java | 17 +- test/sun/rmi/rmic/newrmic/equivalence/run.sh | 4 +- test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java | 8 +- test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java | 11 +- test/sun/rmi/transport/proxy/EagerHttpFallback.java | 8 +- test/sun/rmi/transport/tcp/DeadCachedConnection.java | 4 +- test/tools/launcher/Arrrghs.java | 10 +- 516 files changed, 10575 insertions(+), 6661 deletions(-) diffs (truncated from 32551 to 500 lines): diff -r 2c423d0b1965 -r 4a67dd684bc2 make/java/java/FILES_c.gmk --- a/make/java/java/FILES_c.gmk Wed May 30 16:17:48 2012 +0100 +++ b/make/java/java/FILES_c.gmk Tue Jun 18 08:07:48 2013 -0500 @@ -48,7 +48,6 @@ Proxy.c \ RandomAccessFile.c \ RandomAccessFile_md.c \ - ResourceBundle.c \ Runtime.c \ SecurityManager.c \ Shutdown.c \ @@ -69,7 +68,6 @@ jdk_util_md.c \ check_version.c \ java_props_md.c \ - DriverManager.c \ ConstantPool.c \ MessageUtils.c \ GC.c \ diff -r 2c423d0b1965 -r 4a67dd684bc2 make/java/java/mapfile-vers --- a/make/java/java/mapfile-vers Wed May 30 16:17:48 2012 +0100 +++ b/make/java/java/mapfile-vers Tue Jun 18 08:07:48 2013 -0500 @@ -135,7 +135,6 @@ Java_java_lang_ClassLoader_00024NativeLibrary_find; Java_java_lang_ClassLoader_00024NativeLibrary_load; Java_java_lang_ClassLoader_00024NativeLibrary_unload; - Java_java_lang_ClassLoader_getCaller; Java_java_lang_ClassLoader_registerNatives; Java_java_lang_Compiler_registerNatives; Java_java_lang_Double_longBitsToDouble; @@ -233,8 +232,6 @@ Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedExceptionAction_2Ljava_security_AccessControlContext_2; Java_java_security_AccessController_getStackAccessControlContext; Java_java_security_AccessController_getInheritedAccessControlContext; - Java_java_sql_DriverManager_getCallerClassLoader; - Java_java_util_ResourceBundle_getClassContext; Java_java_util_TimeZone_getSystemTimeZoneID; Java_java_util_TimeZone_getSystemGMTOffsetID; Java_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8; diff -r 2c423d0b1965 -r 4a67dd684bc2 make/java/java/reorder-i586 --- a/make/java/java/reorder-i586 Wed May 30 16:17:48 2012 +0100 +++ b/make/java/java/reorder-i586 Tue Jun 18 08:07:48 2013 -0500 @@ -73,7 +73,6 @@ # Test Sleep # Test IntToString # Test LoadToolkit -text: .text%Java_java_util_ResourceBundle_getClassContext; text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2; text: .text%JNU_GetEnv; text: .text%Java_java_io_UnixFileSystem_checkAccess; diff -r 2c423d0b1965 -r 4a67dd684bc2 make/java/java/reorder-sparc --- a/make/java/java/reorder-sparc Wed May 30 16:17:48 2012 +0100 +++ b/make/java/java/reorder-sparc Tue Jun 18 08:07:48 2013 -0500 @@ -78,7 +78,6 @@ # Test Sleep # Test IntToString # Test LoadToolkit -text: .text%Java_java_util_ResourceBundle_getClassContext; text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2; text: .text%JNU_GetEnv; text: .text%Java_java_io_UnixFileSystem_checkAccess; diff -r 2c423d0b1965 -r 4a67dd684bc2 make/java/java/reorder-sparcv9 --- a/make/java/java/reorder-sparcv9 Wed May 30 16:17:48 2012 +0100 +++ b/make/java/java/reorder-sparcv9 Tue Jun 18 08:07:48 2013 -0500 @@ -74,7 +74,6 @@ # Test Sleep # Test IntToString # Test LoadToolkit -text: .text%Java_java_util_ResourceBundle_getClassContext; text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2; text: .text%JNU_GetEnv; text: .text%Java_java_io_UnixFileSystem_checkAccess; diff -r 2c423d0b1965 -r 4a67dd684bc2 make/java/nio/mapfile-linux --- a/make/java/nio/mapfile-linux Wed May 30 16:17:48 2012 +0100 +++ b/make/java/nio/mapfile-linux Tue Jun 18 08:07:48 2013 -0500 @@ -115,6 +115,7 @@ Java_sun_nio_ch_Net_setInterface6; Java_sun_nio_ch_Net_getInterface6; Java_sun_nio_ch_Net_shutdown; + Java_sun_nio_ch_Net_isExclusiveBindAvailable; Java_sun_nio_ch_PollArrayWrapper_interrupt; Java_sun_nio_ch_PollArrayWrapper_poll0; Java_sun_nio_ch_ServerSocketChannelImpl_accept0; diff -r 2c423d0b1965 -r 4a67dd684bc2 make/java/nio/mapfile-solaris --- a/make/java/nio/mapfile-solaris Wed May 30 16:17:48 2012 +0100 +++ b/make/java/nio/mapfile-solaris Tue Jun 18 08:07:48 2013 -0500 @@ -103,6 +103,7 @@ Java_sun_nio_ch_Net_setInterface6; Java_sun_nio_ch_Net_getInterface6; Java_sun_nio_ch_Net_shutdown; + Java_sun_nio_ch_Net_isExclusiveBindAvailable; Java_sun_nio_ch_PollArrayWrapper_interrupt; Java_sun_nio_ch_PollArrayWrapper_poll0; Java_sun_nio_ch_ServerSocketChannelImpl_accept0; diff -r 2c423d0b1965 -r 4a67dd684bc2 make/java/zip/mapfile-vers --- a/make/java/zip/mapfile-vers Wed May 30 16:17:48 2012 +0100 +++ b/make/java/zip/mapfile-vers Tue Jun 18 08:07:48 2013 -0500 @@ -67,6 +67,7 @@ Java_java_util_zip_ZipFile_initIDs; Java_java_util_zip_ZipFile_open; Java_java_util_zip_ZipFile_read; + Java_java_util_zip_ZipFile_startsWithLOC; ZIP_Close; ZIP_CRC32; diff -r 2c423d0b1965 -r 4a67dd684bc2 make/java/zip/reorder-i586 --- a/make/java/zip/reorder-i586 Wed May 30 16:17:48 2012 +0100 +++ b/make/java/zip/reorder-i586 Tue Jun 18 08:07:48 2013 -0500 @@ -19,6 +19,7 @@ text: .text%Java_java_util_zip_ZipFile_initIDs; text: .text%Java_java_util_zip_ZipFile_open; text: .text%Java_java_util_zip_ZipFile_getTotal; +text: .text%Java_java_util_zip_ZipFile_startsWithLOC; text: .text%Java_java_util_zip_ZipFile_getEntry; text: .text%Java_java_util_zip_ZipFile_freeEntry; text: .text%Java_java_util_zip_ZipFile_getEntryTime; diff -r 2c423d0b1965 -r 4a67dd684bc2 make/java/zip/reorder-sparc --- a/make/java/zip/reorder-sparc Wed May 30 16:17:48 2012 +0100 +++ b/make/java/zip/reorder-sparc Tue Jun 18 08:07:48 2013 -0500 @@ -18,6 +18,7 @@ text: .text%Java_java_util_zip_ZipFile_initIDs; text: .text%Java_java_util_zip_ZipFile_open; text: .text%Java_java_util_zip_ZipFile_getTotal; +text: .text%Java_java_util_zip_ZipFile_startsWithLOC; text: .text%Java_java_util_zip_ZipFile_getEntry; text: .text%Java_java_util_zip_ZipFile_freeEntry; text: .text%Java_java_util_zip_ZipFile_getEntryTime; diff -r 2c423d0b1965 -r 4a67dd684bc2 make/java/zip/reorder-sparcv9 --- a/make/java/zip/reorder-sparcv9 Wed May 30 16:17:48 2012 +0100 +++ b/make/java/zip/reorder-sparcv9 Tue Jun 18 08:07:48 2013 -0500 @@ -18,6 +18,7 @@ text: .text%Java_java_util_zip_ZipFile_initIDs; text: .text%Java_java_util_zip_ZipFile_open; text: .text%Java_java_util_zip_ZipFile_getTotal; +text: .text%Java_java_util_zip_ZipFile_startsWithLOC; text: .text%Java_java_util_zip_ZipFile_getEntry; text: .text%Java_java_util_zip_ZipFile_freeEntry; text: .text%Java_java_util_zip_ZipFile_getEntryTime; diff -r 2c423d0b1965 -r 4a67dd684bc2 make/sun/awt/Makefile --- a/make/sun/awt/Makefile Wed May 30 16:17:48 2012 +0100 +++ b/make/sun/awt/Makefile Tue Jun 18 08:07:48 2013 -0500 @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -38,6 +38,10 @@ OTHER_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES +ifneq ($(PLATFORM), windows) +CLASSES_INIT += $(TEMPDIR)/.gen_icons +endif + # # Files # @@ -180,6 +184,79 @@ endif build: fontconfigs +ifneq ($(PLATFORM), windows) + +GEN_DIR=$(GENSRCDIR)/sun/awt/ + +ifdef OPENJDK + ICONS_PATH_PREFIX=$(PLATFORM_SRC) +else + ICONS_PATH_PREFIX=$(CLOSED_SRC)/solaris +endif + +ICONS = \ + $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon16.png \ + $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon24.png \ + $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon32.png \ + $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon48.png + +ICONPATH=$(SHARE_SRC)/classes/sun/awt/resources + +ICONS += \ + $(ICONPATH)/security-icon-bw16.png \ + $(ICONPATH)/security-icon-interim16.png \ + $(ICONPATH)/security-icon-yellow16.png \ + $(ICONPATH)/security-icon-bw24.png \ + $(ICONPATH)/security-icon-interim24.png \ + $(ICONPATH)/security-icon-yellow24.png \ + $(ICONPATH)/security-icon-bw32.png \ + $(ICONPATH)/security-icon-interim32.png \ + $(ICONPATH)/security-icon-yellow32.png \ + $(ICONPATH)/security-icon-bw48.png \ + $(ICONPATH)/security-icon-interim48.png \ + $(ICONPATH)/security-icon-yellow48.png + +TEMPDIR_CLASSES = $(TEMPDIR)/classes + +generated.clean: + $(RM) -r $(GEN_DIR)/*.java + $(RM) -r $(TEMPDIR)/.gen_icons + +$(TEMPDIR_CLASSES)/sun/awt/ToBin.class: ToBin.java + @$(prep-target) + $(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $< + +$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/ToBin.class $(ICONS) + $(prep-target) + for i in $(ICONS); do \ + filename=`basename $$i`; \ + name=`$(ECHO) $$filename | $(TR) '\-.' '__'`; \ + classname=$(GEN_DIR)/AWTIcon32_$$name.java; \ + $(RM) $$classname; \ + $(ECHO) "package sun.awt;" >> $$classname ; \ + $(ECHO) "public class AWTIcon32_$$name {" >> $$classname; \ + $(ECHO) "public final static int[] $$name = { " >> $$classname; \ + $(CAT) $$i | \ + $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ + -Djava.awt.headless=true \ + sun.awt.ToBin >> $$classname; \ + $(ECHO) "}; }" >> $$classname; \ + classname=$(GEN_DIR)/AWTIcon64_$$name.java; \ + $(RM) $$classname; \ + $(ECHO) "package sun.awt;" >> $$classname ; \ + $(ECHO) "public class AWTIcon64_$$name {" >> $$classname; \ + $(ECHO) "public final static long[] $$name = { " >> $$classname; \ + $(CAT) $$i | \ + $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ + -Djava.awt.headless=true \ + sun.awt.ToBin >> $$classname; \ + $(ECHO) "}; }" >> $$classname; \ + done + $(TOUCH) $@ + +clean clobber:: generated.clean +endif + ifeq ($(PLATFORM), windows) # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv WINDOWS @@ -517,5 +594,5 @@ java.lang.Integer \ java.lang.ThreadGroup -.PHONY: dgalibs dgalib.clean fontconfigs fontconfigs.clean +.PHONY: dgalibs dgalib.clean fontconfigs fontconfigs.clean generated.clean diff -r 2c423d0b1965 -r 4a67dd684bc2 make/sun/awt/ToBin.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/sun/awt/ToBin.java Tue Jun 18 08:07:48 2013 -0500 @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code 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 + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package sun.awt; + +import java.io.*; +import java.awt.image.*; +import javax.imageio.*; +import java.awt.*; + +public class ToBin { + public static void main(String[] args) throws Exception { + BufferedImage im = ImageIO.read(System.in); + BufferedImage bi = null; + int iconWidth = im.getWidth(null); + int iconHeight = im.getHeight(null); + if (im != null && iconHeight != 0 && iconWidth != 0) { + bi = new BufferedImage(iconWidth, iconHeight, BufferedImage.TYPE_INT_ARGB); + Graphics g = bi.getGraphics(); + try { + g.drawImage(im, 0, 0, iconWidth, iconHeight, null); + } finally { + g.dispose(); + } + } + DataBuffer srcBuf = bi.getData().getDataBuffer(); + int[] buf = ((DataBufferInt)srcBuf).getData(); + System.out.print(iconWidth + ","); + System.out.println(iconHeight + ","); + for (int i = 0; i < buf.length; i++) { + System.out.print("0x" + Integer.toHexString(buf[i]) + ", "); + if (i % 10 == 0) { + System.out.println(); + } + } + } +} diff -r 2c423d0b1965 -r 4a67dd684bc2 make/sun/xawt/Makefile --- a/make/sun/xawt/Makefile Wed May 30 16:17:48 2012 +0100 +++ b/make/sun/xawt/Makefile Tue Jun 18 08:07:48 2013 -0500 @@ -1,5 +1,5 @@ # -# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -34,7 +34,7 @@ GEN_DIR=$(GENSRCDIR)/sun/awt/X11 -CLASSES_INIT += $(TEMPDIR)/.gen.wrappers $(TEMPDIR)/.gen_icons touch.wrappers +CLASSES_INIT += $(TEMPDIR)/.gen.wrappers touch.wrappers .PHONY: generated.clean @@ -354,70 +354,7 @@ $(RM) -r $(WRAPPER_GENERATOR_TEMPDIR) $(RM) -r $(WRAPPER_GENERATOR_DIR) $(RM) -r $(GEN_DIR)/*.java - $(RM) -r $(TEMPDIR)/.gen_icons -ifdef OPENJDK - ICONS_PATH_PREFIX=$(PLATFORM_SRC) -else - ICONS_PATH_PREFIX=$(CLOSED_SRC)/solaris -endif - -ICONS = \ - $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon16.png \ - $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon24.png \ - $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon32.png \ - $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon48.png - - -ICONPATH=$(PLATFORM_SRC)/classes/sun/awt/X11 - -ICONS += \ - $(ICONPATH)/security-icon-bw16.png \ - $(ICONPATH)/security-icon-interim16.png \ - $(ICONPATH)/security-icon-yellow16.png \ - $(ICONPATH)/security-icon-bw24.png \ - $(ICONPATH)/security-icon-interim24.png \ - $(ICONPATH)/security-icon-yellow24.png \ - $(ICONPATH)/security-icon-bw32.png \ - $(ICONPATH)/security-icon-interim32.png \ - $(ICONPATH)/security-icon-yellow32.png \ - $(ICONPATH)/security-icon-bw48.png \ - $(ICONPATH)/security-icon-interim48.png \ - $(ICONPATH)/security-icon-yellow48.png - -TEMPDIR_CLASSES = $(TEMPDIR)/classes - -$(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class: ToBin.java - @$(prep-target) - $(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $< - -$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class $(ICONS) - $(prep-target) - for i in $(ICONS); do \ - filename=`basename $$i`; \ - name=`$(ECHO) $$filename | $(TR) '\-.' '__'`; \ - classname=$(GEN_DIR)/XAWTIcon32_$$name.java; \ - $(RM) $$classname; \ - $(ECHO) "package sun.awt.X11;" >> $$classname ; \ - $(ECHO) "public class XAWTIcon32_$$name {" >> $$classname; \ - $(ECHO) "public static int[] $$name = { " >> $$classname; \ - $(CAT) $$i | \ - $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ - -Djava.awt.headless=true \ - sun.awt.X11.ToBin >> $$classname; \ - $(ECHO) "}; }" >> $$classname; \ - classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \ - $(RM) $$classname; \ - $(ECHO) "package sun.awt.X11;" >> $$classname ; \ - $(ECHO) "public class XAWTIcon64_$$name {" >> $$classname; \ - $(ECHO) "public static long[] $$name = { " >> $$classname; \ - $(CAT) $$i | \ - $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ - -Djava.awt.headless=true \ - sun.awt.X11.ToBin >> $$classname; \ - $(ECHO) "}; }" >> $$classname; \ - done - $(TOUCH) $@ clean clobber:: generated.clean diff -r 2c423d0b1965 -r 4a67dd684bc2 make/sun/xawt/ToBin.java --- a/make/sun/xawt/ToBin.java Wed May 30 16:17:48 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code 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 - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package sun.awt.X11; - -import java.io.*; -import java.awt.image.*; -import javax.imageio.*; -import java.awt.*; - -public class ToBin { - public static void main(String[] args) throws Exception { - BufferedImage im = ImageIO.read(System.in); - BufferedImage bi = null; - int iconWidth = im.getWidth(null); - int iconHeight = im.getHeight(null); - if (im != null && iconHeight != 0 && iconWidth != 0) { - bi = new BufferedImage(iconWidth, iconHeight, BufferedImage.TYPE_INT_ARGB); - Graphics g = bi.getGraphics(); - try { - g.drawImage(im, 0, 0, iconWidth, iconHeight, null); - } finally { - g.dispose(); - } - } - DataBuffer srcBuf = bi.getData().getDataBuffer(); - int[] buf = ((DataBufferInt)srcBuf).getData(); - System.out.print(iconWidth + ","); - System.out.println(iconHeight + ","); - for (int i = 0; i < buf.length; i++) { - System.out.print("0x" + Integer.toHexString(buf[i]) + ", "); - if (i % 10 == 0) { - System.out.println(); - } - } - } -} diff -r 2c423d0b1965 -r 4a67dd684bc2 src/share/bin/java.c --- a/src/share/bin/java.c Wed May 30 16:17:48 2012 +0100 +++ b/src/share/bin/java.c Tue Jun 18 08:07:48 2013 -0500 @@ -714,6 +714,13 @@ char *def; const char *orig = s; static const char format[] = "-Djava.class.path=%s"; + /* + * usually we should not get a null pointer, but there are cases where + * we might just get one, in which case we simply ignore it, and let the + * caller deal with it + */ + if (s == NULL) + return; s = JLI_WildcardExpandClasspath(s); def = JLI_MemAlloc(sizeof(format) - 2 /* strlen("%s") */ diff -r 2c423d0b1965 -r 4a67dd684bc2 src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java --- a/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java Wed May 30 16:17:48 2012 +0100 +++ b/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java Tue Jun 18 08:07:48 2013 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -407,8 +407,9 @@ } return skey; } else if (algorithm.equals("TlsPremasterSecret")) { - // return entire secret - return new SecretKeySpec(secret, "TlsPremasterSecret"); + // remove leading zero bytes per RFC 5246 Section 8.1.2 + return new SecretKeySpec( + KeyUtil.trimZeroes(secret), "TlsPremasterSecret"); } else { throw new NoSuchAlgorithmException("Unsupported secret key " From andrew at icedtea.classpath.org Tue Jun 18 14:11:44 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 18 Jun 2013 21:11:44 +0000 Subject: /hg/release/icedtea7-forest-2.2/corba: 2 new changesets Message-ID: changeset ed6b758d2f21 in /hg/release/icedtea7-forest-2.2/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/corba?cmd=changeset;node=ed6b758d2f21 author: andrew date: Wed Jun 12 12:00:25 2013 +0100 8000642: Better handling of objects for transportation Summary: Also reviewed by alexander.fomin Reviewed-by: alanb, mchung, skoivu changeset 4fdf74f61b48 in /hg/release/icedtea7-forest-2.2/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/corba?cmd=changeset;node=4fdf74f61b48 author: andrew date: Wed Jun 12 12:03:45 2013 +0100 8001032: Restrict object access Summary: Restrict object access; fix reviewed also by Alexander Fomin Reviewed-by: alanb, ahgross diffstat: make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk | 3 +- src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java | 3 +- src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java | 12 +- src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java | 5 +- src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java | 4 +- src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java | 8 +- src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java | 5 +- src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java | 3 +- src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java | 18 +- src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java | 8 +- src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java | 10 +- src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java | 2 +- src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java | 2 +- src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java | 10 +- src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java | 3 +- src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java | 5 +- src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java | 8 +- src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java | 3 +- src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java | 5 +- src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java | 5 +- src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java | 7 +- src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java | 11 +- src/share/classes/com/sun/corba/se/impl/orb/ORBDataParserImpl.java | 3 +- src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java | 5 +- src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java | 4 +- src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java | 22 +- src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java | 8 +- src/share/classes/com/sun/corba/se/impl/protocol/CorbaMessageMediatorImpl.java | 22 +- src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_2.java | 3 +- src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageBase.java | 8 +- src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_0.java | 3 +- src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_1.java | 3 +- src/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoBase.java | 4 +- src/share/classes/com/sun/corba/se/impl/transport/SharedCDRContactInfoImpl.java | 4 +- src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java | 8 +- src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java | 6 +- src/share/classes/com/sun/corba/se/spi/ior/TaggedComponentBase.java | 5 +- src/share/classes/com/sun/corba/se/spi/orb/ORB.java | 6 +- src/share/classes/com/sun/corba/se/spi/orb/OperationFactory.java | 8 +- src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContext.java | 5 +- src/share/classes/org/omg/CORBA_2_3/portable/OutputStream.java | 40 ++- src/share/classes/sun/corba/JavaCorbaAccess.java | 3 +- src/share/classes/sun/corba/OutputStreamFactory.java | 149 ++++++++++ 43 files changed, 339 insertions(+), 120 deletions(-) diffs (truncated from 1285 to 500 lines): diff -r a4775a012956 -r 4fdf74f61b48 make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk --- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk Wed May 22 17:57:06 2013 +0100 +++ b/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -39,7 +39,6 @@ com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java \ com/sun/corba/se/impl/orbutil/ORBConstants.java \ com/sun/corba/se/impl/orbutil/ORBUtility.java \ - com/sun/corba/se/impl/orbutil/ORBClassLoader.java \ com/sun/corba/se/impl/orbutil/RepIdDelegator.java \ com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java \ com/sun/corba/se/impl/orbutil/RepositoryIdStrings.java \ diff -r a4775a012956 -r 4fdf74f61b48 src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java --- a/src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java Wed May 22 17:57:06 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -81,7 +81,6 @@ import com.sun.corba.se.impl.oa.poa.BadServerIdHandler; import com.sun.corba.se.impl.orbutil.ORBConstants; -import com.sun.corba.se.impl.orbutil.ORBClassLoader; import com.sun.corba.se.impl.orbutil.ORBUtility; import com.sun.corba.se.impl.util.Utility; diff -r a4775a012956 -r 4fdf74f61b48 src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java --- a/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Wed May 22 17:57:06 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,6 +33,8 @@ import java.io.Serializable; import java.math.BigDecimal; +import java.security.AccessController; +import java.security.PrivilegedAction; import java.util.List ; import java.util.ArrayList ; @@ -504,7 +506,13 @@ public org.omg.CORBA.portable.OutputStream create_output_stream() { //debug.log ("create_output_stream"); - return new AnyOutputStream(orb); + final ORB finalorb = this.orb; + return AccessController.doPrivileged(new PrivilegedAction() { + @Override + public AnyOutputStream run() { + return new AnyOutputStream(finalorb); + } + }); } /** diff -r a4775a012956 -r 4fdf74f61b48 src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java --- a/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java Wed May 22 17:57:06 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -600,7 +600,8 @@ } public static CDROutputStream newOutputStream(ORB orb) { - TypeCodeOutputStream tcos = new TypeCodeOutputStream((ORB)orb); + TypeCodeOutputStream tcos = + sun.corba.OutputStreamFactory.newTypeCodeOutputStream(orb); //if (debug) System.out.println("Created TypeCodeOutputStream " + tcos + // " with no parent"); return tcos; diff -r a4775a012956 -r 4fdf74f61b48 src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java --- a/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java Wed May 22 17:57:06 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -66,7 +66,7 @@ * * @author Ram Jeyaraman */ -public class IDLJavaSerializationOutputStream extends CDROutputStreamBase { +final class IDLJavaSerializationOutputStream extends CDROutputStreamBase { private ORB orb; private byte encodingVersion; diff -r a4775a012956 -r 4fdf74f61b48 src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java --- a/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java Wed May 22 17:57:06 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -196,7 +196,8 @@ } public TypeCodeOutputStream createEncapsulation(org.omg.CORBA.ORB _orb) { - TypeCodeOutputStream encap = new TypeCodeOutputStream((ORB)_orb, isLittleEndian()); + TypeCodeOutputStream encap = + sun.corba.OutputStreamFactory.newTypeCodeOutputStream((ORB)_orb, isLittleEndian()); encap.setEnclosingOutputStream(this); encap.makeEncapsulation(); //if (TypeCodeImpl.debug) System.out.println("Created TypeCodeOutputStream " + encap + " with parent " + this); @@ -211,7 +212,8 @@ public static TypeCodeOutputStream wrapOutputStream(OutputStream os) { boolean littleEndian = ((os instanceof CDROutputStream) ? ((CDROutputStream)os).isLittleEndian() : false); - TypeCodeOutputStream tos = new TypeCodeOutputStream((ORB)os.orb(), littleEndian); + TypeCodeOutputStream tos = + sun.corba.OutputStreamFactory.newTypeCodeOutputStream((ORB)os.orb(), littleEndian); tos.setEnclosingOutputStream(os); //if (TypeCodeImpl.debug) System.out.println("Created TypeCodeOutputStream " + tos + " with parent " + os); return tos; diff -r a4775a012956 -r 4fdf74f61b48 src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java --- a/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java Wed May 22 17:57:06 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -155,7 +155,8 @@ // be versioned. This can be handled once this work is complete. // Create output stream with default endianness. - EncapsOutputStream cdrOut = new EncapsOutputStream( + EncapsOutputStream cdrOut = + sun.corba.OutputStreamFactory.newEncapsOutputStream( (com.sun.corba.se.spi.orb.ORB)orb, giopVersion ); // This is an encapsulation, so put out the endian: diff -r a4775a012956 -r 4fdf74f61b48 src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java --- a/src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java Wed May 22 17:57:06 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -77,7 +77,6 @@ import com.sun.corba.se.impl.logging.ORBUtilSystemException; import com.sun.corba.se.impl.logging.OMGSystemException; import com.sun.corba.se.impl.corba.RequestImpl; -import com.sun.corba.se.impl.orbutil.ORBClassLoader; import com.sun.corba.se.impl.orbutil.ORBConstants; import com.sun.corba.se.impl.orbutil.ORBUtility; import com.sun.corba.se.impl.orbutil.StackImpl; diff -r a4775a012956 -r 4fdf74f61b48 src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java --- a/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java Wed May 22 17:57:06 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -86,13 +86,14 @@ import com.sun.corba.se.impl.encoding.EncapsOutputStream; import com.sun.corba.se.impl.orbutil.ORBUtility; -import com.sun.corba.se.impl.orbutil.ORBClassLoader; import com.sun.corba.se.impl.util.RepositoryId; import com.sun.corba.se.impl.logging.InterceptorsSystemException; import com.sun.corba.se.impl.logging.OMGSystemException; +import sun.corba.SharedSecrets; + /** * Implementation of the RequestInfo interface as specified in * orbos/99-12-02 section 5.4.1. @@ -452,7 +453,8 @@ // Find the read method on the helper class: String helperClassName = className + "Helper"; - Class helperClass = ORBClassLoader.loadClass( helperClassName ); + Class helperClass = + SharedSecrets.getJavaCorbaAccess().loadClass( helperClassName ); Class[] readParams = new Class[1]; readParams[0] = org.omg.CORBA.portable.InputStream.class; Method readMethod = helperClass.getMethod( "read", readParams ); @@ -512,7 +514,8 @@ Class exceptionClass = userException.getClass(); String className = exceptionClass.getName(); String helperClassName = className + "Helper"; - Class helperClass = ORBClassLoader.loadClass( helperClassName ); + Class helperClass = + SharedSecrets.getJavaCorbaAccess().loadClass( helperClassName ); // Find insert( Any, class ) method Class[] insertMethodParams = new Class[2]; @@ -656,7 +659,8 @@ // Convert the "core" service context to an // "IOP" ServiceContext by writing it to a // CDROutputStream and reading it back. - EncapsOutputStream out = new EncapsOutputStream(myORB); + EncapsOutputStream out = + sun.corba.OutputStreamFactory.newEncapsOutputStream(myORB); context.write( out, GIOPVersion.V1_2 ); InputStream inputStream = out.create_input_stream(); @@ -692,8 +696,8 @@ { int id = 0 ; // Convert IOP.service_context to core.ServiceContext: - EncapsOutputStream outputStream = new EncapsOutputStream( - myORB ); + EncapsOutputStream outputStream = + sun.corba.OutputStreamFactory.newEncapsOutputStream(myORB); InputStream inputStream = null; UnknownServiceContext coreServiceContext = null; ServiceContextHelper.write( outputStream, service_context ); diff -r a4775a012956 -r 4fdf74f61b48 src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java --- a/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Wed May 22 17:57:06 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Wed Jun 12 12:03:45 2013 +0100 @@ -300,11 +300,11 @@ resetStream(); } - public final void setOrbStream(org.omg.CORBA_2_3.portable.InputStream os) { + final void setOrbStream(org.omg.CORBA_2_3.portable.InputStream os) { orbStream = os; } - public final org.omg.CORBA_2_3.portable.InputStream getOrbStream() { + final org.omg.CORBA_2_3.portable.InputStream getOrbStream() { return orbStream; } @@ -327,11 +327,11 @@ return (javax.rmi.CORBA.ValueHandler) vhandler; } - public final void increaseRecursionDepth(){ + final void increaseRecursionDepth(){ recursionDepth++; } - public final int decreaseRecursionDepth(){ + final int decreaseRecursionDepth(){ return --recursionDepth; } diff -r a4775a012956 -r 4fdf74f61b48 src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java --- a/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java Wed May 22 17:57:06 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -124,19 +124,19 @@ } } - public final void setOrbStream(org.omg.CORBA_2_3.portable.OutputStream os) { + final void setOrbStream(org.omg.CORBA_2_3.portable.OutputStream os) { orbStream = os; } - public final org.omg.CORBA_2_3.portable.OutputStream getOrbStream() { + final org.omg.CORBA_2_3.portable.OutputStream getOrbStream() { return orbStream; } - public final void increaseRecursionDepth(){ + final void increaseRecursionDepth(){ recursionDepth++; } - public final int decreaseRecursionDepth(){ + final int decreaseRecursionDepth(){ return --recursionDepth; } diff -r a4775a012956 -r 4fdf74f61b48 src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java --- a/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java Wed May 22 17:57:06 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java Wed Jun 12 12:03:45 2013 +0100 @@ -251,7 +251,7 @@ } protected abstract byte getStreamFormatVersion(); - protected abstract org.omg.CORBA_2_3.portable.InputStream getOrbStream(); + abstract org.omg.CORBA_2_3.portable.InputStream getOrbStream(); // Description of possible actions protected static class ReadObjectState { diff -r a4775a012956 -r 4fdf74f61b48 src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java --- a/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java Wed May 22 17:57:06 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java Wed Jun 12 12:03:45 2013 +0100 @@ -179,7 +179,7 @@ putFields.write(this); } - public abstract org.omg.CORBA_2_3.portable.OutputStream getOrbStream(); + abstract org.omg.CORBA_2_3.portable.OutputStream getOrbStream(); protected abstract void beginOptionalCustomData(); diff -r a4775a012956 -r 4fdf74f61b48 src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java --- a/src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java Wed May 22 17:57:06 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -98,6 +98,14 @@ public ValueHandlerImpl newValueHandlerImpl() { return ValueHandlerImpl.getInstance(); } + public Class loadClass(String className) throws ClassNotFoundException { + if (Thread.currentThread().getContextClassLoader() != null) { + return Thread.currentThread().getContextClassLoader(). + loadClass(className); + } else { + return ClassLoader.getSystemClassLoader().loadClass(className); + } + } }); } diff -r a4775a012956 -r 4fdf74f61b48 src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java --- a/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java Wed May 22 17:57:06 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java Wed Jun 12 12:03:45 2013 +0100 @@ -128,7 +128,8 @@ static public void writeEncapsulation( WriteContents obj, OutputStream os ) { - EncapsOutputStream out = new EncapsOutputStream( (ORB)os.orb() ) ; + EncapsOutputStream out = + sun.corba.OutputStreamFactory.newEncapsOutputStream((ORB)os.orb()); out.putEndian() ; diff -r a4775a012956 -r 4fdf74f61b48 src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java --- a/src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java Wed May 22 17:57:06 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -95,7 +95,8 @@ public org.omg.IOP.TaggedProfile getIOPProfile() { - EncapsOutputStream os = new EncapsOutputStream( orb ) ; + EncapsOutputStream os = + sun.corba.OutputStreamFactory.newEncapsOutputStream(orb); write( os ) ; InputStream is = (InputStream)(os.create_input_stream()) ; return org.omg.IOP.TaggedProfileHelper.read( is ) ; diff -r a4775a012956 -r 4fdf74f61b48 src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java --- a/src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java Wed May 22 17:57:06 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -213,7 +213,8 @@ { StringWriter bs; - MarshalOutputStream s = new EncapsOutputStream(factory); + MarshalOutputStream s = + sun.corba.OutputStreamFactory.newEncapsOutputStream(factory); s.putEndian(); write( (OutputStream)s ); bs = new StringWriter(); @@ -237,7 +238,8 @@ } public org.omg.IOP.IOR getIOPIOR() { - EncapsOutputStream os = new EncapsOutputStream(factory); + EncapsOutputStream os = + sun.corba.OutputStreamFactory.newEncapsOutputStream(factory); write(os); InputStream is = (InputStream) (os.create_input_stream()); return org.omg.IOP.IORHelper.read(is); diff -r a4775a012956 -r 4fdf74f61b48 src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java --- a/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java Wed May 22 17:57:06 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java Wed Jun 12 12:03:45 2013 +0100 @@ -87,7 +87,8 @@ public byte[] getBytes( org.omg.CORBA.ORB orb ) { - EncapsOutputStream os = new EncapsOutputStream( (ORB)orb ) ; + EncapsOutputStream os = + sun.corba.OutputStreamFactory.newEncapsOutputStream((ORB)orb); write( os ) ; return os.toByteArray() ; } diff -r a4775a012956 -r 4fdf74f61b48 src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java --- a/src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java Wed May 22 17:57:06 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -61,7 +61,8 @@ public TaggedComponent create( org.omg.CORBA.ORB orb, org.omg.IOP.TaggedComponent comp ) { - EncapsOutputStream os = new EncapsOutputStream( (ORB)orb ) ; + EncapsOutputStream os = + sun.corba.OutputStreamFactory.newEncapsOutputStream((ORB)orb); org.omg.IOP.TaggedComponentHelper.write( os, comp ) ; InputStream is = (InputStream)(os.create_input_stream() ) ; // Skip the component ID: we just wrote it out above diff -r a4775a012956 -r 4fdf74f61b48 src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java --- a/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java Wed May 22 17:57:06 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -247,7 +247,8 @@ public org.omg.IOP.TaggedProfile getIOPProfile() { - EncapsOutputStream os = new EncapsOutputStream( orb ) ; + EncapsOutputStream os = + sun.corba.OutputStreamFactory.newEncapsOutputStream(orb); os.write_long( getId() ) ; write( os ) ; InputStream is = (InputStream)(os.create_input_stream()) ; diff -r a4775a012956 -r 4fdf74f61b48 src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java --- a/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java Wed May 22 17:57:06 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -132,8 +132,9 @@ // Note that this cannot be accomplished with a codec! // Use the byte order of the given stream - OutputStream encapsulatedOS = new EncapsOutputStream( (ORB)os.orb(), - ((CDROutputStream)os).isLittleEndian() ) ; + OutputStream encapsulatedOS = + sun.corba.OutputStreamFactory.newEncapsOutputStream( + (ORB)os.orb(), ((CDROutputStream)os).isLittleEndian() ) ; okeyTemplate.write( id, encapsulatedOS ) ; EncapsulationUtility.writeOutputStream( encapsulatedOS, os ) ; diff -r a4775a012956 -r 4fdf74f61b48 src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java --- a/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java Wed May 22 17:57:06 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java Wed Jun 12 12:03:45 2013 +0100 @@ -1,5 +1,5 @@ From andrew at icedtea.classpath.org Tue Jun 18 14:11:55 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 18 Jun 2013 21:11:55 +0000 Subject: /hg/release/icedtea7-forest-2.2/jaxws: 8009008: Better manage ma... Message-ID: changeset 5942fdde2af6 in /hg/release/icedtea7-forest-2.2/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxws?cmd=changeset;node=5942fdde2af6 author: mkos date: Thu Mar 21 11:08:05 2013 -0400 8009008: Better manage management-api Summary: Preventing management-api methods from invoking reflection on inappropriate methods; fix reviewed also by Alexander Fomin Reviewed-by: mullan, skoivu diffstat: sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java | 6 ++-- sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java | 6 ++-- sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java | 6 ++-- sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java | 6 ++-- sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java | 6 ++-- sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java | 15 ++++++++-- sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java | 5 ++- sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java | 6 ++-- 8 files changed, 33 insertions(+), 23 deletions(-) diffs (272 lines): diff -r 1257bb90b9c0 -r 5942fdde2af6 sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java --- a/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java Wed May 22 17:57:04 2013 +0100 +++ b/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java Thu Mar 21 11:08:05 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,6 @@ package com.sun.org.glassfish.external.statistics.impl; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; import com.sun.org.glassfish.external.statistics.AverageRangeStatistic; @@ -139,6 +138,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + checkMethod(method); + Object result; try { result = method.invoke(this, args); @@ -147,7 +148,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 1257bb90b9c0 -r 5942fdde2af6 sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java --- a/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java Wed May 22 17:57:04 2013 +0100 +++ b/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java Thu Mar 21 11:08:05 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.BoundaryStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -81,6 +80,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -89,7 +90,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 1257bb90b9c0 -r 5942fdde2af6 sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java --- a/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java Wed May 22 17:57:04 2013 +0100 +++ b/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java Thu Mar 21 11:08:05 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.BoundedRangeStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -145,6 +144,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -153,7 +154,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 1257bb90b9c0 -r 5942fdde2af6 sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java --- a/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java Wed May 22 17:57:04 2013 +0100 +++ b/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java Thu Mar 21 11:08:05 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.CountStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -103,6 +102,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -111,7 +112,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 1257bb90b9c0 -r 5942fdde2af6 sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java --- a/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java Wed May 22 17:57:04 2013 +0100 +++ b/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java Thu Mar 21 11:08:05 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.RangeStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -125,6 +124,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -133,7 +134,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 1257bb90b9c0 -r 5942fdde2af6 sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java --- a/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java Wed May 22 17:57:04 2013 +0100 +++ b/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java Thu Mar 21 11:08:05 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,8 +26,8 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.Statistic; -import java.io.Serializable; -import java.util.concurrent.atomic.AtomicLong; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -133,4 +133,13 @@ protected static boolean isValidString(String str) { return (str!=null && str.length()>0); } + + protected void checkMethod(Method method) { + if (method == null || method.getDeclaringClass() == null + || !Statistic.class.isAssignableFrom(method.getDeclaringClass()) + || Modifier.isStatic(method.getModifiers())) { + throw new RuntimeException("Invalid method on invoke"); + } + } + } diff -r 1257bb90b9c0 -r 5942fdde2af6 sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java --- a/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java Wed May 22 17:57:04 2013 +0100 +++ b/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java Thu Mar 21 11:08:05 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -90,6 +90,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -98,7 +100,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 1257bb90b9c0 -r 5942fdde2af6 sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java --- a/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java Wed May 22 17:57:04 2013 +0100 +++ b/sources/jaxws_src/src/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java Thu Mar 21 11:08:05 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,7 +28,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.TimeStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -145,6 +144,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -153,7 +154,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } From andrew at icedtea.classpath.org Tue Jun 18 14:12:01 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 18 Jun 2013 21:12:01 +0000 Subject: /hg/release/icedtea7-forest-2.2/langtools: 2 new changesets Message-ID: changeset 2e4b6a66aafe in /hg/release/icedtea7-forest-2.2/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/langtools?cmd=changeset;node=2e4b6a66aafe author: andrew date: Wed Jun 12 12:23:44 2013 +0100 8012375: Improve Javadoc framing Reviewed-by: mduigou, jlaskey changeset 1c14c3a8ea14 in /hg/release/icedtea7-forest-2.2/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/langtools?cmd=changeset;node=1c14c3a8ea14 author: bpatel date: Wed Jun 05 14:31:54 2013 -0700 8015997: Additional improvement in Javadoc framing Reviewed-by: jjg diffstat: src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java | 38 +++++++++- 1 files changed, 36 insertions(+), 2 deletions(-) diffs (54 lines): diff -r 42c083007206 -r 1c14c3a8ea14 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Wed May 22 17:57:03 2013 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Wed Jun 05 14:31:54 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -309,8 +309,42 @@ String scriptCode = DocletConstants.NL + " targetPage = \"\" + window.location.search;" + DocletConstants.NL + " if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL + " targetPage = targetPage.substring(1);" + DocletConstants.NL + - " if (targetPage.indexOf(\":\") != -1)" + DocletConstants.NL + + " if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + DocletConstants.NL + " targetPage = \"undefined\";" + DocletConstants.NL + + " function validURL(url) {" + DocletConstants.NL + + " var pos = url.indexOf(\".html\");" + DocletConstants.NL + + " if (pos == -1 || pos != url.length - 5)" + DocletConstants.NL + + " return false;" + DocletConstants.NL + + " var allowNumber = false;" + DocletConstants.NL + + " var allowSep = false;" + DocletConstants.NL + + " var seenDot = false;" + DocletConstants.NL + + " for (var i = 0; i < url.length - 5; i++) {" + DocletConstants.NL + + " var ch = url.charAt(i);" + DocletConstants.NL + + " if ('a' <= ch && ch <= 'z' ||" + DocletConstants.NL + + " 'A' <= ch && ch <= 'Z' ||" + DocletConstants.NL + + " ch == '$' ||" + DocletConstants.NL + + " ch == '_') {" + DocletConstants.NL + + " allowNumber = true;" + DocletConstants.NL + + " allowSep = true;" + DocletConstants.NL + + " } else if ('0' <= ch && ch <= '9'" + DocletConstants.NL + + " || ch == '-') {" + DocletConstants.NL + + " if (!allowNumber)" + DocletConstants.NL + + " return false;" + DocletConstants.NL + + " } else if (ch == '/' || ch == '.') {" + DocletConstants.NL + + " if (!allowSep)" + DocletConstants.NL + + " return false;" + DocletConstants.NL + + " allowNumber = false;" + DocletConstants.NL + + " allowSep = false;" + DocletConstants.NL + + " if (ch == '.')" + DocletConstants.NL + + " seenDot = true;" + DocletConstants.NL + + " if (ch == '/' && seenDot)" + DocletConstants.NL + + " return false;" + DocletConstants.NL + + " } else {" + DocletConstants.NL + + " return false;"+ DocletConstants.NL + + " }" + DocletConstants.NL + + " }" + DocletConstants.NL + + " return true;" + DocletConstants.NL + + " }" + DocletConstants.NL + " function loadFrames() {" + DocletConstants.NL + " if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL + " top.classFrame.location = top.targetPage;" + DocletConstants.NL + From andrew at icedtea.classpath.org Tue Jun 18 14:12:08 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 18 Jun 2013 21:12:08 +0000 Subject: /hg/release/icedtea7-forest-2.2/hotspot: 3 new changesets Message-ID: changeset c38773b3f403 in /hg/release/icedtea7-forest-2.2/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/hotspot?cmd=changeset;node=c38773b3f403 author: andrew date: Wed Apr 17 21:26:58 2013 +0100 PR1378: Add AArch64 support to Zero changeset 4f1ec3403248 in /hg/release/icedtea7-forest-2.2/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/hotspot?cmd=changeset;node=4f1ec3403248 author: hseigel date: Tue Mar 12 16:23:30 2013 -0400 7158805: Better rewriting of nested subroutine calls Reviewed-by: mschoene, coleenp changeset 89a7d38e2e31 in /hg/release/icedtea7-forest-2.2/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/hotspot?cmd=changeset;node=89a7d38e2e31 author: andrew date: Wed Jun 12 12:19:38 2013 +0100 8001330: Improve on checking order Reviewed-by: acorn, hawtin diffstat: src/os/linux/vm/os_linux.cpp | 10 +++- src/share/vm/classfile/javaClasses.cpp | 28 +++++++++- src/share/vm/classfile/javaClasses.hpp | 11 +++- src/share/vm/classfile/vmSymbols.hpp | 4 +- src/share/vm/memory/allocation.cpp | 43 +++++++++------ src/share/vm/memory/allocation.hpp | 63 ++++++++++++++++------ src/share/vm/memory/allocation.inline.hpp | 14 +++- src/share/vm/memory/resourceArea.cpp | 15 ++-- src/share/vm/memory/resourceArea.hpp | 6 +- src/share/vm/memory/universe.cpp | 23 ++++++++- src/share/vm/memory/universe.hpp | 4 +- src/share/vm/oops/generateOopMap.cpp | 21 +++++-- src/share/vm/prims/jvm.cpp | 85 ++++++++++++++++++++++++++++-- 13 files changed, 256 insertions(+), 71 deletions(-) diffs (truncated from 858 to 500 lines): diff -r be28736de085 -r 89a7d38e2e31 src/os/linux/vm/os_linux.cpp --- a/src/os/linux/vm/os_linux.cpp Wed May 22 17:57:02 2013 +0100 +++ b/src/os/linux/vm/os_linux.cpp Wed Jun 12 12:19:38 2013 +0100 @@ -129,6 +129,11 @@ #define ALL_64_BITS CONST64(0xFFFFFFFFFFFFFFFF) #define LARGEPAGES_BIT (1 << 6) + +#ifndef EM_AARCH64 +#define EM_AARCH64 183 /* ARM AARCH64 */ +#endif + //////////////////////////////////////////////////////////////////////////////// // global variables julong os::Linux::_physical_memory = 0; @@ -1890,7 +1895,8 @@ {EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"}, {EM_PARISC, EM_PARISC, ELFCLASS32, ELFDATA2MSB, (char*)"PARISC"}, {EM_68K, EM_68K, ELFCLASS32, ELFDATA2MSB, (char*)"M68k"}, - {EM_SH, EM_SH, ELFCLASS32, ELFDATA2LSB, (char*)"SH"} /* Support little endian only*/ + {EM_SH, EM_SH, ELFCLASS32, ELFDATA2LSB, (char*)"SH"}, /* Support little endian only*/ + {EM_AARCH64, EM_AARCH64, ELFCLASS64, ELFDATA2LSB, (char*)"AARCH64"} /* Support little endian only*/ }; #if (defined IA32) @@ -1923,6 +1929,8 @@ static Elf32_Half running_arch_code=EM_68K; #elif (defined SH) static Elf32_Half running_arch_code=EM_SH; + #elif (defined AARCH64) + static Elf32_Half running_arch_code=EM_AARCH64; #else #error Method os::dll_load requires that one of following is defined:\ IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K, SH diff -r be28736de085 -r 89a7d38e2e31 src/share/vm/classfile/javaClasses.cpp --- a/src/share/vm/classfile/javaClasses.cpp Wed May 22 17:57:02 2013 +0100 +++ b/src/share/vm/classfile/javaClasses.cpp Wed Jun 12 12:19:38 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -2737,6 +2737,7 @@ int java_security_AccessControlContext::_context_offset = 0; int java_security_AccessControlContext::_privilegedContext_offset = 0; int java_security_AccessControlContext::_isPrivileged_offset = 0; +int java_security_AccessControlContext::_isAuthorized_offset = -1; void java_security_AccessControlContext::compute_offsets() { assert(_isPrivileged_offset == 0, "offsets should be initialized only once"); @@ -2757,9 +2758,20 @@ fatal("Invalid layout of java.security.AccessControlContext"); } _isPrivileged_offset = fd.offset(); + + // The offset may not be present for bootstrapping with older JDK. + if (ik->find_local_field(vmSymbols::isAuthorized_name(), vmSymbols::bool_signature(), &fd)) { + _isAuthorized_offset = fd.offset(); + } } +bool java_security_AccessControlContext::is_authorized(Handle context) { + assert(context.not_null() && context->klass() == SystemDictionary::AccessControlContext_klass(), "Invalid type"); + assert(_isAuthorized_offset != -1, "should be set"); + return context->bool_field(_isAuthorized_offset) != 0; +} + oop java_security_AccessControlContext::create(objArrayHandle context, bool isPrivileged, Handle privileged_context, TRAPS) { assert(_isPrivileged_offset != 0, "offsets should have been initialized"); // Ensure klass is initialized @@ -2770,6 +2782,8 @@ result->obj_field_put(_context_offset, context()); result->obj_field_put(_privilegedContext_offset, privileged_context()); result->bool_field_put(_isPrivileged_offset, isPrivileged); + // whitelist AccessControlContexts created by the JVM. + result->bool_field_put(_isAuthorized_offset, true); return result; } @@ -2850,6 +2864,15 @@ } +bool java_lang_System::has_security_manager() { + instanceKlass* ik = instanceKlass::cast(SystemDictionary::System_klass()); + address addr = ik->static_field_addr(static_security_offset); + if (UseCompressedOops) { + return oopDesc::load_decode_heap_oop((narrowOop *)addr) != NULL; + } else { + return oopDesc::load_decode_heap_oop((oop*)addr) != NULL; + } +} int java_lang_String::value_offset; int java_lang_String::offset_offset; @@ -2907,6 +2930,7 @@ int java_lang_System::static_in_offset; int java_lang_System::static_out_offset; int java_lang_System::static_err_offset; +int java_lang_System::static_security_offset; int java_lang_StackTraceElement::declaringClass_offset; int java_lang_StackTraceElement::methodName_offset; int java_lang_StackTraceElement::fileName_offset; @@ -3054,6 +3078,7 @@ java_lang_System::static_in_offset = java_lang_System::hc_static_in_offset * x; java_lang_System::static_out_offset = java_lang_System::hc_static_out_offset * x; java_lang_System::static_err_offset = java_lang_System::hc_static_err_offset * x; + java_lang_System::static_security_offset = java_lang_System::hc_static_security_offset * x; // java_lang_StackTraceElement java_lang_StackTraceElement::declaringClass_offset = java_lang_StackTraceElement::hc_declaringClass_offset * x + header; @@ -3252,6 +3277,7 @@ CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, in, "Ljava/io/InputStream;"); CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, out, "Ljava/io/PrintStream;"); CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, err, "Ljava/io/PrintStream;"); + CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, security, "Ljava/lang/SecurityManager;"); // java.lang.StackTraceElement diff -r be28736de085 -r 89a7d38e2e31 src/share/vm/classfile/javaClasses.hpp --- a/src/share/vm/classfile/javaClasses.hpp Wed May 22 17:57:02 2013 +0100 +++ b/src/share/vm/classfile/javaClasses.hpp Wed Jun 12 12:19:38 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1201,11 +1201,14 @@ static int _context_offset; static int _privilegedContext_offset; static int _isPrivileged_offset; + static int _isAuthorized_offset; static void compute_offsets(); public: static oop create(objArrayHandle context, bool isPrivileged, Handle privileged_context, TRAPS); + static bool is_authorized(Handle context); + // Debugging/initialization friend class JavaClasses; }; @@ -1248,18 +1251,22 @@ enum { hc_static_in_offset = 0, hc_static_out_offset = 1, - hc_static_err_offset = 2 + hc_static_err_offset = 2, + hc_static_security_offset = 3 }; static int static_in_offset; static int static_out_offset; static int static_err_offset; + static int static_security_offset; public: static int in_offset_in_bytes(); static int out_offset_in_bytes(); static int err_offset_in_bytes(); + static bool has_security_manager(); + // Debugging friend class JavaClasses; }; diff -r be28736de085 -r 89a7d38e2e31 src/share/vm/classfile/vmSymbols.hpp --- a/src/share/vm/classfile/vmSymbols.hpp Wed May 22 17:57:02 2013 +0100 +++ b/src/share/vm/classfile/vmSymbols.hpp Wed Jun 12 12:19:38 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -91,6 +91,7 @@ template(java_lang_CharSequence, "java/lang/CharSequence") \ template(java_security_AccessControlContext, "java/security/AccessControlContext") \ template(java_security_ProtectionDomain, "java/security/ProtectionDomain") \ + template(impliesCreateAccessControlContext_name, "impliesCreateAccessControlContext") \ template(java_io_OutputStream, "java/io/OutputStream") \ template(java_io_Reader, "java/io/Reader") \ template(java_io_BufferedReader, "java/io/BufferedReader") \ @@ -324,6 +325,7 @@ template(contextClassLoader_name, "contextClassLoader") \ template(inheritedAccessControlContext_name, "inheritedAccessControlContext") \ template(isPrivileged_name, "isPrivileged") \ + template(isAuthorized_name, "isAuthorized") \ template(wait_name, "wait") \ template(checkPackageAccess_name, "checkPackageAccess") \ template(stackSize_name, "stackSize") \ diff -r be28736de085 -r 89a7d38e2e31 src/share/vm/memory/allocation.cpp --- a/src/share/vm/memory/allocation.cpp Wed May 22 17:57:02 2013 +0100 +++ b/src/share/vm/memory/allocation.cpp Wed Jun 12 12:19:38 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -210,7 +210,7 @@ ChunkPool(size_t size) : _size(size) { _first = NULL; _num_chunks = _num_used = 0; } // Allocate a new chunk from the pool (might expand the pool) - void* allocate(size_t bytes) { + void* allocate(size_t bytes, AllocFailType alloc_failmode) { assert(bytes == _size, "bad size"); void* p = NULL; { ThreadCritical tc; @@ -218,9 +218,9 @@ p = get_first(); if (p == NULL) p = os::malloc(bytes); } - if (p == NULL) + if (p == NULL && alloc_failmode == AllocFailStrategy::EXIT_OOM) { vm_exit_out_of_memory(bytes, "ChunkPool::allocate"); - + } return p; } @@ -311,7 +311,7 @@ //-------------------------------------------------------------------------------------- // Chunk implementation -void* Chunk::operator new(size_t requested_size, size_t length) { +void* Chunk::operator new(size_t requested_size, AllocFailType alloc_failmode, size_t length) { // requested_size is equal to sizeof(Chunk) but in order for the arena // allocations to come out aligned as expected the size must be aligned // to expected arean alignment. @@ -319,13 +319,14 @@ assert(ARENA_ALIGN(requested_size) == aligned_overhead_size(), "Bad alignment"); size_t bytes = ARENA_ALIGN(requested_size) + length; switch (length) { - case Chunk::size: return ChunkPool::large_pool()->allocate(bytes); - case Chunk::medium_size: return ChunkPool::medium_pool()->allocate(bytes); - case Chunk::init_size: return ChunkPool::small_pool()->allocate(bytes); + case Chunk::size: return ChunkPool::large_pool()->allocate(bytes, alloc_failmode); + case Chunk::medium_size: return ChunkPool::medium_pool()->allocate(bytes, alloc_failmode); + case Chunk::init_size: return ChunkPool::small_pool()->allocate(bytes, alloc_failmode); default: { - void *p = os::malloc(bytes); - if (p == NULL) + void* p = os::malloc(bytes); + if (p == NULL && alloc_failmode == AllocFailStrategy::EXIT_OOM) { vm_exit_out_of_memory(bytes, "Chunk::new"); + } return p; } } @@ -378,14 +379,14 @@ Arena::Arena(size_t init_size) { size_t round_size = (sizeof (char *)) - 1; init_size = (init_size+round_size) & ~round_size; - _first = _chunk = new (init_size) Chunk(init_size); + _first = _chunk = new (AllocFailStrategy::EXIT_OOM, init_size) Chunk(init_size); _hwm = _chunk->bottom(); // Save the cached hwm, max _max = _chunk->top(); set_size_in_bytes(init_size); } Arena::Arena() { - _first = _chunk = new (Chunk::init_size) Chunk(Chunk::init_size); + _first = _chunk = new (AllocFailStrategy::EXIT_OOM, Chunk::init_size) Chunk(Chunk::init_size); _hwm = _chunk->bottom(); // Save the cached hwm, max _max = _chunk->top(); set_size_in_bytes(Chunk::init_size); @@ -438,15 +439,15 @@ } // Grow a new Chunk -void* Arena::grow( size_t x ) { +void* Arena::grow(size_t x, AllocFailType alloc_failmode) { // Get minimal required size. Either real big, or even bigger for giant objs size_t len = MAX2(x, (size_t) Chunk::size); Chunk *k = _chunk; // Get filled-up chunk address - _chunk = new (len) Chunk(len); + _chunk = new (alloc_failmode, len) Chunk(len); if (_chunk == NULL) { - signal_out_of_memory(len * Chunk::aligned_overhead_size(), "Arena::grow"); + return NULL; } if (k) k->set_next(_chunk); // Append new chunk to end of linked list @@ -462,13 +463,16 @@ // Reallocate storage in Arena. -void *Arena::Arealloc(void* old_ptr, size_t old_size, size_t new_size) { +void *Arena::Arealloc(void* old_ptr, size_t old_size, size_t new_size, AllocFailType alloc_failmode) { assert(new_size >= 0, "bad size"); if (new_size == 0) return NULL; #ifdef ASSERT if (UseMallocOnly) { // always allocate a new object (otherwise we'll free this one twice) - char* copy = (char*)Amalloc(new_size); + char* copy = (char*)Amalloc(new_size, alloc_failmode); + if (copy == NULL) { + return NULL; + } size_t n = MIN2(old_size, new_size); if (n > 0) memcpy(copy, old_ptr, n); Afree(old_ptr,old_size); // Mostly done to keep stats accurate @@ -494,7 +498,10 @@ } // Oops, got to relocate guts - void *new_ptr = Amalloc(new_size); + void *new_ptr = Amalloc(new_size, alloc_failmode); + if (new_ptr == NULL) { + return NULL; + } memcpy( new_ptr, c_old, old_size ); Afree(c_old,old_size); // Mostly done to keep stats accurate return new_ptr; diff -r be28736de085 -r 89a7d38e2e31 src/share/vm/memory/allocation.hpp --- a/src/share/vm/memory/allocation.hpp Wed May 22 17:57:02 2013 +0100 +++ b/src/share/vm/memory/allocation.hpp Wed Jun 12 12:19:38 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,6 +40,12 @@ #define ARENA_ALIGN_MASK (~((size_t)ARENA_ALIGN_M1)) #define ARENA_ALIGN(x) ((((size_t)(x)) + ARENA_ALIGN_M1) & ARENA_ALIGN_MASK) +class AllocFailStrategy { +public: + enum AllocFailEnum { EXIT_OOM, RETURN_NULL }; +}; +typedef AllocFailStrategy::AllocFailEnum AllocFailType; + // All classes in the virtual machine must be subclassed // by one of the following allocation classes: // @@ -157,7 +163,7 @@ Chunk* _next; // Next Chunk in list const size_t _len; // Size of this Chunk public: - void* operator new(size_t size, size_t length); + void* operator new(size_t size, AllocFailType alloc_failmode, size_t length); void operator delete(void* p); Chunk(size_t length); @@ -207,7 +213,8 @@ Chunk *_first; // First chunk Chunk *_chunk; // current chunk char *_hwm, *_max; // High water mark and max in current chunk - void* grow(size_t x); // Get a new Chunk of at least size x + // Get a new Chunk of at least size x + void* grow(size_t x, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM); NOT_PRODUCT(size_t _size_in_bytes;) // Size of arena (used for memory usage tracing) NOT_PRODUCT(static julong _bytes_allocated;) // total #bytes allocated since start friend class AllocStats; @@ -217,10 +224,15 @@ void signal_out_of_memory(size_t request, const char* whence) const; - void check_for_overflow(size_t request, const char* whence) const { + bool check_for_overflow(size_t request, const char* whence, + AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) const { if (UINTPTR_MAX - request < (uintptr_t)_hwm) { + if (alloc_failmode == AllocFailStrategy::RETURN_NULL) { + return false; + } signal_out_of_memory(request, whence); } + return true; } public: @@ -232,14 +244,15 @@ char* hwm() const { return _hwm; } // Fast allocate in the arena. Common case is: pointer test + increment. - void* Amalloc(size_t x) { + void* Amalloc(size_t x, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) { assert(is_power_of_2(ARENA_AMALLOC_ALIGNMENT) , "should be a power of 2"); x = ARENA_ALIGN(x); debug_only(if (UseMallocOnly) return malloc(x);) - check_for_overflow(x, "Arena::Amalloc"); + if (!check_for_overflow(x, "Arena::Amalloc", alloc_failmode)) + return NULL; NOT_PRODUCT(inc_bytes_allocated(x);) if (_hwm + x > _max) { - return grow(x); + return grow(x, alloc_failmode); } else { char *old = _hwm; _hwm += x; @@ -247,13 +260,14 @@ } } // Further assume size is padded out to words - void *Amalloc_4(size_t x) { + void *Amalloc_4(size_t x, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) { assert( (x&(sizeof(char*)-1)) == 0, "misaligned size" ); debug_only(if (UseMallocOnly) return malloc(x);) - check_for_overflow(x, "Arena::Amalloc_4"); + if (!check_for_overflow(x, "Arena::Amalloc_4", alloc_failmode)) + return NULL; NOT_PRODUCT(inc_bytes_allocated(x);) if (_hwm + x > _max) { - return grow(x); + return grow(x, alloc_failmode); } else { char *old = _hwm; _hwm += x; @@ -263,7 +277,7 @@ // Allocate with 'double' alignment. It is 8 bytes on sparc. // In other cases Amalloc_D() should be the same as Amalloc_4(). - void* Amalloc_D(size_t x) { + void* Amalloc_D(size_t x, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) { assert( (x&(sizeof(char*)-1)) == 0, "misaligned size" ); debug_only(if (UseMallocOnly) return malloc(x);) #if defined(SPARC) && !defined(_LP64) @@ -271,10 +285,11 @@ size_t delta = (((size_t)_hwm + DALIGN_M1) & ~DALIGN_M1) - (size_t)_hwm; x += delta; #endif - check_for_overflow(x, "Arena::Amalloc_D"); + if (!check_for_overflow(x, "Arena::Amalloc_D", alloc_failmode)) + return NULL; NOT_PRODUCT(inc_bytes_allocated(x);) if (_hwm + x > _max) { - return grow(x); // grow() returns a result aligned >= 8 bytes. + return grow(x, alloc_failmode); // grow() returns a result aligned >= 8 bytes. } else { char *old = _hwm; _hwm += x; @@ -294,7 +309,8 @@ if (((char*)ptr) + size == _hwm) _hwm = (char*)ptr; } - void *Arealloc( void *old_ptr, size_t old_size, size_t new_size ); + void *Arealloc( void *old_ptr, size_t old_size, size_t new_size, + AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM); // Move contents of this arena into an empty arena Arena *move_contents(Arena *empty_arena); @@ -336,9 +352,12 @@ //%note allocation_1 -extern char* resource_allocate_bytes(size_t size); -extern char* resource_allocate_bytes(Thread* thread, size_t size); -extern char* resource_reallocate_bytes( char *old, size_t old_size, size_t new_size); +extern char* resource_allocate_bytes(size_t size, + AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM); +extern char* resource_allocate_bytes(Thread* thread, size_t size, + AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM); +extern char* resource_reallocate_bytes( char *old, size_t old_size, size_t new_size, + AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM); extern void resource_free_bytes( char *old, size_t size ); //---------------------------------------------------------------------- @@ -384,6 +403,13 @@ DEBUG_ONLY(set_allocation_type(res, RESOURCE_AREA);) return res; } + + void* operator new(size_t size, const std::nothrow_t& nothrow_constant) { + address res = (address)resource_allocate_bytes(size, AllocFailStrategy::RETURN_NULL); + DEBUG_ONLY(if (res != NULL) set_allocation_type(res, RESOURCE_AREA);) + return res; + } + void operator delete(void* p); }; @@ -394,6 +420,9 @@ #define NEW_RESOURCE_ARRAY(type, size)\ (type*) resource_allocate_bytes((size) * sizeof(type)) +#define NEW_RESOURCE_ARRAY_RETURN_NULL(type, size)\ + (type*) resource_allocate_bytes((size) * sizeof(type), AllocFailStrategy::RETURN_NULL) + #define NEW_RESOURCE_ARRAY_IN_THREAD(thread, type, size)\ (type*) resource_allocate_bytes(thread, (size) * sizeof(type)) diff -r be28736de085 -r 89a7d38e2e31 src/share/vm/memory/allocation.inline.hpp --- a/src/share/vm/memory/allocation.inline.hpp Wed May 22 17:57:02 2013 +0100 +++ b/src/share/vm/memory/allocation.inline.hpp Wed Jun 12 12:19:38 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. From bugzilla-daemon at icedtea.classpath.org Tue Jun 18 14:12:17 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 18 Jun 2013 21:12:17 +0000 Subject: [Bug 1378] [IcedTea7] Add AArch64 support to Zero In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1378 --- Comment #5 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-forest-2.2/hotspot?cmd=changeset;node=c38773b3f403 author: andrew date: Wed Apr 17 21:26:58 2013 +0100 PR1378: Add AArch64 support to Zero -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130618/58ee7d70/attachment.html From andrew at icedtea.classpath.org Tue Jun 18 14:12:32 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 18 Jun 2013 21:12:32 +0000 Subject: /hg/release/icedtea7-forest-2.2/jdk: 74 new changesets Message-ID: changeset 88eb9a31f7d2 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=88eb9a31f7d2 author: andrew date: Mon May 27 23:21:28 2013 +0100 7171223: Building ExtensionSubtables.cpp should use -fno-strict-aliasing Summary: GCC 4.4+ have stricter aliasing requirements which produces a new warning from this code Reviewed-by: prr, ohair changeset 427c2ecf7155 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=427c2ecf7155 author: mbankal date: Fri Sep 14 09:38:27 2012 -0700 7195301: XML Signature DOM implementation should not use instanceof to determine type of Node Reviewed-by: mullan changeset 0eed0d8ac24d in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=0eed0d8ac24d author: andrew date: Tue Jun 11 11:29:06 2013 +0100 6741606: Integrate Apache Santuario Reviewed-by: vinnie, hawtin changeset b091a788888b in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=b091a788888b author: khazra date: Thu Mar 14 13:54:32 2013 -0700 7170730: Improve Windows network stack support. Summary: Enable exclusive binding of ports on Windows Reviewed-by: alanb, chegar, ahgross changeset 558ffeef43ca in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=558ffeef43ca author: dmocek date: Mon Mar 04 14:34:15 2013 -0800 8000638: Improve deserialization Reviewed-by: smarks, hawtin, mchung changeset ebad7b9c3682 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=ebad7b9c3682 author: andrew date: Wed Jun 12 10:43:39 2013 +0100 8001032: Restrict object access Summary: Restrict object access; fix reviewed also by Alexander Fomin Reviewed-by: alanb, ahgross changeset aafbd1c64be9 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=aafbd1c64be9 author: dmocek date: Wed Mar 13 17:24:34 2013 -0700 8001033: Refactor network address handling in virtual machine identifiers Reviewed-by: smarks, hawtin, mchung changeset 9b1b3a4e8ec3 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=9b1b3a4e8ec3 author: bae date: Wed Feb 27 11:53:10 2013 +0400 8001034: Memory management improvements Reviewed-by: prr, jgodinez changeset c584396356b0 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=c584396356b0 author: bae date: Thu Mar 28 22:17:04 2013 +0400 8001038: Resourcefully handle resources Reviewed-by: mschoene, prr, bae Contributed-by: jia-hong.chen at oracle.com changeset 4deffbfca5f2 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=4deffbfca5f2 author: dfuchs date: Fri Mar 15 17:59:10 2013 +0100 8001043: Clarify definition restrictions Reviewed-by: alanb, skoivu, smarks changeset aa4796865129 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=aa4796865129 author: andrew date: Wed Jun 12 10:56:11 2013 +0100 7174718: [macosx] Regression in 7u6 b12: PopupFactory leaks DefaultFrames. Summary: Fix memory management Reviewed-by: art, serb changeset 38d529f9f4ab in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=38d529f9f4ab author: andrew date: Wed Jun 12 11:01:08 2013 +0100 7142091: [macosx] RFE: Refactoring of peer initialization/disposing Reviewed-by: anthony, art changeset 0b05585db1c8 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=0b05585db1c8 author: andrew date: Wed Jun 12 11:21:44 2013 +0100 8001308: Update display of applet windows Summary: Implemented security warning for OS X port Reviewed-by: art, anthony, serb, skoivu changeset 6b5f3f9dbf17 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=6b5f3f9dbf17 author: andrew date: Wed Jun 12 11:23:55 2013 +0100 7156194: [macosx] Can't type non-ASCII characters into applets Reviewed-by: anthony changeset fb619d31dd14 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=fb619d31dd14 author: dcherepanov date: Fri Mar 16 19:59:04 2012 +0400 7150345: [macosx] Can't type into applets Reviewed-by: ant changeset 2d8275793306 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=2d8275793306 author: andrew date: Wed Jun 12 11:35:38 2013 +0100 7156191: [macosx] Can't type into applet demos in Pivot Reviewed-by: ant, art changeset a3084cc2eb4d in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=a3084cc2eb4d author: andrew date: Wed Jun 12 11:36:10 2013 +0100 Add two files missed from 8001308 changeset b9ce99cdecd5 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=b9ce99cdecd5 author: dmeetry date: Mon Mar 25 12:41:55 2013 +0400 8001309: Better handling of annotation interfaces Reviewed-by: darcy changeset f68571a7eeef in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=f68571a7eeef author: khazra date: Thu Mar 28 14:59:22 2013 -0700 8001318: Socket.getLocalAddress not consistent with InetAddress.getLocalHost Reviewed-by: alanb, chegar, hawtin changeset 84621182e69f in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=84621182e69f author: mullan date: Fri Apr 05 08:33:25 2013 -0400 8001330: Improve on checking order Reviewed-by: acorn, hawtin changeset 0be71a3ae825 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=0be71a3ae825 author: sla date: Mon Mar 18 15:22:51 2013 +0100 8003703: Update RMI connection dialog box Reviewed-by: skoivu, ahgross, mchung, jbachorik changeset 299a33335080 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=299a33335080 author: alanb date: Wed Feb 27 11:50:30 2013 +0000 8004288: (fs) Files.probeContentType problems Reviewed-by: ahgross, sherman changeset 0eef3cfc5e5f in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=0eef3cfc5e5f author: leonidr date: Tue Mar 19 21:13:09 2013 +0400 8004584: Augment applet contextualization Summary: Do not create the main AppContext for applets Reviewed-by: art, ahgross changeset 30d09929e234 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=30d09929e234 author: prr date: Sun Mar 31 09:05:58 2013 -0700 8005007: Better glyph processing Reviewed-by: srl, mschoene, bae changeset dcbf1fdad11c in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=dcbf1fdad11c author: serb date: Sat Mar 30 22:45:54 2013 +0400 8006328: Improve robustness of sound classes 8009057: Improve MIDI event handling Reviewed-by: amenkov, art, skoivu changeset 29c4c229f67f in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=29c4c229f67f author: sundar date: Fri Apr 05 15:39:25 2013 +0530 8006611: Improve scripting Reviewed-by: mchung, jdn changeset fb526f813000 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=fb526f813000 author: sjiang date: Tue Mar 19 18:45:19 2013 +0100 8007467: Improve robustness of JMX internal APIs Reviewed-by: dfuchs, mchung, skoivu changeset 200b1fa33ef2 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=200b1fa33ef2 author: dsamersoff date: Thu Mar 21 22:32:42 2013 +0400 8007471: Improve MBean notifications Summary: Improve MBean notifications Reviewed-by: dfuchs, mchung, alanb, skoivu changeset c432f0aac076 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=c432f0aac076 author: jfranck date: Mon Mar 25 20:18:21 2013 +0100 8007812: (reflect) Class.getEnclosingMethod problematic for some classes Summary: Better checking in getEnclosing(Method|Constructor|Class) Reviewed-by: darcy, ahgross, mchung changeset 4b5b19aa0379 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=4b5b19aa0379 author: bae date: Thu Mar 28 23:01:08 2013 +0400 8007925: Improve cmsStageAllocLabV2ToV4curves 8007926: Improve cmsPipelineDup Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset 49130faf998c in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=49130faf998c author: bae date: Thu Mar 21 11:52:10 2013 +0400 8007927: Improve cmsAllocProfileSequenceDescription Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset be96c83d8ce4 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=be96c83d8ce4 author: bae date: Thu Mar 21 12:02:04 2013 +0400 8007929: Improve CurvesAlloc Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset 35fc7c5b77b4 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=35fc7c5b77b4 author: dsamersoff date: Wed Mar 27 14:32:58 2013 +0400 8008120: Improve JMX class checking Summary: Improve JMX class checking Reviewed-by: mchung, dfuchs, alanb, skoivu changeset 2716c1f17b45 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=2716c1f17b45 author: dsamersoff date: Thu Mar 28 23:39:28 2013 +0400 8008124: Better compliance testing Summary: Better compliance testing Reviewed-by: dfuchs, jfdenise, skoivu, alanb changeset 7b4e51f9df72 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=7b4e51f9df72 author: andrew date: Tue Jun 11 13:13:12 2013 +0100 8008128: Better API coherence for JMX Summary: Permission for getting classloader Reviewed-by: alanb, dfuchs, skoivu Contributed-by: jean-francois.denise at oracle.com changeset a6d69dc94bbf in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=a6d69dc94bbf author: smarks date: Mon Mar 25 17:05:30 2013 +0000 8008132: Better serialization support Reviewed-by: alanb, hawtin changeset 4037e45a4254 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=4037e45a4254 author: jbachorik date: Thu Mar 14 14:42:12 2013 +0100 8008585: Better JMX data handling Reviewed-by: alanb, dfuchs, jfdenise, skoivu, sjiang changeset 61ce96418085 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=61ce96418085 author: chegar date: Fri Apr 05 18:12:11 2013 +0100 8008593: Better URLClassLoader resource management Reviewed-by: alanb, sherman, hawtin changeset b52063cd7544 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=b52063cd7544 author: jbachorik date: Thu Mar 07 14:05:05 2013 +0100 8008603: Improve provision of JMX providers Reviewed-by: alanb, dfuchs, jfdenise, skoivu changeset 2a2d96405f73 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=2a2d96405f73 author: jbachorik date: Thu Mar 14 14:45:55 2013 +0100 8008607: Better input checking in JMX Reviewed-by: dfuchs, mchung, skoivu, sjiang changeset 1bb3a6125387 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=1bb3a6125387 author: egahlin date: Thu Mar 21 13:56:28 2013 +0100 8008611: Better handling of annotations in JMX Reviewed-by: skoivu, dholmes, jfdenise changeset 98ce5da895f7 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=98ce5da895f7 author: sjiang date: Thu Mar 21 18:27:25 2013 +0100 8008615: Improve robustness of JMX internal APIs Reviewed-by: dfuchs, skoivu, dholmes changeset 4d76aacdf35c in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=4d76aacdf35c author: jbachorik date: Thu Mar 21 09:26:55 2013 +0100 8008623: Better handling of MBeanServers Reviewed-by: dfuchs, dholmes, skoivu changeset 109f588a1fe7 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=109f588a1fe7 author: mullan date: Wed May 01 17:19:04 2013 -0400 8008744: Rework part of fix for JDK-6741606 Reviewed-by: xuelei, ahgross changeset e61e623fc249 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=e61e623fc249 author: jbachorik date: Thu Mar 28 09:39:26 2013 +0100 8008982: Adjust JMX for underlying interface changes Reviewed-by: mchung, dholmes, dfuchs, skoivu changeset 19be740327af in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=19be740327af author: jfdenise date: Mon Mar 18 13:50:19 2013 +0100 8009004: Better implementation of RMI connections Summary: Better class handling. Reviewed-by: alanb, dfuchs, skoivu, jbachorik Contributed-by: jean-francois.denise at oracle.com changeset 8c67c03b3447 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=8c67c03b3447 author: bae date: Tue Mar 26 11:56:00 2013 +0400 8009013: Better handling of T2K glyphs Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset 4001d7778fca in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=4001d7778fca author: jbachorik date: Tue Mar 12 11:09:37 2013 +0100 8009034: Improve resulting notifications in JMX Summary: Disallowing access to mutable shared arrays Reviewed-by: dfuchs, mchung, skoivu changeset b132a92acf4a in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=b132a92acf4a author: jbachorik date: Tue Mar 12 09:34:26 2013 +0100 8009038: Improve JMX notification support Summary: Disallowing access to mutable shared arrays Reviewed-by: dfuchs, mchung, skoivu changeset 58148ec7d6b0 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=58148ec7d6b0 author: vinnie date: Thu Mar 21 10:42:36 2013 +0000 8009067: Improve storing keys in KeyStore Reviewed-by: mullan, skoivu changeset b18a44fda9ac in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=b18a44fda9ac author: andrew date: Tue Jun 11 13:24:21 2013 +0100 8009071: Improve shape handling Reviewed-by: art, mschoene changeset 48b820bbd7ca in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=48b820bbd7ca author: vinnie date: Mon Apr 08 21:17:57 2013 +0100 8009235: Improve handling of TSA data Reviewed-by: ahgross, mullan changeset 6f9ab9374923 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=6f9ab9374923 author: andrew date: Tue Jun 11 14:33:09 2013 +0100 8009424: Adapt Nashorn to JSR-292 implementation change Reviewed-by: jrose, twisti, jdn, mchung changeset 8ae68d2b6f36 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=8ae68d2b6f36 author: lancea date: Fri Mar 22 15:40:16 2013 -0400 8009554: Improve SerialJavaObject.getFields Reviewed-by: alanb, skoivu changeset 7ced4e5af4c7 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=7ced4e5af4c7 author: andrew date: Tue Jun 11 14:44:01 2013 +0100 8009654: Improve stability of cmsnamed Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset 5901523f7ec0 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=5901523f7ec0 author: jbachorik date: Wed Mar 27 13:29:22 2013 +0100 8010209: Better provision of factories Reviewed-by: dcubed, ahgross changeset 5f070629d4a2 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=5f070629d4a2 author: bae date: Tue Apr 09 15:03:29 2013 +0400 8011243: Improve ImagingLib Reviewed-by: mschoene, prr, vadim changeset 54f42fc3af18 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=54f42fc3af18 author: prr date: Mon Apr 08 12:41:09 2013 -0700 8011248: Better Component Rasters Reviewed-by: bae, vadim, mschoene changeset 189f123d5939 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=189f123d5939 author: prr date: Mon Apr 08 12:46:20 2013 -0700 8011253: Better Short Component Rasters Reviewed-by: bae, vadim, mschoene changeset 33543e0c11b6 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=33543e0c11b6 author: prr date: Mon Apr 08 12:48:19 2013 -0700 8011257: Better Byte Component Rasters Reviewed-by: bae, vadim, mschoene changeset d9661b2c8104 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=d9661b2c8104 author: mchung date: Fri Apr 05 08:43:00 2013 -0700 8011557: Improve reflection utility classes Reviewed-by: ahgross, alanb changeset a03abfbd5323 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=a03abfbd5323 author: prr date: Fri Apr 19 15:40:03 2013 -0700 8012421: Better positioning of PairPositioning Reviewed-by: srl, mschoene, vadim changeset d82a5acd535d in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=d82a5acd535d author: bae date: Wed Apr 24 15:23:44 2013 +0400 8012438: Better image validation Reviewed-by: mschoene, prr, vadim changeset 384c02152d67 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=384c02152d67 author: bae date: Tue Apr 30 04:20:46 2013 +0400 8012597: Better image channel verification Reviewed-by: ahgross, vadim, prr changeset 52c47f8c6ab9 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=52c47f8c6ab9 author: bae date: Fri Apr 26 09:30:54 2013 +0400 8012601: Better validation of image layouts Reviewed-by: mschoene, prr, vadim changeset 20a4eae90429 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=20a4eae90429 author: xuelei date: Mon May 13 18:30:45 2013 -0700 8014281: Better checking of XML signature Summary: also reviewed by Andrew Gross and Christophe Ravel Reviewed-by: mullan changeset 66de7885f8dc in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=66de7885f8dc author: andrew date: Wed Jun 12 11:42:41 2013 +0100 8014618: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement Reviewed-by: xuelei Contributed-by: Pasi Eronen changeset 38fae1f85c50 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=38fae1f85c50 author: andrew date: Wed Jun 12 11:46:50 2013 +0100 7151434: java -jar -XX crashes java launcher Reviewed-by: mchung, darcy, jjh, dholmes changeset ea022c57bfb5 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=ea022c57bfb5 author: andrew date: Wed Jun 12 11:48:21 2013 +0100 7142596: RMI JPRT tests are failing Summary: Changed RMI tests to use random port numbers for the RMI Registry and RMID so the tests can be run concurrently without test failures due to tests using the same port numbers. Reviewed-by: smarks, alanb Contributed-by: olivier.lagneau at oracle.com changeset 06ee02f5ca2e in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=06ee02f5ca2e author: andrew date: Wed Jun 12 13:12:39 2013 +0100 Correct remaining reference to P11Util.TrimZeroes changeset 51692befea2e in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=51692befea2e author: andrew date: Fri Jun 14 10:05:04 2013 +0100 Handle NullPointerException in getNotificationInfo changeset 3202c8ef7d0c in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=3202c8ef7d0c author: andrew date: Tue Jun 18 06:01:18 2013 -0500 8010118: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive Reviewed-by: alanb, twisti, jrose, kvn changeset 3dbf2807f49e in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=3dbf2807f49e author: andrew date: Tue Jun 18 08:07:03 2013 -0500 8009424: Adapt Nashorn to JSR-292 implementation change Reviewed-by: jrose, twisti, jdn, mchung changeset c13072c37f69 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=c13072c37f69 author: andrew date: Tue Jun 18 08:07:48 2013 -0500 8002070: Remove the stack search for a resource bundle for Logger to use Summary: The fragile, vulnerable, stack crawling has been eliminated from findResourceBundle(String) Reviewed-by: mchung, alanb diffstat: make/java/java/FILES_c.gmk | 2 - make/java/java/mapfile-vers | 3 - make/java/java/reorder-i586 | 1 - make/java/java/reorder-sparc | 1 - make/java/java/reorder-sparcv9 | 1 - make/java/nio/mapfile-bsd | 1 + make/java/nio/mapfile-linux | 1 + make/java/nio/mapfile-solaris | 1 + make/java/zip/mapfile-vers | 1 + make/java/zip/reorder-i586 | 1 + make/java/zip/reorder-sparc | 1 + make/java/zip/reorder-sparcv9 | 1 + make/sun/awt/Makefile | 81 +- make/sun/awt/ToBin.java | 59 + make/sun/font/Makefile | 3 +- make/sun/xawt/Makefile | 67 +- make/sun/xawt/ToBin.java | 59 - src/macosx/classes/sun/java2d/opengl/CGLLayer.java | 8 +- src/macosx/classes/sun/lwawt/LWButtonPeer.java | 4 +- src/macosx/classes/sun/lwawt/LWCheckboxPeer.java | 4 +- src/macosx/classes/sun/lwawt/LWChoicePeer.java | 4 +- src/macosx/classes/sun/lwawt/LWComponentPeer.java | 80 +- src/macosx/classes/sun/lwawt/LWKeyboardFocusManagerPeer.java | 19 +- src/macosx/classes/sun/lwawt/LWLabelPeer.java | 4 +- src/macosx/classes/sun/lwawt/LWListPeer.java | 4 +- src/macosx/classes/sun/lwawt/LWScrollBarPeer.java | 4 +- src/macosx/classes/sun/lwawt/LWScrollPanePeer.java | 4 +- src/macosx/classes/sun/lwawt/LWTextAreaPeer.java | 4 +- src/macosx/classes/sun/lwawt/LWTextComponentPeer.java | 4 +- src/macosx/classes/sun/lwawt/LWTextFieldPeer.java | 4 +- src/macosx/classes/sun/lwawt/LWToolkit.java | 7 +- src/macosx/classes/sun/lwawt/LWWindowPeer.java | 242 +- src/macosx/classes/sun/lwawt/PlatformEventNotifier.java | 65 + src/macosx/classes/sun/lwawt/PlatformWindow.java | 9 +- src/macosx/classes/sun/lwawt/SecurityWarningWindow.java | 35 + src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java | 31 +- src/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java | 31 +- src/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java | 58 +- src/macosx/classes/sun/lwawt/macosx/CPlatformView.java | 35 +- src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java | 121 +- src/macosx/classes/sun/lwawt/macosx/CWarningWindow.java | 455 +++++ src/macosx/classes/sun/lwawt/macosx/CWrapper.java | 4 +- src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java | 12 +- src/macosx/native/jobjc/src/core/native/SEL.m | 4 +- src/macosx/native/sun/awt/AWTView.m | 28 +- src/macosx/native/sun/awt/AWTWindow.m | 51 +- src/macosx/native/sun/awt/CRobot.m | 3 +- src/macosx/native/sun/awt/CWrapper.m | 23 +- src/macosx/native/sun/awt/LWCToolkit.m | 7 +- src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m | 6 +- src/share/bin/java.c | 7 + src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java | 7 +- src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java | 15 +- src/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java | 16 +- src/share/classes/com/sun/jmx/mbeanserver/ConvertingMethod.java | 3 +- src/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java | 15 +- src/share/classes/com/sun/jmx/mbeanserver/Introspector.java | 14 +- src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java | 21 +- src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java | 46 +- src/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java | 4 +- src/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java | 3 +- src/share/classes/com/sun/jmx/mbeanserver/StandardMBeanIntrospector.java | 3 +- src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java | 16 +- src/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java | 18 +- src/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java | 7 +- src/share/classes/com/sun/media/sound/AbstractDataLine.java | 45 +- src/share/classes/com/sun/media/sound/AbstractLine.java | 69 +- src/share/classes/com/sun/media/sound/AbstractMidiDevice.java | 44 +- src/share/classes/com/sun/media/sound/AbstractMidiDeviceProvider.java | 16 +- src/share/classes/com/sun/media/sound/AbstractMixer.java | 54 +- src/share/classes/com/sun/media/sound/AiffFileFormat.java | 10 +- src/share/classes/com/sun/media/sound/AiffFileReader.java | 34 +- src/share/classes/com/sun/media/sound/AiffFileWriter.java | 14 +- src/share/classes/com/sun/media/sound/AlawCodec.java | 14 +- src/share/classes/com/sun/media/sound/AuFileFormat.java | 6 +- src/share/classes/com/sun/media/sound/AuFileReader.java | 34 +- src/share/classes/com/sun/media/sound/AuFileWriter.java | 16 +- src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java | 4 +- src/share/classes/com/sun/media/sound/AudioFloatConverter.java | 39 +- src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java | 51 +- src/share/classes/com/sun/media/sound/AudioFloatInputStream.java | 26 +- src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java | 4 +- src/share/classes/com/sun/media/sound/DLSInfo.java | 4 +- src/share/classes/com/sun/media/sound/DLSInstrument.java | 18 +- src/share/classes/com/sun/media/sound/DLSModulator.java | 16 +- src/share/classes/com/sun/media/sound/DLSRegion.java | 28 +- src/share/classes/com/sun/media/sound/DLSSample.java | 14 +- src/share/classes/com/sun/media/sound/DLSSampleLoop.java | 10 +- src/share/classes/com/sun/media/sound/DLSSampleOptions.java | 14 +- src/share/classes/com/sun/media/sound/DLSSoundbank.java | 12 +- src/share/classes/com/sun/media/sound/DLSSoundbankReader.java | 4 +- src/share/classes/com/sun/media/sound/DataPusher.java | 8 +- src/share/classes/com/sun/media/sound/DirectAudioDevice.java | 44 +- src/share/classes/com/sun/media/sound/DirectAudioDeviceProvider.java | 68 +- src/share/classes/com/sun/media/sound/EmergencySoundbank.java | 4 +- src/share/classes/com/sun/media/sound/EventDispatcher.java | 34 +- src/share/classes/com/sun/media/sound/FFT.java | 12 +- src/share/classes/com/sun/media/sound/FastShortMessage.java | 6 +- src/share/classes/com/sun/media/sound/JARSoundbankReader.java | 22 +- src/share/classes/com/sun/media/sound/JDK13Services.java | 16 +- src/share/classes/com/sun/media/sound/JSSecurityManager.java | 103 +- src/share/classes/com/sun/media/sound/JavaSoundAudioClip.java | 12 +- src/share/classes/com/sun/media/sound/MidiDeviceReceiverEnvelope.java | 4 +- src/share/classes/com/sun/media/sound/MidiDeviceTransmitterEnvelope.java | 4 +- src/share/classes/com/sun/media/sound/MidiInDevice.java | 9 +- src/share/classes/com/sun/media/sound/MidiInDeviceProvider.java | 15 +- src/share/classes/com/sun/media/sound/MidiOutDevice.java | 6 +- src/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java | 15 +- src/share/classes/com/sun/media/sound/MidiUtils.java | 11 +- src/share/classes/com/sun/media/sound/ModelByteBuffer.java | 8 +- src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java | 12 +- src/share/classes/com/sun/media/sound/ModelConnectionBlock.java | 4 +- src/share/classes/com/sun/media/sound/ModelDestination.java | 4 +- src/share/classes/com/sun/media/sound/ModelIdentifier.java | 4 +- src/share/classes/com/sun/media/sound/ModelInstrument.java | 8 +- src/share/classes/com/sun/media/sound/ModelInstrumentComparator.java | 4 +- src/share/classes/com/sun/media/sound/ModelMappedInstrument.java | 6 +- src/share/classes/com/sun/media/sound/ModelPatch.java | 4 +- src/share/classes/com/sun/media/sound/ModelPerformer.java | 6 +- src/share/classes/com/sun/media/sound/ModelSource.java | 4 +- src/share/classes/com/sun/media/sound/ModelStandardDirector.java | 4 +- src/share/classes/com/sun/media/sound/ModelStandardIndexedDirector.java | 4 +- src/share/classes/com/sun/media/sound/ModelStandardTransform.java | 4 +- src/share/classes/com/sun/media/sound/PCMtoPCMCodec.java | 10 +- src/share/classes/com/sun/media/sound/Platform.java | 25 +- src/share/classes/com/sun/media/sound/PortMixer.java | 28 +- src/share/classes/com/sun/media/sound/PortMixerProvider.java | 46 +- src/share/classes/com/sun/media/sound/Printer.java | 10 +- src/share/classes/com/sun/media/sound/RIFFInvalidDataException.java | 4 +- src/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java | 4 +- src/share/classes/com/sun/media/sound/RIFFReader.java | 8 +- src/share/classes/com/sun/media/sound/RIFFWriter.java | 16 +- src/share/classes/com/sun/media/sound/RealTimeSequencer.java | 78 +- src/share/classes/com/sun/media/sound/RealTimeSequencerProvider.java | 4 +- src/share/classes/com/sun/media/sound/SF2GlobalRegion.java | 4 +- src/share/classes/com/sun/media/sound/SF2Instrument.java | 22 +- src/share/classes/com/sun/media/sound/SF2InstrumentRegion.java | 6 +- src/share/classes/com/sun/media/sound/SF2Layer.java | 10 +- src/share/classes/com/sun/media/sound/SF2LayerRegion.java | 6 +- src/share/classes/com/sun/media/sound/SF2Modulator.java | 14 +- src/share/classes/com/sun/media/sound/SF2Sample.java | 24 +- src/share/classes/com/sun/media/sound/SF2Soundbank.java | 36 +- src/share/classes/com/sun/media/sound/SF2SoundbankReader.java | 4 +- src/share/classes/com/sun/media/sound/SoftAbstractResampler.java | 6 +- src/share/classes/com/sun/media/sound/SoftAudioBuffer.java | 4 +- src/share/classes/com/sun/media/sound/SoftAudioPusher.java | 8 +- src/share/classes/com/sun/media/sound/SoftChannel.java | 44 +- src/share/classes/com/sun/media/sound/SoftChannelProxy.java | 4 +- src/share/classes/com/sun/media/sound/SoftChorus.java | 14 +- src/share/classes/com/sun/media/sound/SoftCubicResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java | 38 +- src/share/classes/com/sun/media/sound/SoftFilter.java | 6 +- src/share/classes/com/sun/media/sound/SoftInstrument.java | 8 +- src/share/classes/com/sun/media/sound/SoftJitterCorrector.java | 8 +- src/share/classes/com/sun/media/sound/SoftLanczosResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftLimiter.java | 4 +- src/share/classes/com/sun/media/sound/SoftLinearResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftLinearResampler2.java | 4 +- src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java | 24 +- src/share/classes/com/sun/media/sound/SoftMainMixer.java | 26 +- src/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java | 4 +- src/share/classes/com/sun/media/sound/SoftMixingClip.java | 8 +- src/share/classes/com/sun/media/sound/SoftMixingDataLine.java | 88 +- src/share/classes/com/sun/media/sound/SoftMixingMainMixer.java | 34 +- src/share/classes/com/sun/media/sound/SoftMixingMixer.java | 34 +- src/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java | 6 +- src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java | 10 +- src/share/classes/com/sun/media/sound/SoftPerformer.java | 4 +- src/share/classes/com/sun/media/sound/SoftPointResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftProvider.java | 8 +- src/share/classes/com/sun/media/sound/SoftReceiver.java | 14 +- src/share/classes/com/sun/media/sound/SoftReverb.java | 10 +- src/share/classes/com/sun/media/sound/SoftShortMessage.java | 4 +- src/share/classes/com/sun/media/sound/SoftSincResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftSynthesizer.java | 60 +- src/share/classes/com/sun/media/sound/SoftTuning.java | 6 +- src/share/classes/com/sun/media/sound/SoftVoice.java | 134 +- src/share/classes/com/sun/media/sound/StandardMidiFileReader.java | 29 +- src/share/classes/com/sun/media/sound/StandardMidiFileWriter.java | 10 +- src/share/classes/com/sun/media/sound/SunCodec.java | 18 +- src/share/classes/com/sun/media/sound/SunFileReader.java | 33 +- src/share/classes/com/sun/media/sound/SunFileWriter.java | 17 +- src/share/classes/com/sun/media/sound/Toolkit.java | 9 +- src/share/classes/com/sun/media/sound/UlawCodec.java | 9 +- src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java | 14 +- src/share/classes/com/sun/media/sound/WaveFileFormat.java | 22 +- src/share/classes/com/sun/media/sound/WaveFileReader.java | 34 +- src/share/classes/com/sun/media/sound/WaveFileWriter.java | 14 +- src/share/classes/com/sun/media/sound/WaveFloatFileReader.java | 4 +- src/share/classes/com/sun/media/sound/WaveFloatFileWriter.java | 8 +- src/share/classes/com/sun/org/apache/xml/internal/security/Init.java | 643 +++---- src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/ClassLoaderUtils.java | 280 +++ src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java | 403 +++- src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java | 812 ++++---- src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java | 237 +- src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java | 7 +- src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java | 22 +- src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java | 34 +- src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java | 240 +- src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java | 622 +++--- src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java | 10 +- src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties | 249 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java | 5 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java | 10 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java | 3 + src/share/classes/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderUtils.java | 280 +++ src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java | 420 ++-- src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java | 9 +- src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java | 23 +- src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java | 32 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java | 838 ++++----- src/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java | 338 +-- src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java | 2 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java | 395 +++- src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java | 534 +++--- src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java | 12 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverFragment.java | 98 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverXPointer.java | 66 +- src/share/classes/java/awt/Font.java | 40 +- src/share/classes/java/awt/image/BufferedImage.java | 30 +- src/share/classes/java/awt/image/ComponentSampleModel.java | 16 +- src/share/classes/java/awt/image/PixelInterleavedSampleModel.java | 10 +- src/share/classes/java/awt/image/Raster.java | 14 +- src/share/classes/java/io/ObjectOutputStream.java | 13 + src/share/classes/java/io/ObjectStreamClass.java | 18 + src/share/classes/java/io/ObjectStreamField.java | 8 + src/share/classes/java/lang/Class.java | 140 +- src/share/classes/java/lang/ClassLoader.java | 60 +- src/share/classes/java/lang/Package.java | 11 +- src/share/classes/java/lang/Runtime.java | 8 +- src/share/classes/java/lang/System.java | 13 +- src/share/classes/java/lang/Thread.java | 11 +- src/share/classes/java/lang/invoke/MemberName.java | 13 +- src/share/classes/java/lang/invoke/MethodHandleImpl.java | 8 +- src/share/classes/java/lang/invoke/MethodHandleNatives.java | 68 +- src/share/classes/java/lang/invoke/MethodHandleProxies.java | 5 +- src/share/classes/java/lang/invoke/MethodHandles.java | 175 +- src/share/classes/java/lang/reflect/Constructor.java | 5 +- src/share/classes/java/lang/reflect/Field.java | 129 +- src/share/classes/java/lang/reflect/Method.java | 19 +- src/share/classes/java/lang/reflect/Proxy.java | 68 +- src/share/classes/java/net/NetUtil.java | 74 + src/share/classes/java/net/ServerSocket.java | 25 +- src/share/classes/java/net/Socket.java | 8 + src/share/classes/java/net/SocksSocketImpl.java | 9 +- src/share/classes/java/nio/file/Files.java | 11 +- src/share/classes/java/rmi/dgc/VMID.java | 69 +- src/share/classes/java/security/AccessControlContext.java | 13 +- src/share/classes/java/security/AccessController.java | 27 +- src/share/classes/java/security/KeyStore.java | 2 +- src/share/classes/java/security/ProtectionDomain.java | 7 +- src/share/classes/java/sql/DriverManager.java | 68 +- src/share/classes/java/util/ResourceBundle.java | 29 +- src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java | 11 +- src/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java | 18 +- src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java | 13 +- src/share/classes/java/util/logging/LogManager.java | 39 +- src/share/classes/java/util/logging/Logger.java | 99 +- src/share/classes/java/util/zip/ZipFile.java | 26 +- src/share/classes/javax/management/JMX.java | 90 +- src/share/classes/javax/management/MBeanServerFactory.java | 3 +- src/share/classes/javax/management/MBeanServerInvocationHandler.java | 15 +- src/share/classes/javax/management/StandardEmitterMBean.java | 35 +- src/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java | 2 + src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java | 10 +- src/share/classes/javax/management/relation/RelationNotification.java | 255 +- src/share/classes/javax/management/remote/JMXConnectorFactory.java | 39 +- src/share/classes/javax/management/remote/NotificationResult.java | 4 +- src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java | 2 + src/share/classes/javax/management/remote/rmi/RMIConnector.java | 5 +- src/share/classes/javax/script/ScriptEngineManager.java | 48 +- src/share/classes/javax/sound/midi/MetaMessage.java | 18 +- src/share/classes/javax/sound/sampled/Mixer.java | 8 +- src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java | 19 +- src/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java | 19 +- src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java | 2 +- src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheTransform.java | 12 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java | 18 + src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java | 9 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMManifest.java | 21 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java | 36 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java | 18 + src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java | 9 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java | 9 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java | 35 + src/share/classes/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java | 42 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMUtils.java | 4 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLObject.java | 10 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java | 9 +- src/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java | 10 + src/share/classes/sun/applet/AppletSecurity.java | 4 +- src/share/classes/sun/audio/AudioData.java | 4 +- src/share/classes/sun/audio/AudioDataStream.java | 10 +- src/share/classes/sun/audio/AudioDevice.java | 16 +- src/share/classes/sun/audio/AudioPlayer.java | 15 +- src/share/classes/sun/audio/AudioStream.java | 14 +- src/share/classes/sun/audio/AudioStreamSequence.java | 7 +- src/share/classes/sun/audio/AudioTranslatorStream.java | 9 +- src/share/classes/sun/audio/ContinuousAudioDataStream.java | 7 +- src/share/classes/sun/audio/InvalidAudioFormatException.java | 8 +- src/share/classes/sun/awt/AppContext.java | 121 +- src/share/classes/sun/awt/IconInfo.java | 237 ++ src/share/classes/sun/awt/SunToolkit.java | 7 +- src/share/classes/sun/awt/image/ByteBandedRaster.java | 73 +- src/share/classes/sun/awt/image/ByteComponentRaster.java | 23 +- src/share/classes/sun/awt/image/BytePackedRaster.java | 3 +- src/share/classes/sun/awt/image/IntegerComponentRaster.java | 23 +- src/share/classes/sun/awt/image/ShortBandedRaster.java | 66 +- src/share/classes/sun/awt/image/ShortComponentRaster.java | 23 +- src/share/classes/sun/awt/resources/security-icon-bw16.png | Bin src/share/classes/sun/awt/resources/security-icon-bw24.png | Bin src/share/classes/sun/awt/resources/security-icon-bw32.png | Bin src/share/classes/sun/awt/resources/security-icon-bw48.png | Bin src/share/classes/sun/awt/resources/security-icon-interim16.png | Bin src/share/classes/sun/awt/resources/security-icon-interim24.png | Bin src/share/classes/sun/awt/resources/security-icon-interim32.png | Bin src/share/classes/sun/awt/resources/security-icon-interim48.png | Bin src/share/classes/sun/awt/resources/security-icon-yellow16.png | Bin src/share/classes/sun/awt/resources/security-icon-yellow24.png | Bin src/share/classes/sun/awt/resources/security-icon-yellow32.png | Bin src/share/classes/sun/awt/resources/security-icon-yellow48.png | Bin src/share/classes/sun/font/CreatedFontTracker.java | 119 +- src/share/classes/sun/font/ExtendedTextSourceLabel.java | 13 +- src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java | 41 +- src/share/classes/sun/misc/JavaUtilZipFileAccess.java | 32 + src/share/classes/sun/misc/SharedSecrets.java | 11 + src/share/classes/sun/misc/URLClassPath.java | 21 +- src/share/classes/sun/misc/Unsafe.java | 12 +- src/share/classes/sun/net/NetworkClient.java | 8 +- src/share/classes/sun/net/ftp/impl/FtpClient.java | 21 +- src/share/classes/sun/net/httpserver/ServerImpl.java | 11 +- src/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java | 23 +- src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java | 27 +- src/share/classes/sun/nio/ch/DatagramChannelImpl.java | 29 +- src/share/classes/sun/nio/ch/Net.java | 107 +- src/share/classes/sun/nio/ch/ServerSocketAdaptor.java | 3 +- src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java | 40 +- src/share/classes/sun/nio/ch/SocketAdaptor.java | 4 +- src/share/classes/sun/nio/ch/SocketChannelImpl.java | 30 +- src/share/classes/sun/reflect/CallerSensitive.java | 41 + src/share/classes/sun/reflect/Reflection.java | 38 +- src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java | 9 +- src/share/classes/sun/reflect/misc/ReflectUtil.java | 54 +- src/share/classes/sun/rmi/server/Activation.java | 16 +- src/share/classes/sun/rmi/server/LoaderHandler.java | 33 +- src/share/classes/sun/rmi/transport/proxy/WrappedSocket.java | 11 +- src/share/classes/sun/security/pkcs11/P11KeyAgreement.java | 6 +- src/share/classes/sun/security/pkcs11/P11Signature.java | 7 +- src/share/classes/sun/security/pkcs11/P11Util.java | 16 +- src/share/classes/sun/security/timestamp/TimestampToken.java | 6 +- src/share/classes/sun/security/util/KeyUtil.java | 21 +- src/share/classes/sun/security/util/SignatureFileVerifier.java | 29 +- src/share/classes/sun/tools/jconsole/ProxyClient.java | 15 +- src/share/classes/sun/tools/jconsole/VMPanel.java | 11 +- src/share/classes/sun/tools/jconsole/resources/JConsoleResources.java | 5 + src/share/classes/sun/tracing/ProviderSkeleton.java | 31 +- src/share/classes/sun/tracing/dtrace/DTraceProvider.java | 15 +- src/share/lib/security/java.security | 8 +- src/share/lib/security/java.security-macosx | 4 + src/share/lib/security/java.security-solaris | 8 +- src/share/lib/security/java.security-windows | 4 + src/share/native/common/sizecalc.h | 118 + src/share/native/java/lang/ClassLoader.c | 17 - src/share/native/java/lang/SecurityManager.c | 1 - src/share/native/java/util/zip/ZipFile.c | 8 + src/share/native/java/util/zip/zip_util.c | 8 + src/share/native/java/util/zip/zip_util.h | 1 + src/share/native/sun/awt/image/awt_parseImage.c | 167 +- src/share/native/sun/awt/medialib/awt_ImagingLib.c | 466 +++- src/share/native/sun/awt/medialib/mlib_ImageCreate.c | 31 +- src/share/native/sun/awt/splashscreen/java_awt_SplashScreen.c | 3 +- src/share/native/sun/awt/splashscreen/splashscreen_gif.c | 6 +- src/share/native/sun/font/freetypeScaler.c | 13 +- src/share/native/sun/font/layout/LEGlyphStorage.cpp | 16 +- src/share/native/sun/font/layout/LookupProcessor.cpp | 2 +- src/share/native/sun/font/layout/PairPositioningSubtables.cpp | 27 +- src/share/native/sun/font/layout/PairPositioningSubtables.h | 5 +- src/share/native/sun/java2d/cmm/lcms/cmslut.c | 3 + src/share/native/sun/java2d/cmm/lcms/cmsnamed.c | 10 +- src/share/native/sun/java2d/cmm/lcms/cmsopt.c | 9 + src/share/native/sun/java2d/pipe/Region.c | 5 +- src/share/native/sun/reflect/Reflection.c | 6 +- src/solaris/classes/sun/awt/X11/XDecoratedPeer.java | 5 +- src/solaris/classes/sun/awt/X11/XIconInfo.java | 237 -- src/solaris/classes/sun/awt/X11/XIconWindow.java | 9 +- src/solaris/classes/sun/awt/X11/XNETProtocol.java | 12 +- src/solaris/classes/sun/awt/X11/XWM.java | 5 +- src/solaris/classes/sun/awt/X11/XWarningWindow.java | 65 +- src/solaris/classes/sun/awt/X11/XWindowAttributesData.java | 7 +- src/solaris/classes/sun/awt/X11/XWindowPeer.java | 47 +- src/solaris/classes/sun/awt/X11/security-icon-bw16.png | Bin src/solaris/classes/sun/awt/X11/security-icon-bw24.png | Bin src/solaris/classes/sun/awt/X11/security-icon-bw32.png | Bin src/solaris/classes/sun/awt/X11/security-icon-bw48.png | Bin src/solaris/classes/sun/awt/X11/security-icon-interim16.png | Bin src/solaris/classes/sun/awt/X11/security-icon-interim24.png | Bin src/solaris/classes/sun/awt/X11/security-icon-interim32.png | Bin src/solaris/classes/sun/awt/X11/security-icon-interim48.png | Bin src/solaris/classes/sun/awt/X11/security-icon-yellow16.png | Bin src/solaris/classes/sun/awt/X11/security-icon-yellow24.png | Bin src/solaris/classes/sun/awt/X11/security-icon-yellow32.png | Bin src/solaris/classes/sun/awt/X11/security-icon-yellow48.png | Bin src/solaris/classes/sun/nio/ch/SctpNet.java | 62 +- src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java | 2 +- src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java | 3 +- src/solaris/native/sun/awt/awt_GraphicsEnv.c | 5 +- src/solaris/native/sun/awt/awt_GraphicsEnv.h | 3 + src/solaris/native/sun/awt/awt_Robot.c | 8 +- src/solaris/native/sun/awt/awt_UNIXToolkit.c | 10 +- src/solaris/native/sun/awt/fontpath.c | 12 +- src/solaris/native/sun/awt/gtk2_interface.c | 4 +- src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c | 22 +- src/solaris/native/sun/java2d/x11/X11SurfaceData.c | 11 +- src/solaris/native/sun/nio/ch/Net.c | 9 +- src/solaris/native/sun/xawt/XlibWrapper.c | 10 +- src/windows/classes/java/net/DefaultDatagramSocketImplFactory.java | 51 +- src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java | 32 +- src/windows/classes/java/net/DualStackPlainSocketImpl.java | 32 +- src/windows/classes/java/net/PlainSocketImpl.java | 25 +- src/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java | 47 +- src/windows/classes/java/net/TwoStacksPlainSocketImpl.java | 39 +- src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java | 4 +- src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c | 5 +- src/windows/native/java/net/DualStackPlainSocketImpl.c | 6 +- src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c | 11 +- src/windows/native/java/net/TwoStacksPlainSocketImpl.c | 13 +- src/windows/native/java/net/net_util_md.c | 65 +- src/windows/native/java/net/net_util_md.h | 5 +- src/windows/native/sun/awt/splashscreen/splashscreen_sys.c | 31 +- src/windows/native/sun/font/lcdglyph.c | 10 +- src/windows/native/sun/java2d/opengl/WGLSurfaceData.c | 3 +- src/windows/native/sun/java2d/windows/GDIBlitLoops.cpp | 1 + src/windows/native/sun/java2d/windows/GDIRenderer.cpp | 2 +- src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp | 5 +- src/windows/native/sun/nio/ch/Net.c | 18 +- src/windows/native/sun/windows/CmdIDList.cpp | 6 +- src/windows/native/sun/windows/Devices.cpp | 7 +- src/windows/native/sun/windows/ShellFolder2.cpp | 6 + src/windows/native/sun/windows/WPrinterJob.cpp | 2 +- src/windows/native/sun/windows/alloc.h | 3 + src/windows/native/sun/windows/awt.h | 6 +- src/windows/native/sun/windows/awt_BitmapUtil.cpp | 14 +- src/windows/native/sun/windows/awt_Component.cpp | 45 +- src/windows/native/sun/windows/awt_Cursor.cpp | 6 +- src/windows/native/sun/windows/awt_DataTransferer.cpp | 12 +- src/windows/native/sun/windows/awt_DesktopProperties.cpp | 6 +- src/windows/native/sun/windows/awt_DnDDT.cpp | 4 +- src/windows/native/sun/windows/awt_InputMethod.cpp | 8 +- src/windows/native/sun/windows/awt_PrintControl.cpp | 4 +- src/windows/native/sun/windows/awt_PrintJob.cpp | 17 +- src/windows/native/sun/windows/awt_Robot.cpp | 5 + test/Makefile | 4 +- test/ProblemList.txt | 1 - test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java | 22 +- test/com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java | 45 +- test/java/rmi/Naming/LookupNameWithColon.java | 18 +- test/java/rmi/Naming/RmiIsNoScheme.java | 12 +- test/java/rmi/Naming/UnderscoreHost.java | 71 +- test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java | 6 +- test/java/rmi/activation/Activatable/checkActivateRef/security.policy | 3 +- test/java/rmi/activation/Activatable/checkAnnotations/security.policy | 3 +- test/java/rmi/activation/Activatable/checkImplClassLoader/security.policy | 3 +- test/java/rmi/activation/Activatable/checkRegisterInLog/security.policy | 5 +- test/java/rmi/activation/Activatable/createPrivateActivable/security.policy | 3 +- test/java/rmi/activation/Activatable/downloadParameterClass/security.policy | 3 +- test/java/rmi/activation/Activatable/elucidateNoSuchMethod/security.policy | 3 +- test/java/rmi/activation/Activatable/extLoadedImpl/security.policy | 3 +- test/java/rmi/activation/Activatable/forceLogSnapshot/security.policy | 3 +- test/java/rmi/activation/Activatable/inactiveGroup/security.policy | 5 +- test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java | 4 +- test/java/rmi/activation/Activatable/nestedActivate/security.policy | 5 +- test/java/rmi/activation/Activatable/nonExistentActivatable/security.policy | 3 +- test/java/rmi/activation/Activatable/restartCrashedService/security.policy | 3 +- test/java/rmi/activation/Activatable/restartLatecomer/security.policy | 3 +- test/java/rmi/activation/Activatable/restartService/security.policy | 3 +- test/java/rmi/activation/Activatable/shutdownGracefully/security.policy | 3 +- test/java/rmi/activation/Activatable/unregisterInactive/security.policy | 3 +- test/java/rmi/activation/ActivateFailedException/activateFails/security.policy | 3 +- test/java/rmi/activation/ActivationSystem/activeGroup/security.policy | 3 +- test/java/rmi/activation/ActivationSystem/modifyDescriptor/security.policy | 3 +- test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java | 10 +- test/java/rmi/activation/ActivationSystem/stubClassesPermitted/security.policy | 9 +- test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java | 9 +- test/java/rmi/activation/ActivationSystem/unregisterGroup/security.policy | 3 +- test/java/rmi/activation/CommandEnvironment/SetChildEnv.java | 37 +- test/java/rmi/activation/CommandEnvironment/security.policy | 1 + test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java | 20 +- test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java | 23 +- test/java/rmi/activation/rmidViaInheritedChannel/rmid.security.policy | 1 + test/java/rmi/registry/altSecurityManager/AltSecurityManager.java | 45 +- test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java | 11 +- test/java/rmi/registry/emptyName/EmptyName.java | 6 +- test/java/rmi/registry/interfaceHash/InterfaceHash.java | 6 +- test/java/rmi/registry/multipleRegistries/MultipleRegistries.java | 15 +- test/java/rmi/registry/readTest/readTest.java | 9 +- test/java/rmi/registry/readTest/readTest.sh | 5 +- test/java/rmi/registry/reexport/Reexport.java | 25 +- test/java/rmi/reliability/juicer/AppleUserImpl.java | 22 +- test/java/rmi/reliability/juicer/ApplicationServer.java | 27 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/EchoImpl.java | 7 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java | 16 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy | 3 + test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl.java | 5 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java | 14 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy | 2 + test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/EchoImpl.java | 5 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java | 15 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/security.policy | 9 + test/java/rmi/server/RemoteServer/AddrInUse.java | 12 +- test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java | 10 +- test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownImpl.java | 5 +- test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java | 12 +- test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java | 9 +- test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java | 8 +- test/java/rmi/server/Unreferenced/leaseCheckInterval/SelfTerminator.java | 6 +- test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java | 8 +- test/java/rmi/server/useCustomRef/UseCustomRef.java | 8 +- test/java/rmi/server/useCustomRef/security.policy | 3 + test/java/rmi/testlibrary/ActivationLibrary.java | 39 +- test/java/rmi/testlibrary/RMID.java | 25 +- test/java/rmi/testlibrary/RegistryRunner.java | 9 +- test/java/rmi/testlibrary/StreamPipe.java | 2 +- test/java/rmi/testlibrary/TestLibrary.java | 132 +- test/java/rmi/transport/checkFQDN/CheckFQDN.java | 13 +- test/java/rmi/transport/checkFQDN/CheckFQDNClient.java | 5 +- test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java | 13 +- test/java/rmi/transport/checkLeaseInfoLeak/LeaseLeakClient.java | 6 +- test/java/rmi/transport/checkLeaseInfoLeak/security.policy | 1 + test/java/rmi/transport/closeServerSocket/CloseServerSocket.java | 10 +- test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java | 13 +- test/java/rmi/transport/dgcDeadLock/TestImpl.java | 10 +- test/java/rmi/transport/handshakeFailure/HandshakeFailure.java | 7 +- test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java | 7 +- test/java/rmi/transport/httpSocket/HttpSocketTest.java | 16 +- test/java/rmi/transport/httpSocket/security.policy | 4 + test/java/rmi/transport/pinClientSocketFactory/PinClientSocketFactory.java | 6 +- test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java | 9 +- test/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java | 7 +- test/javax/xml/crypto/dsig/GenerationTests.java | 8 +- test/javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java | 7 +- test/javax/xml/crypto/dsig/ValidationTests.java | 4 +- test/sun/reflect/CallerSensitive/CallerSensitiveFinder.java | 248 ++ test/sun/reflect/CallerSensitive/ClassFileReader.java | 338 ++++ test/sun/reflect/CallerSensitive/MethodFinder.java | 201 ++ test/sun/reflect/CallerSensitive/MissingCallerSensitive.java | 73 + test/sun/rmi/rmic/newrmic/equivalence/AppleUserImpl.java | 17 +- test/sun/rmi/rmic/newrmic/equivalence/run.sh | 4 +- test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java | 8 +- test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java | 11 +- test/sun/rmi/transport/proxy/EagerHttpFallback.java | 8 +- test/sun/rmi/transport/tcp/DeadCachedConnection.java | 4 +- test/tools/launcher/Arrrghs.java | 10 +- 552 files changed, 11680 insertions(+), 6935 deletions(-) diffs (truncated from 35032 to 500 lines): diff -r 518d2e1d3549 -r c13072c37f69 make/java/java/FILES_c.gmk --- a/make/java/java/FILES_c.gmk Wed May 22 17:57:08 2013 +0100 +++ b/make/java/java/FILES_c.gmk Tue Jun 18 08:07:48 2013 -0500 @@ -48,7 +48,6 @@ Proxy.c \ RandomAccessFile.c \ RandomAccessFile_md.c \ - ResourceBundle.c \ Runtime.c \ SecurityManager.c \ Shutdown.c \ @@ -69,7 +68,6 @@ jdk_util_md.c \ check_version.c \ java_props_md.c \ - DriverManager.c \ ConstantPool.c \ MessageUtils.c \ GC.c \ diff -r 518d2e1d3549 -r c13072c37f69 make/java/java/mapfile-vers --- a/make/java/java/mapfile-vers Wed May 22 17:57:08 2013 +0100 +++ b/make/java/java/mapfile-vers Tue Jun 18 08:07:48 2013 -0500 @@ -135,7 +135,6 @@ Java_java_lang_ClassLoader_00024NativeLibrary_find; Java_java_lang_ClassLoader_00024NativeLibrary_load; Java_java_lang_ClassLoader_00024NativeLibrary_unload; - Java_java_lang_ClassLoader_getCaller; Java_java_lang_ClassLoader_registerNatives; Java_java_lang_Compiler_registerNatives; Java_java_lang_Double_longBitsToDouble; @@ -233,8 +232,6 @@ Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedExceptionAction_2Ljava_security_AccessControlContext_2; Java_java_security_AccessController_getStackAccessControlContext; Java_java_security_AccessController_getInheritedAccessControlContext; - Java_java_sql_DriverManager_getCallerClassLoader; - Java_java_util_ResourceBundle_getClassContext; Java_java_util_TimeZone_getSystemTimeZoneID; Java_java_util_TimeZone_getSystemGMTOffsetID; Java_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8; diff -r 518d2e1d3549 -r c13072c37f69 make/java/java/reorder-i586 --- a/make/java/java/reorder-i586 Wed May 22 17:57:08 2013 +0100 +++ b/make/java/java/reorder-i586 Tue Jun 18 08:07:48 2013 -0500 @@ -73,7 +73,6 @@ # Test Sleep # Test IntToString # Test LoadToolkit -text: .text%Java_java_util_ResourceBundle_getClassContext; text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2; text: .text%JNU_GetEnv; text: .text%Java_java_io_UnixFileSystem_checkAccess; diff -r 518d2e1d3549 -r c13072c37f69 make/java/java/reorder-sparc --- a/make/java/java/reorder-sparc Wed May 22 17:57:08 2013 +0100 +++ b/make/java/java/reorder-sparc Tue Jun 18 08:07:48 2013 -0500 @@ -78,7 +78,6 @@ # Test Sleep # Test IntToString # Test LoadToolkit -text: .text%Java_java_util_ResourceBundle_getClassContext; text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2; text: .text%JNU_GetEnv; text: .text%Java_java_io_UnixFileSystem_checkAccess; diff -r 518d2e1d3549 -r c13072c37f69 make/java/java/reorder-sparcv9 --- a/make/java/java/reorder-sparcv9 Wed May 22 17:57:08 2013 +0100 +++ b/make/java/java/reorder-sparcv9 Tue Jun 18 08:07:48 2013 -0500 @@ -74,7 +74,6 @@ # Test Sleep # Test IntToString # Test LoadToolkit -text: .text%Java_java_util_ResourceBundle_getClassContext; text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2; text: .text%JNU_GetEnv; text: .text%Java_java_io_UnixFileSystem_checkAccess; diff -r 518d2e1d3549 -r c13072c37f69 make/java/nio/mapfile-bsd --- a/make/java/nio/mapfile-bsd Wed May 22 17:57:08 2013 +0100 +++ b/make/java/nio/mapfile-bsd Tue Jun 18 08:07:48 2013 -0500 @@ -108,6 +108,7 @@ Java_sun_nio_ch_Net_setInterface6; Java_sun_nio_ch_Net_getInterface6; Java_sun_nio_ch_Net_shutdown; + Java_sun_nio_ch_Net_isExclusiveBindAvailable; Java_sun_nio_ch_PollArrayWrapper_interrupt; Java_sun_nio_ch_PollArrayWrapper_poll0; Java_sun_nio_ch_ServerSocketChannelImpl_accept0; diff -r 518d2e1d3549 -r c13072c37f69 make/java/nio/mapfile-linux --- a/make/java/nio/mapfile-linux Wed May 22 17:57:08 2013 +0100 +++ b/make/java/nio/mapfile-linux Tue Jun 18 08:07:48 2013 -0500 @@ -115,6 +115,7 @@ Java_sun_nio_ch_Net_setInterface6; Java_sun_nio_ch_Net_getInterface6; Java_sun_nio_ch_Net_shutdown; + Java_sun_nio_ch_Net_isExclusiveBindAvailable; Java_sun_nio_ch_PollArrayWrapper_interrupt; Java_sun_nio_ch_PollArrayWrapper_poll0; Java_sun_nio_ch_ServerSocketChannelImpl_accept0; diff -r 518d2e1d3549 -r c13072c37f69 make/java/nio/mapfile-solaris --- a/make/java/nio/mapfile-solaris Wed May 22 17:57:08 2013 +0100 +++ b/make/java/nio/mapfile-solaris Tue Jun 18 08:07:48 2013 -0500 @@ -103,6 +103,7 @@ Java_sun_nio_ch_Net_setInterface6; Java_sun_nio_ch_Net_getInterface6; Java_sun_nio_ch_Net_shutdown; + Java_sun_nio_ch_Net_isExclusiveBindAvailable; Java_sun_nio_ch_PollArrayWrapper_interrupt; Java_sun_nio_ch_PollArrayWrapper_poll0; Java_sun_nio_ch_ServerSocketChannelImpl_accept0; diff -r 518d2e1d3549 -r c13072c37f69 make/java/zip/mapfile-vers --- a/make/java/zip/mapfile-vers Wed May 22 17:57:08 2013 +0100 +++ b/make/java/zip/mapfile-vers Tue Jun 18 08:07:48 2013 -0500 @@ -68,6 +68,7 @@ Java_java_util_zip_ZipFile_initIDs; Java_java_util_zip_ZipFile_open; Java_java_util_zip_ZipFile_read; + Java_java_util_zip_ZipFile_startsWithLOC; ZIP_Close; ZIP_CRC32; diff -r 518d2e1d3549 -r c13072c37f69 make/java/zip/reorder-i586 --- a/make/java/zip/reorder-i586 Wed May 22 17:57:08 2013 +0100 +++ b/make/java/zip/reorder-i586 Tue Jun 18 08:07:48 2013 -0500 @@ -19,6 +19,7 @@ text: .text%Java_java_util_zip_ZipFile_initIDs; text: .text%Java_java_util_zip_ZipFile_open; text: .text%Java_java_util_zip_ZipFile_getTotal; +text: .text%Java_java_util_zip_ZipFile_startsWithLOC; text: .text%Java_java_util_zip_ZipFile_getEntry; text: .text%Java_java_util_zip_ZipFile_freeEntry; text: .text%Java_java_util_zip_ZipFile_getEntryTime; diff -r 518d2e1d3549 -r c13072c37f69 make/java/zip/reorder-sparc --- a/make/java/zip/reorder-sparc Wed May 22 17:57:08 2013 +0100 +++ b/make/java/zip/reorder-sparc Tue Jun 18 08:07:48 2013 -0500 @@ -18,6 +18,7 @@ text: .text%Java_java_util_zip_ZipFile_initIDs; text: .text%Java_java_util_zip_ZipFile_open; text: .text%Java_java_util_zip_ZipFile_getTotal; +text: .text%Java_java_util_zip_ZipFile_startsWithLOC; text: .text%Java_java_util_zip_ZipFile_getEntry; text: .text%Java_java_util_zip_ZipFile_freeEntry; text: .text%Java_java_util_zip_ZipFile_getEntryTime; diff -r 518d2e1d3549 -r c13072c37f69 make/java/zip/reorder-sparcv9 --- a/make/java/zip/reorder-sparcv9 Wed May 22 17:57:08 2013 +0100 +++ b/make/java/zip/reorder-sparcv9 Tue Jun 18 08:07:48 2013 -0500 @@ -18,6 +18,7 @@ text: .text%Java_java_util_zip_ZipFile_initIDs; text: .text%Java_java_util_zip_ZipFile_open; text: .text%Java_java_util_zip_ZipFile_getTotal; +text: .text%Java_java_util_zip_ZipFile_startsWithLOC; text: .text%Java_java_util_zip_ZipFile_getEntry; text: .text%Java_java_util_zip_ZipFile_freeEntry; text: .text%Java_java_util_zip_ZipFile_getEntryTime; diff -r 518d2e1d3549 -r c13072c37f69 make/sun/awt/Makefile --- a/make/sun/awt/Makefile Wed May 22 17:57:08 2013 +0100 +++ b/make/sun/awt/Makefile Tue Jun 18 08:07:48 2013 -0500 @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -38,6 +38,10 @@ OTHER_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES +ifneq ($(PLATFORM), windows) +CLASSES_INIT += $(TEMPDIR)/.gen_icons +endif + # # Files # @@ -208,6 +212,79 @@ endif build: fontconfigs +ifneq ($(PLATFORM), windows) + +GEN_DIR=$(GENSRCDIR)/sun/awt/ + +ifdef OPENJDK + ICONS_PATH_PREFIX=$(PLATFORM_SRC) +else + ICONS_PATH_PREFIX=$(CLOSED_SRC)/solaris +endif + +ICONS = \ + $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon16.png \ + $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon24.png \ + $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon32.png \ + $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon48.png + +ICONPATH=$(SHARE_SRC)/classes/sun/awt/resources + +ICONS += \ + $(ICONPATH)/security-icon-bw16.png \ + $(ICONPATH)/security-icon-interim16.png \ + $(ICONPATH)/security-icon-yellow16.png \ + $(ICONPATH)/security-icon-bw24.png \ + $(ICONPATH)/security-icon-interim24.png \ + $(ICONPATH)/security-icon-yellow24.png \ + $(ICONPATH)/security-icon-bw32.png \ + $(ICONPATH)/security-icon-interim32.png \ + $(ICONPATH)/security-icon-yellow32.png \ + $(ICONPATH)/security-icon-bw48.png \ + $(ICONPATH)/security-icon-interim48.png \ + $(ICONPATH)/security-icon-yellow48.png + +TEMPDIR_CLASSES = $(TEMPDIR)/classes + +generated.clean: + $(RM) -r $(GEN_DIR)/*.java + $(RM) -r $(TEMPDIR)/.gen_icons + +$(TEMPDIR_CLASSES)/sun/awt/ToBin.class: ToBin.java + @$(prep-target) + $(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $< + +$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/ToBin.class $(ICONS) + $(prep-target) + for i in $(ICONS); do \ + filename=`basename $$i`; \ + name=`$(ECHO) $$filename | $(TR) '\-.' '__'`; \ + classname=$(GEN_DIR)/AWTIcon32_$$name.java; \ + $(RM) $$classname; \ + $(ECHO) "package sun.awt;" >> $$classname ; \ + $(ECHO) "public class AWTIcon32_$$name {" >> $$classname; \ + $(ECHO) "public final static int[] $$name = { " >> $$classname; \ + $(CAT) $$i | \ + $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ + -Djava.awt.headless=true \ + sun.awt.ToBin >> $$classname; \ + $(ECHO) "}; }" >> $$classname; \ + classname=$(GEN_DIR)/AWTIcon64_$$name.java; \ + $(RM) $$classname; \ + $(ECHO) "package sun.awt;" >> $$classname ; \ + $(ECHO) "public class AWTIcon64_$$name {" >> $$classname; \ + $(ECHO) "public final static long[] $$name = { " >> $$classname; \ + $(CAT) $$i | \ + $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ + -Djava.awt.headless=true \ + sun.awt.ToBin >> $$classname; \ + $(ECHO) "}; }" >> $$classname; \ + done + $(TOUCH) $@ + +clean clobber:: generated.clean +endif + ifeq ($(PLATFORM), windows) # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv WINDOWS @@ -565,5 +642,5 @@ java.lang.Integer \ java.lang.ThreadGroup -.PHONY: dgalibs dgalib.clean fontconfigs fontconfigs.clean +.PHONY: dgalibs dgalib.clean fontconfigs fontconfigs.clean generated.clean diff -r 518d2e1d3549 -r c13072c37f69 make/sun/awt/ToBin.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/sun/awt/ToBin.java Tue Jun 18 08:07:48 2013 -0500 @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code 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 + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package sun.awt; + +import java.io.*; +import java.awt.image.*; +import javax.imageio.*; +import java.awt.*; + +public class ToBin { + public static void main(String[] args) throws Exception { + BufferedImage im = ImageIO.read(System.in); + BufferedImage bi = null; + int iconWidth = im.getWidth(null); + int iconHeight = im.getHeight(null); + if (im != null && iconHeight != 0 && iconWidth != 0) { + bi = new BufferedImage(iconWidth, iconHeight, BufferedImage.TYPE_INT_ARGB); + Graphics g = bi.getGraphics(); + try { + g.drawImage(im, 0, 0, iconWidth, iconHeight, null); + } finally { + g.dispose(); + } + } + DataBuffer srcBuf = bi.getData().getDataBuffer(); + int[] buf = ((DataBufferInt)srcBuf).getData(); + System.out.print(iconWidth + ","); + System.out.println(iconHeight + ","); + for (int i = 0; i < buf.length; i++) { + System.out.print("0x" + Integer.toHexString(buf[i]) + ", "); + if (i % 10 == 0) { + System.out.println(); + } + } + } +} diff -r 518d2e1d3549 -r c13072c37f69 make/sun/font/Makefile --- a/make/sun/font/Makefile Wed May 22 17:57:08 2013 +0100 +++ b/make/sun/font/Makefile Tue Jun 18 08:07:48 2013 -0500 @@ -92,7 +92,8 @@ # Turn off aliasing with GCC for ExtensionSubtables.cpp ifeq ($(PLATFORM), linux) - OTHER_CXXFLAGS += -fno-strict-aliasing + CXXFLAGS += $(CXXFLAGS_$(@F)) + CXXFLAGS_ExtensionSubtables.o = -fno-strict-aliasing endif #In the non-OpenJDK mode we need to build T2K diff -r 518d2e1d3549 -r c13072c37f69 make/sun/xawt/Makefile --- a/make/sun/xawt/Makefile Wed May 22 17:57:08 2013 +0100 +++ b/make/sun/xawt/Makefile Tue Jun 18 08:07:48 2013 -0500 @@ -1,5 +1,5 @@ # -# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -39,7 +39,7 @@ GEN_DIR=$(GENSRCDIR)/sun/awt/X11 -CLASSES_INIT += $(TEMPDIR)/.gen.wrappers $(TEMPDIR)/.gen_icons touch.wrappers +CLASSES_INIT += $(TEMPDIR)/.gen.wrappers touch.wrappers .PHONY: generated.clean @@ -375,70 +375,7 @@ $(RM) -r $(WRAPPER_GENERATOR_TEMPDIR) $(RM) -r $(WRAPPER_GENERATOR_DIR) $(RM) -r $(GEN_DIR)/*.java - $(RM) -r $(TEMPDIR)/.gen_icons -ifdef OPENJDK - ICONS_PATH_PREFIX=$(PLATFORM_SRC) -else - ICONS_PATH_PREFIX=$(CLOSED_SRC)/solaris -endif - -ICONS = \ - $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon16.png \ - $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon24.png \ - $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon32.png \ - $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon48.png - - -ICONPATH=$(PLATFORM_SRC)/classes/sun/awt/X11 - -ICONS += \ - $(ICONPATH)/security-icon-bw16.png \ - $(ICONPATH)/security-icon-interim16.png \ - $(ICONPATH)/security-icon-yellow16.png \ - $(ICONPATH)/security-icon-bw24.png \ - $(ICONPATH)/security-icon-interim24.png \ - $(ICONPATH)/security-icon-yellow24.png \ - $(ICONPATH)/security-icon-bw32.png \ - $(ICONPATH)/security-icon-interim32.png \ - $(ICONPATH)/security-icon-yellow32.png \ - $(ICONPATH)/security-icon-bw48.png \ - $(ICONPATH)/security-icon-interim48.png \ - $(ICONPATH)/security-icon-yellow48.png - -TEMPDIR_CLASSES = $(TEMPDIR)/classes - -$(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class: ToBin.java - @$(prep-target) - $(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $< - -$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class $(ICONS) - $(prep-target) - for i in $(ICONS); do \ - filename=`basename $$i`; \ - name=`$(ECHO) $$filename | $(TR) '\-.' '__'`; \ - classname=$(GEN_DIR)/XAWTIcon32_$$name.java; \ - $(RM) $$classname; \ - $(ECHO) "package sun.awt.X11;" >> $$classname ; \ - $(ECHO) "public class XAWTIcon32_$$name {" >> $$classname; \ - $(ECHO) "public static int[] $$name = { " >> $$classname; \ - $(CAT) $$i | \ - $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ - -Djava.awt.headless=true \ - sun.awt.X11.ToBin >> $$classname; \ - $(ECHO) "}; }" >> $$classname; \ - classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \ - $(RM) $$classname; \ - $(ECHO) "package sun.awt.X11;" >> $$classname ; \ - $(ECHO) "public class XAWTIcon64_$$name {" >> $$classname; \ - $(ECHO) "public static long[] $$name = { " >> $$classname; \ - $(CAT) $$i | \ - $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ - -Djava.awt.headless=true \ - sun.awt.X11.ToBin >> $$classname; \ - $(ECHO) "}; }" >> $$classname; \ - done - $(TOUCH) $@ clean clobber:: generated.clean diff -r 518d2e1d3549 -r c13072c37f69 make/sun/xawt/ToBin.java --- a/make/sun/xawt/ToBin.java Wed May 22 17:57:08 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code 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 - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package sun.awt.X11; - -import java.io.*; -import java.awt.image.*; -import javax.imageio.*; -import java.awt.*; - -public class ToBin { - public static void main(String[] args) throws Exception { - BufferedImage im = ImageIO.read(System.in); - BufferedImage bi = null; - int iconWidth = im.getWidth(null); - int iconHeight = im.getHeight(null); - if (im != null && iconHeight != 0 && iconWidth != 0) { - bi = new BufferedImage(iconWidth, iconHeight, BufferedImage.TYPE_INT_ARGB); - Graphics g = bi.getGraphics(); - try { - g.drawImage(im, 0, 0, iconWidth, iconHeight, null); - } finally { - g.dispose(); - } - } - DataBuffer srcBuf = bi.getData().getDataBuffer(); - int[] buf = ((DataBufferInt)srcBuf).getData(); - System.out.print(iconWidth + ","); - System.out.println(iconHeight + ","); - for (int i = 0; i < buf.length; i++) { - System.out.print("0x" + Integer.toHexString(buf[i]) + ", "); - if (i % 10 == 0) { - System.out.println(); - } - } - } -} diff -r 518d2e1d3549 -r c13072c37f69 src/macosx/classes/sun/java2d/opengl/CGLLayer.java --- a/src/macosx/classes/sun/java2d/opengl/CGLLayer.java Wed May 22 17:57:08 2013 +0100 +++ b/src/macosx/classes/sun/java2d/opengl/CGLLayer.java Tue Jun 18 08:07:48 2013 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -72,7 +72,7 @@ } public int getTransparency() { From andrew at icedtea.classpath.org Tue Jun 18 14:19:40 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 18 Jun 2013 21:19:40 +0000 Subject: /hg/release/icedtea7-forest-2.3/corba: 2 new changesets Message-ID: changeset 6655779a22c3 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=6655779a22c3 author: coffeys date: Fri Apr 26 18:26:12 2013 +0100 8000642: Better handling of objects for transportation Summary: Also reviewed by alexander.fomin Reviewed-by: alanb, mchung, skoivu changeset 8e581b671511 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=8e581b671511 author: coffeys date: Mon Apr 08 23:12:03 2013 +0100 8001032: Restrict object access Summary: Restrict object access; fix reviewed also by Alexander Fomin Reviewed-by: alanb, ahgross diffstat: make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk | 3 +- src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java | 3 +- src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java | 12 +- src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java | 5 +- src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java | 4 +- src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java | 8 +- src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java | 5 +- src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java | 3 +- src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java | 18 +- src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java | 8 +- src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java | 10 +- src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java | 2 +- src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java | 2 +- src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java | 10 +- src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java | 3 +- src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java | 5 +- src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java | 8 +- src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java | 3 +- src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java | 5 +- src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java | 5 +- src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java | 7 +- src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java | 11 +- src/share/classes/com/sun/corba/se/impl/orb/ORBDataParserImpl.java | 3 +- src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java | 5 +- src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java | 4 +- src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java | 22 +- src/share/classes/com/sun/corba/se/impl/orbutil/ORBClassLoader.java | 47 --- src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java | 8 +- src/share/classes/com/sun/corba/se/impl/protocol/CorbaMessageMediatorImpl.java | 22 +- src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_2.java | 3 +- src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageBase.java | 8 +- src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_0.java | 3 +- src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_1.java | 3 +- src/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoBase.java | 4 +- src/share/classes/com/sun/corba/se/impl/transport/SharedCDRContactInfoImpl.java | 4 +- src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java | 8 +- src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java | 6 +- src/share/classes/com/sun/corba/se/spi/ior/TaggedComponentBase.java | 5 +- src/share/classes/com/sun/corba/se/spi/orb/ORB.java | 6 +- src/share/classes/com/sun/corba/se/spi/orb/OperationFactory.java | 8 +- src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContext.java | 5 +- src/share/classes/org/omg/CORBA_2_3/portable/OutputStream.java | 40 ++- src/share/classes/sun/corba/JavaCorbaAccess.java | 3 +- src/share/classes/sun/corba/OutputStreamFactory.java | 149 ++++++++++ 44 files changed, 339 insertions(+), 167 deletions(-) diffs (truncated from 1336 to 500 lines): diff -r d483d101f145 -r 8e581b671511 make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk --- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk Wed May 22 17:42:08 2013 +0100 +++ b/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk Mon Apr 08 23:12:03 2013 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -39,7 +39,6 @@ com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java \ com/sun/corba/se/impl/orbutil/ORBConstants.java \ com/sun/corba/se/impl/orbutil/ORBUtility.java \ - com/sun/corba/se/impl/orbutil/ORBClassLoader.java \ com/sun/corba/se/impl/orbutil/RepIdDelegator.java \ com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java \ com/sun/corba/se/impl/orbutil/RepositoryIdStrings.java \ diff -r d483d101f145 -r 8e581b671511 src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java --- a/src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java Wed May 22 17:42:08 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java Mon Apr 08 23:12:03 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -81,7 +81,6 @@ import com.sun.corba.se.impl.oa.poa.BadServerIdHandler; import com.sun.corba.se.impl.orbutil.ORBConstants; -import com.sun.corba.se.impl.orbutil.ORBClassLoader; import com.sun.corba.se.impl.orbutil.ORBUtility; import com.sun.corba.se.impl.util.Utility; diff -r d483d101f145 -r 8e581b671511 src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java --- a/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Wed May 22 17:42:08 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Mon Apr 08 23:12:03 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,6 +33,8 @@ import java.io.Serializable; import java.math.BigDecimal; +import java.security.AccessController; +import java.security.PrivilegedAction; import java.util.List ; import java.util.ArrayList ; @@ -504,7 +506,13 @@ public org.omg.CORBA.portable.OutputStream create_output_stream() { //debug.log ("create_output_stream"); - return new AnyOutputStream(orb); + final ORB finalorb = this.orb; + return AccessController.doPrivileged(new PrivilegedAction() { + @Override + public AnyOutputStream run() { + return new AnyOutputStream(finalorb); + } + }); } /** diff -r d483d101f145 -r 8e581b671511 src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java --- a/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java Wed May 22 17:42:08 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java Mon Apr 08 23:12:03 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -600,7 +600,8 @@ } public static CDROutputStream newOutputStream(ORB orb) { - TypeCodeOutputStream tcos = new TypeCodeOutputStream((ORB)orb); + TypeCodeOutputStream tcos = + sun.corba.OutputStreamFactory.newTypeCodeOutputStream(orb); //if (debug) System.out.println("Created TypeCodeOutputStream " + tcos + // " with no parent"); return tcos; diff -r d483d101f145 -r 8e581b671511 src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java --- a/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java Wed May 22 17:42:08 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java Mon Apr 08 23:12:03 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -66,7 +66,7 @@ * * @author Ram Jeyaraman */ -public class IDLJavaSerializationOutputStream extends CDROutputStreamBase { +final class IDLJavaSerializationOutputStream extends CDROutputStreamBase { private ORB orb; private byte encodingVersion; diff -r d483d101f145 -r 8e581b671511 src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java --- a/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java Wed May 22 17:42:08 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java Mon Apr 08 23:12:03 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -196,7 +196,8 @@ } public TypeCodeOutputStream createEncapsulation(org.omg.CORBA.ORB _orb) { - TypeCodeOutputStream encap = new TypeCodeOutputStream((ORB)_orb, isLittleEndian()); + TypeCodeOutputStream encap = + sun.corba.OutputStreamFactory.newTypeCodeOutputStream((ORB)_orb, isLittleEndian()); encap.setEnclosingOutputStream(this); encap.makeEncapsulation(); //if (TypeCodeImpl.debug) System.out.println("Created TypeCodeOutputStream " + encap + " with parent " + this); @@ -211,7 +212,8 @@ public static TypeCodeOutputStream wrapOutputStream(OutputStream os) { boolean littleEndian = ((os instanceof CDROutputStream) ? ((CDROutputStream)os).isLittleEndian() : false); - TypeCodeOutputStream tos = new TypeCodeOutputStream((ORB)os.orb(), littleEndian); + TypeCodeOutputStream tos = + sun.corba.OutputStreamFactory.newTypeCodeOutputStream((ORB)os.orb(), littleEndian); tos.setEnclosingOutputStream(os); //if (TypeCodeImpl.debug) System.out.println("Created TypeCodeOutputStream " + tos + " with parent " + os); return tos; diff -r d483d101f145 -r 8e581b671511 src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java --- a/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java Wed May 22 17:42:08 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java Mon Apr 08 23:12:03 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -155,7 +155,8 @@ // be versioned. This can be handled once this work is complete. // Create output stream with default endianness. - EncapsOutputStream cdrOut = new EncapsOutputStream( + EncapsOutputStream cdrOut = + sun.corba.OutputStreamFactory.newEncapsOutputStream( (com.sun.corba.se.spi.orb.ORB)orb, giopVersion ); // This is an encapsulation, so put out the endian: diff -r d483d101f145 -r 8e581b671511 src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java --- a/src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java Wed May 22 17:42:08 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java Mon Apr 08 23:12:03 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -77,7 +77,6 @@ import com.sun.corba.se.impl.logging.ORBUtilSystemException; import com.sun.corba.se.impl.logging.OMGSystemException; import com.sun.corba.se.impl.corba.RequestImpl; -import com.sun.corba.se.impl.orbutil.ORBClassLoader; import com.sun.corba.se.impl.orbutil.ORBConstants; import com.sun.corba.se.impl.orbutil.ORBUtility; import com.sun.corba.se.impl.orbutil.StackImpl; diff -r d483d101f145 -r 8e581b671511 src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java --- a/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java Wed May 22 17:42:08 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java Mon Apr 08 23:12:03 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -86,13 +86,14 @@ import com.sun.corba.se.impl.encoding.EncapsOutputStream; import com.sun.corba.se.impl.orbutil.ORBUtility; -import com.sun.corba.se.impl.orbutil.ORBClassLoader; import com.sun.corba.se.impl.util.RepositoryId; import com.sun.corba.se.impl.logging.InterceptorsSystemException; import com.sun.corba.se.impl.logging.OMGSystemException; +import sun.corba.SharedSecrets; + /** * Implementation of the RequestInfo interface as specified in * orbos/99-12-02 section 5.4.1. @@ -452,7 +453,8 @@ // Find the read method on the helper class: String helperClassName = className + "Helper"; - Class helperClass = ORBClassLoader.loadClass( helperClassName ); + Class helperClass = + SharedSecrets.getJavaCorbaAccess().loadClass( helperClassName ); Class[] readParams = new Class[1]; readParams[0] = org.omg.CORBA.portable.InputStream.class; Method readMethod = helperClass.getMethod( "read", readParams ); @@ -512,7 +514,8 @@ Class exceptionClass = userException.getClass(); String className = exceptionClass.getName(); String helperClassName = className + "Helper"; - Class helperClass = ORBClassLoader.loadClass( helperClassName ); + Class helperClass = + SharedSecrets.getJavaCorbaAccess().loadClass( helperClassName ); // Find insert( Any, class ) method Class[] insertMethodParams = new Class[2]; @@ -656,7 +659,8 @@ // Convert the "core" service context to an // "IOP" ServiceContext by writing it to a // CDROutputStream and reading it back. - EncapsOutputStream out = new EncapsOutputStream(myORB); + EncapsOutputStream out = + sun.corba.OutputStreamFactory.newEncapsOutputStream(myORB); context.write( out, GIOPVersion.V1_2 ); InputStream inputStream = out.create_input_stream(); @@ -692,8 +696,8 @@ { int id = 0 ; // Convert IOP.service_context to core.ServiceContext: - EncapsOutputStream outputStream = new EncapsOutputStream( - myORB ); + EncapsOutputStream outputStream = + sun.corba.OutputStreamFactory.newEncapsOutputStream(myORB); InputStream inputStream = null; UnknownServiceContext coreServiceContext = null; ServiceContextHelper.write( outputStream, service_context ); diff -r d483d101f145 -r 8e581b671511 src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java --- a/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Wed May 22 17:42:08 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Mon Apr 08 23:12:03 2013 +0100 @@ -300,11 +300,11 @@ resetStream(); } - public final void setOrbStream(org.omg.CORBA_2_3.portable.InputStream os) { + final void setOrbStream(org.omg.CORBA_2_3.portable.InputStream os) { orbStream = os; } - public final org.omg.CORBA_2_3.portable.InputStream getOrbStream() { + final org.omg.CORBA_2_3.portable.InputStream getOrbStream() { return orbStream; } @@ -327,11 +327,11 @@ return (javax.rmi.CORBA.ValueHandler) vhandler; } - public final void increaseRecursionDepth(){ + final void increaseRecursionDepth(){ recursionDepth++; } - public final int decreaseRecursionDepth(){ + final int decreaseRecursionDepth(){ return --recursionDepth; } diff -r d483d101f145 -r 8e581b671511 src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java --- a/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java Wed May 22 17:42:08 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java Mon Apr 08 23:12:03 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -124,19 +124,19 @@ } } - public final void setOrbStream(org.omg.CORBA_2_3.portable.OutputStream os) { + final void setOrbStream(org.omg.CORBA_2_3.portable.OutputStream os) { orbStream = os; } - public final org.omg.CORBA_2_3.portable.OutputStream getOrbStream() { + final org.omg.CORBA_2_3.portable.OutputStream getOrbStream() { return orbStream; } - public final void increaseRecursionDepth(){ + final void increaseRecursionDepth(){ recursionDepth++; } - public final int decreaseRecursionDepth(){ + final int decreaseRecursionDepth(){ return --recursionDepth; } diff -r d483d101f145 -r 8e581b671511 src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java --- a/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java Wed May 22 17:42:08 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java Mon Apr 08 23:12:03 2013 +0100 @@ -251,7 +251,7 @@ } protected abstract byte getStreamFormatVersion(); - protected abstract org.omg.CORBA_2_3.portable.InputStream getOrbStream(); + abstract org.omg.CORBA_2_3.portable.InputStream getOrbStream(); // Description of possible actions protected static class ReadObjectState { diff -r d483d101f145 -r 8e581b671511 src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java --- a/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java Wed May 22 17:42:08 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java Mon Apr 08 23:12:03 2013 +0100 @@ -179,7 +179,7 @@ putFields.write(this); } - public abstract org.omg.CORBA_2_3.portable.OutputStream getOrbStream(); + abstract org.omg.CORBA_2_3.portable.OutputStream getOrbStream(); protected abstract void beginOptionalCustomData(); diff -r d483d101f145 -r 8e581b671511 src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java --- a/src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java Wed May 22 17:42:08 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java Mon Apr 08 23:12:03 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -98,6 +98,14 @@ public ValueHandlerImpl newValueHandlerImpl() { return ValueHandlerImpl.getInstance(); } + public Class loadClass(String className) throws ClassNotFoundException { + if (Thread.currentThread().getContextClassLoader() != null) { + return Thread.currentThread().getContextClassLoader(). + loadClass(className); + } else { + return ClassLoader.getSystemClassLoader().loadClass(className); + } + } }); } diff -r d483d101f145 -r 8e581b671511 src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java --- a/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java Wed May 22 17:42:08 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java Mon Apr 08 23:12:03 2013 +0100 @@ -128,7 +128,8 @@ static public void writeEncapsulation( WriteContents obj, OutputStream os ) { - EncapsOutputStream out = new EncapsOutputStream( (ORB)os.orb() ) ; + EncapsOutputStream out = + sun.corba.OutputStreamFactory.newEncapsOutputStream((ORB)os.orb()); out.putEndian() ; diff -r d483d101f145 -r 8e581b671511 src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java --- a/src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java Wed May 22 17:42:08 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java Mon Apr 08 23:12:03 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -95,7 +95,8 @@ public org.omg.IOP.TaggedProfile getIOPProfile() { - EncapsOutputStream os = new EncapsOutputStream( orb ) ; + EncapsOutputStream os = + sun.corba.OutputStreamFactory.newEncapsOutputStream(orb); write( os ) ; InputStream is = (InputStream)(os.create_input_stream()) ; return org.omg.IOP.TaggedProfileHelper.read( is ) ; diff -r d483d101f145 -r 8e581b671511 src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java --- a/src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java Wed May 22 17:42:08 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java Mon Apr 08 23:12:03 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -213,7 +213,8 @@ { StringWriter bs; - MarshalOutputStream s = new EncapsOutputStream(factory); + MarshalOutputStream s = + sun.corba.OutputStreamFactory.newEncapsOutputStream(factory); s.putEndian(); write( (OutputStream)s ); bs = new StringWriter(); @@ -237,7 +238,8 @@ } public org.omg.IOP.IOR getIOPIOR() { - EncapsOutputStream os = new EncapsOutputStream(factory); + EncapsOutputStream os = + sun.corba.OutputStreamFactory.newEncapsOutputStream(factory); write(os); InputStream is = (InputStream) (os.create_input_stream()); return org.omg.IOP.IORHelper.read(is); diff -r d483d101f145 -r 8e581b671511 src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java --- a/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java Wed May 22 17:42:08 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java Mon Apr 08 23:12:03 2013 +0100 @@ -87,7 +87,8 @@ public byte[] getBytes( org.omg.CORBA.ORB orb ) { - EncapsOutputStream os = new EncapsOutputStream( (ORB)orb ) ; + EncapsOutputStream os = + sun.corba.OutputStreamFactory.newEncapsOutputStream((ORB)orb); write( os ) ; return os.toByteArray() ; } diff -r d483d101f145 -r 8e581b671511 src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java --- a/src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java Wed May 22 17:42:08 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java Mon Apr 08 23:12:03 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -61,7 +61,8 @@ public TaggedComponent create( org.omg.CORBA.ORB orb, org.omg.IOP.TaggedComponent comp ) { - EncapsOutputStream os = new EncapsOutputStream( (ORB)orb ) ; + EncapsOutputStream os = + sun.corba.OutputStreamFactory.newEncapsOutputStream((ORB)orb); org.omg.IOP.TaggedComponentHelper.write( os, comp ) ; InputStream is = (InputStream)(os.create_input_stream() ) ; // Skip the component ID: we just wrote it out above diff -r d483d101f145 -r 8e581b671511 src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java --- a/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java Wed May 22 17:42:08 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java Mon Apr 08 23:12:03 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -247,7 +247,8 @@ public org.omg.IOP.TaggedProfile getIOPProfile() { - EncapsOutputStream os = new EncapsOutputStream( orb ) ; + EncapsOutputStream os = + sun.corba.OutputStreamFactory.newEncapsOutputStream(orb); os.write_long( getId() ) ; write( os ) ; InputStream is = (InputStream)(os.create_input_stream()) ; diff -r d483d101f145 -r 8e581b671511 src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java --- a/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java Wed May 22 17:42:08 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java Mon Apr 08 23:12:03 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -132,8 +132,9 @@ // Note that this cannot be accomplished with a codec! // Use the byte order of the given stream - OutputStream encapsulatedOS = new EncapsOutputStream( (ORB)os.orb(), - ((CDROutputStream)os).isLittleEndian() ) ; + OutputStream encapsulatedOS = + sun.corba.OutputStreamFactory.newEncapsOutputStream( + (ORB)os.orb(), ((CDROutputStream)os).isLittleEndian() ) ; okeyTemplate.write( id, encapsulatedOS ) ; EncapsulationUtility.writeOutputStream( encapsulatedOS, os ) ; diff -r d483d101f145 -r 8e581b671511 src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java --- a/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java Wed May 22 17:42:08 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java Mon Apr 08 23:12:03 2013 +0100 @@ -1,5 +1,5 @@ From andrew at icedtea.classpath.org Tue Jun 18 14:19:51 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 18 Jun 2013 21:19:51 +0000 Subject: /hg/release/icedtea7-forest-2.3/jaxws: 8009008: Better manage ma... Message-ID: changeset c0e829bfbf62 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=c0e829bfbf62 author: mkos date: Thu Mar 21 11:08:05 2013 -0400 8009008: Better manage management-api Summary: Preventing management-api methods from invoking reflection on inappropriate methods; fix reviewed also by Alexander Fomin Reviewed-by: mullan, skoivu diffstat: src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java | 6 ++-- src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java | 6 ++-- src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java | 6 ++-- src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java | 6 ++-- src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java | 6 ++-- src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java | 15 ++++++++-- src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java | 5 ++- src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java | 6 ++-- 8 files changed, 33 insertions(+), 23 deletions(-) diffs (272 lines): diff -r 462c087afa98 -r c0e829bfbf62 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java Wed May 22 17:42:07 2013 +0100 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java Thu Mar 21 11:08:05 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,6 @@ package com.sun.org.glassfish.external.statistics.impl; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; import com.sun.org.glassfish.external.statistics.AverageRangeStatistic; @@ -139,6 +138,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + checkMethod(method); + Object result; try { result = method.invoke(this, args); @@ -147,7 +148,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 462c087afa98 -r c0e829bfbf62 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java Wed May 22 17:42:07 2013 +0100 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java Thu Mar 21 11:08:05 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.BoundaryStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -81,6 +80,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -89,7 +90,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 462c087afa98 -r c0e829bfbf62 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java Wed May 22 17:42:07 2013 +0100 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java Thu Mar 21 11:08:05 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.BoundedRangeStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -145,6 +144,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -153,7 +154,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 462c087afa98 -r c0e829bfbf62 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java Wed May 22 17:42:07 2013 +0100 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java Thu Mar 21 11:08:05 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.CountStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -103,6 +102,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -111,7 +112,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 462c087afa98 -r c0e829bfbf62 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java Wed May 22 17:42:07 2013 +0100 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java Thu Mar 21 11:08:05 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.RangeStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -125,6 +124,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -133,7 +134,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 462c087afa98 -r c0e829bfbf62 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java Wed May 22 17:42:07 2013 +0100 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java Thu Mar 21 11:08:05 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,8 +26,8 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.Statistic; -import java.io.Serializable; -import java.util.concurrent.atomic.AtomicLong; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -133,4 +133,13 @@ protected static boolean isValidString(String str) { return (str!=null && str.length()>0); } + + protected void checkMethod(Method method) { + if (method == null || method.getDeclaringClass() == null + || !Statistic.class.isAssignableFrom(method.getDeclaringClass()) + || Modifier.isStatic(method.getModifiers())) { + throw new RuntimeException("Invalid method on invoke"); + } + } + } diff -r 462c087afa98 -r c0e829bfbf62 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java Wed May 22 17:42:07 2013 +0100 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java Thu Mar 21 11:08:05 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -90,6 +90,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -98,7 +100,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } diff -r 462c087afa98 -r c0e829bfbf62 src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java --- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java Wed May 22 17:42:07 2013 +0100 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java Thu Mar 21 11:08:05 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,7 +28,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.TimeStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -145,6 +144,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -153,7 +154,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; } From andrew at icedtea.classpath.org Tue Jun 18 14:19:57 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 18 Jun 2013 21:19:57 +0000 Subject: /hg/release/icedtea7-forest-2.3/langtools: 2 new changesets Message-ID: changeset b8e6b819473b in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=b8e6b819473b author: bpatel date: Fri Apr 26 15:24:12 2013 -0700 8012375: Improve Javadoc framing Reviewed-by: mduigou, jlaskey changeset 8cf15d334ad3 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=8cf15d334ad3 author: bpatel date: Wed Jun 05 14:31:54 2013 -0700 8015997: Additional improvement in Javadoc framing Reviewed-by: jjg diffstat: src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java | 38 +++++++++- 1 files changed, 36 insertions(+), 2 deletions(-) diffs (54 lines): diff -r 2791ba417e96 -r 8cf15d334ad3 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Wed May 22 17:42:04 2013 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Wed Jun 05 14:31:54 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -312,8 +312,42 @@ String scriptCode = DocletConstants.NL + " targetPage = \"\" + window.location.search;" + DocletConstants.NL + " if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL + " targetPage = targetPage.substring(1);" + DocletConstants.NL + - " if (targetPage.indexOf(\":\") != -1)" + DocletConstants.NL + + " if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + DocletConstants.NL + " targetPage = \"undefined\";" + DocletConstants.NL + + " function validURL(url) {" + DocletConstants.NL + + " var pos = url.indexOf(\".html\");" + DocletConstants.NL + + " if (pos == -1 || pos != url.length - 5)" + DocletConstants.NL + + " return false;" + DocletConstants.NL + + " var allowNumber = false;" + DocletConstants.NL + + " var allowSep = false;" + DocletConstants.NL + + " var seenDot = false;" + DocletConstants.NL + + " for (var i = 0; i < url.length - 5; i++) {" + DocletConstants.NL + + " var ch = url.charAt(i);" + DocletConstants.NL + + " if ('a' <= ch && ch <= 'z' ||" + DocletConstants.NL + + " 'A' <= ch && ch <= 'Z' ||" + DocletConstants.NL + + " ch == '$' ||" + DocletConstants.NL + + " ch == '_') {" + DocletConstants.NL + + " allowNumber = true;" + DocletConstants.NL + + " allowSep = true;" + DocletConstants.NL + + " } else if ('0' <= ch && ch <= '9'" + DocletConstants.NL + + " || ch == '-') {" + DocletConstants.NL + + " if (!allowNumber)" + DocletConstants.NL + + " return false;" + DocletConstants.NL + + " } else if (ch == '/' || ch == '.') {" + DocletConstants.NL + + " if (!allowSep)" + DocletConstants.NL + + " return false;" + DocletConstants.NL + + " allowNumber = false;" + DocletConstants.NL + + " allowSep = false;" + DocletConstants.NL + + " if (ch == '.')" + DocletConstants.NL + + " seenDot = true;" + DocletConstants.NL + + " if (ch == '/' && seenDot)" + DocletConstants.NL + + " return false;" + DocletConstants.NL + + " } else {" + DocletConstants.NL + + " return false;"+ DocletConstants.NL + + " }" + DocletConstants.NL + + " }" + DocletConstants.NL + + " return true;" + DocletConstants.NL + + " }" + DocletConstants.NL + " function loadFrames() {" + DocletConstants.NL + " if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL + " top.classFrame.location = top.targetPage;" + DocletConstants.NL + From andrew at icedtea.classpath.org Tue Jun 18 14:20:04 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 18 Jun 2013 21:20:04 +0000 Subject: /hg/release/icedtea7-forest-2.3/hotspot: 2 new changesets Message-ID: changeset 6d638d1ecd61 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=6d638d1ecd61 author: hseigel date: Tue Mar 12 16:23:30 2013 -0400 7158805: Better rewriting of nested subroutine calls Reviewed-by: mschoene, coleenp changeset 4e374ade4066 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=4e374ade4066 author: mullan date: Fri Apr 05 08:36:12 2013 -0400 8001330: Improve on checking order Reviewed-by: acorn, hawtin diffstat: src/share/vm/classfile/javaClasses.cpp | 28 +++++++++- src/share/vm/classfile/javaClasses.hpp | 11 +++- src/share/vm/classfile/vmSymbols.hpp | 4 +- src/share/vm/memory/allocation.cpp | 43 +++++++++------ src/share/vm/memory/allocation.hpp | 63 ++++++++++++++++------ src/share/vm/memory/allocation.inline.hpp | 14 +++- src/share/vm/memory/resourceArea.cpp | 15 ++-- src/share/vm/memory/resourceArea.hpp | 6 +- src/share/vm/memory/universe.cpp | 23 ++++++++- src/share/vm/memory/universe.hpp | 4 +- src/share/vm/oops/generateOopMap.cpp | 21 +++++-- src/share/vm/prims/jvm.cpp | 85 ++++++++++++++++++++++++++++-- 12 files changed, 247 insertions(+), 70 deletions(-) diffs (truncated from 824 to 500 lines): diff -r 85d97ab28295 -r 4e374ade4066 src/share/vm/classfile/javaClasses.cpp --- a/src/share/vm/classfile/javaClasses.cpp Wed May 22 17:42:03 2013 +0100 +++ b/src/share/vm/classfile/javaClasses.cpp Fri Apr 05 08:36:12 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -2757,6 +2757,7 @@ int java_security_AccessControlContext::_context_offset = 0; int java_security_AccessControlContext::_privilegedContext_offset = 0; int java_security_AccessControlContext::_isPrivileged_offset = 0; +int java_security_AccessControlContext::_isAuthorized_offset = -1; void java_security_AccessControlContext::compute_offsets() { assert(_isPrivileged_offset == 0, "offsets should be initialized only once"); @@ -2777,9 +2778,20 @@ fatal("Invalid layout of java.security.AccessControlContext"); } _isPrivileged_offset = fd.offset(); + + // The offset may not be present for bootstrapping with older JDK. + if (ik->find_local_field(vmSymbols::isAuthorized_name(), vmSymbols::bool_signature(), &fd)) { + _isAuthorized_offset = fd.offset(); + } } +bool java_security_AccessControlContext::is_authorized(Handle context) { + assert(context.not_null() && context->klass() == SystemDictionary::AccessControlContext_klass(), "Invalid type"); + assert(_isAuthorized_offset != -1, "should be set"); + return context->bool_field(_isAuthorized_offset) != 0; +} + oop java_security_AccessControlContext::create(objArrayHandle context, bool isPrivileged, Handle privileged_context, TRAPS) { assert(_isPrivileged_offset != 0, "offsets should have been initialized"); // Ensure klass is initialized @@ -2790,6 +2802,8 @@ result->obj_field_put(_context_offset, context()); result->obj_field_put(_privilegedContext_offset, privileged_context()); result->bool_field_put(_isPrivileged_offset, isPrivileged); + // whitelist AccessControlContexts created by the JVM. + result->bool_field_put(_isAuthorized_offset, true); return result; } @@ -2870,6 +2884,15 @@ } +bool java_lang_System::has_security_manager() { + instanceKlass* ik = instanceKlass::cast(SystemDictionary::System_klass()); + address addr = ik->static_field_addr(static_security_offset); + if (UseCompressedOops) { + return oopDesc::load_decode_heap_oop((narrowOop *)addr) != NULL; + } else { + return oopDesc::load_decode_heap_oop((oop*)addr) != NULL; + } +} int java_lang_Class::_klass_offset; int java_lang_Class::_array_klass_offset; @@ -2923,6 +2946,7 @@ int java_lang_System::static_in_offset; int java_lang_System::static_out_offset; int java_lang_System::static_err_offset; +int java_lang_System::static_security_offset; int java_lang_StackTraceElement::declaringClass_offset; int java_lang_StackTraceElement::methodName_offset; int java_lang_StackTraceElement::fileName_offset; @@ -3064,6 +3088,7 @@ java_lang_System::static_in_offset = java_lang_System::hc_static_in_offset * x; java_lang_System::static_out_offset = java_lang_System::hc_static_out_offset * x; java_lang_System::static_err_offset = java_lang_System::hc_static_err_offset * x; + java_lang_System::static_security_offset = java_lang_System::hc_static_security_offset * x; // java_lang_StackTraceElement java_lang_StackTraceElement::declaringClass_offset = java_lang_StackTraceElement::hc_declaringClass_offset * x + header; @@ -3266,6 +3291,7 @@ CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, in, "Ljava/io/InputStream;"); CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, out, "Ljava/io/PrintStream;"); CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, err, "Ljava/io/PrintStream;"); + CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, security, "Ljava/lang/SecurityManager;"); // java.lang.StackTraceElement diff -r 85d97ab28295 -r 4e374ade4066 src/share/vm/classfile/javaClasses.hpp --- a/src/share/vm/classfile/javaClasses.hpp Wed May 22 17:42:03 2013 +0100 +++ b/src/share/vm/classfile/javaClasses.hpp Fri Apr 05 08:36:12 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1249,11 +1249,14 @@ static int _context_offset; static int _privilegedContext_offset; static int _isPrivileged_offset; + static int _isAuthorized_offset; static void compute_offsets(); public: static oop create(objArrayHandle context, bool isPrivileged, Handle privileged_context, TRAPS); + static bool is_authorized(Handle context); + // Debugging/initialization friend class JavaClasses; }; @@ -1296,18 +1299,22 @@ enum { hc_static_in_offset = 0, hc_static_out_offset = 1, - hc_static_err_offset = 2 + hc_static_err_offset = 2, + hc_static_security_offset = 3 }; static int static_in_offset; static int static_out_offset; static int static_err_offset; + static int static_security_offset; public: static int in_offset_in_bytes(); static int out_offset_in_bytes(); static int err_offset_in_bytes(); + static bool has_security_manager(); + // Debugging friend class JavaClasses; }; diff -r 85d97ab28295 -r 4e374ade4066 src/share/vm/classfile/vmSymbols.hpp --- a/src/share/vm/classfile/vmSymbols.hpp Wed May 22 17:42:03 2013 +0100 +++ b/src/share/vm/classfile/vmSymbols.hpp Fri Apr 05 08:36:12 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -91,6 +91,7 @@ template(java_lang_CharSequence, "java/lang/CharSequence") \ template(java_security_AccessControlContext, "java/security/AccessControlContext") \ template(java_security_ProtectionDomain, "java/security/ProtectionDomain") \ + template(impliesCreateAccessControlContext_name, "impliesCreateAccessControlContext") \ template(java_io_OutputStream, "java/io/OutputStream") \ template(java_io_Reader, "java/io/Reader") \ template(java_io_BufferedReader, "java/io/BufferedReader") \ @@ -324,6 +325,7 @@ template(contextClassLoader_name, "contextClassLoader") \ template(inheritedAccessControlContext_name, "inheritedAccessControlContext") \ template(isPrivileged_name, "isPrivileged") \ + template(isAuthorized_name, "isAuthorized") \ template(wait_name, "wait") \ template(checkPackageAccess_name, "checkPackageAccess") \ template(stackSize_name, "stackSize") \ diff -r 85d97ab28295 -r 4e374ade4066 src/share/vm/memory/allocation.cpp --- a/src/share/vm/memory/allocation.cpp Wed May 22 17:42:03 2013 +0100 +++ b/src/share/vm/memory/allocation.cpp Fri Apr 05 08:36:12 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -210,7 +210,7 @@ ChunkPool(size_t size) : _size(size) { _first = NULL; _num_chunks = _num_used = 0; } // Allocate a new chunk from the pool (might expand the pool) - void* allocate(size_t bytes) { + void* allocate(size_t bytes, AllocFailType alloc_failmode) { assert(bytes == _size, "bad size"); void* p = NULL; { ThreadCritical tc; @@ -218,9 +218,9 @@ p = get_first(); if (p == NULL) p = os::malloc(bytes); } - if (p == NULL) + if (p == NULL && alloc_failmode == AllocFailStrategy::EXIT_OOM) { vm_exit_out_of_memory(bytes, "ChunkPool::allocate"); - + } return p; } @@ -311,7 +311,7 @@ //-------------------------------------------------------------------------------------- // Chunk implementation -void* Chunk::operator new(size_t requested_size, size_t length) { +void* Chunk::operator new(size_t requested_size, AllocFailType alloc_failmode, size_t length) { // requested_size is equal to sizeof(Chunk) but in order for the arena // allocations to come out aligned as expected the size must be aligned // to expected arean alignment. @@ -319,13 +319,14 @@ assert(ARENA_ALIGN(requested_size) == aligned_overhead_size(), "Bad alignment"); size_t bytes = ARENA_ALIGN(requested_size) + length; switch (length) { - case Chunk::size: return ChunkPool::large_pool()->allocate(bytes); - case Chunk::medium_size: return ChunkPool::medium_pool()->allocate(bytes); - case Chunk::init_size: return ChunkPool::small_pool()->allocate(bytes); + case Chunk::size: return ChunkPool::large_pool()->allocate(bytes, alloc_failmode); + case Chunk::medium_size: return ChunkPool::medium_pool()->allocate(bytes, alloc_failmode); + case Chunk::init_size: return ChunkPool::small_pool()->allocate(bytes, alloc_failmode); default: { - void *p = os::malloc(bytes); - if (p == NULL) + void* p = os::malloc(bytes); + if (p == NULL && alloc_failmode == AllocFailStrategy::EXIT_OOM) { vm_exit_out_of_memory(bytes, "Chunk::new"); + } return p; } } @@ -378,14 +379,14 @@ Arena::Arena(size_t init_size) { size_t round_size = (sizeof (char *)) - 1; init_size = (init_size+round_size) & ~round_size; - _first = _chunk = new (init_size) Chunk(init_size); + _first = _chunk = new (AllocFailStrategy::EXIT_OOM, init_size) Chunk(init_size); _hwm = _chunk->bottom(); // Save the cached hwm, max _max = _chunk->top(); set_size_in_bytes(init_size); } Arena::Arena() { - _first = _chunk = new (Chunk::init_size) Chunk(Chunk::init_size); + _first = _chunk = new (AllocFailStrategy::EXIT_OOM, Chunk::init_size) Chunk(Chunk::init_size); _hwm = _chunk->bottom(); // Save the cached hwm, max _max = _chunk->top(); set_size_in_bytes(Chunk::init_size); @@ -438,15 +439,15 @@ } // Grow a new Chunk -void* Arena::grow( size_t x ) { +void* Arena::grow(size_t x, AllocFailType alloc_failmode) { // Get minimal required size. Either real big, or even bigger for giant objs size_t len = MAX2(x, (size_t) Chunk::size); Chunk *k = _chunk; // Get filled-up chunk address - _chunk = new (len) Chunk(len); + _chunk = new (alloc_failmode, len) Chunk(len); if (_chunk == NULL) { - signal_out_of_memory(len * Chunk::aligned_overhead_size(), "Arena::grow"); + return NULL; } if (k) k->set_next(_chunk); // Append new chunk to end of linked list @@ -462,13 +463,16 @@ // Reallocate storage in Arena. -void *Arena::Arealloc(void* old_ptr, size_t old_size, size_t new_size) { +void *Arena::Arealloc(void* old_ptr, size_t old_size, size_t new_size, AllocFailType alloc_failmode) { assert(new_size >= 0, "bad size"); if (new_size == 0) return NULL; #ifdef ASSERT if (UseMallocOnly) { // always allocate a new object (otherwise we'll free this one twice) - char* copy = (char*)Amalloc(new_size); + char* copy = (char*)Amalloc(new_size, alloc_failmode); + if (copy == NULL) { + return NULL; + } size_t n = MIN2(old_size, new_size); if (n > 0) memcpy(copy, old_ptr, n); Afree(old_ptr,old_size); // Mostly done to keep stats accurate @@ -494,7 +498,10 @@ } // Oops, got to relocate guts - void *new_ptr = Amalloc(new_size); + void *new_ptr = Amalloc(new_size, alloc_failmode); + if (new_ptr == NULL) { + return NULL; + } memcpy( new_ptr, c_old, old_size ); Afree(c_old,old_size); // Mostly done to keep stats accurate return new_ptr; diff -r 85d97ab28295 -r 4e374ade4066 src/share/vm/memory/allocation.hpp --- a/src/share/vm/memory/allocation.hpp Wed May 22 17:42:03 2013 +0100 +++ b/src/share/vm/memory/allocation.hpp Fri Apr 05 08:36:12 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,6 +40,12 @@ #define ARENA_ALIGN_MASK (~((size_t)ARENA_ALIGN_M1)) #define ARENA_ALIGN(x) ((((size_t)(x)) + ARENA_ALIGN_M1) & ARENA_ALIGN_MASK) +class AllocFailStrategy { +public: + enum AllocFailEnum { EXIT_OOM, RETURN_NULL }; +}; +typedef AllocFailStrategy::AllocFailEnum AllocFailType; + // All classes in the virtual machine must be subclassed // by one of the following allocation classes: // @@ -157,7 +163,7 @@ Chunk* _next; // Next Chunk in list const size_t _len; // Size of this Chunk public: - void* operator new(size_t size, size_t length); + void* operator new(size_t size, AllocFailType alloc_failmode, size_t length); void operator delete(void* p); Chunk(size_t length); @@ -207,7 +213,8 @@ Chunk *_first; // First chunk Chunk *_chunk; // current chunk char *_hwm, *_max; // High water mark and max in current chunk - void* grow(size_t x); // Get a new Chunk of at least size x + // Get a new Chunk of at least size x + void* grow(size_t x, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM); NOT_PRODUCT(size_t _size_in_bytes;) // Size of arena (used for memory usage tracing) NOT_PRODUCT(static julong _bytes_allocated;) // total #bytes allocated since start friend class AllocStats; @@ -217,10 +224,15 @@ void signal_out_of_memory(size_t request, const char* whence) const; - void check_for_overflow(size_t request, const char* whence) const { + bool check_for_overflow(size_t request, const char* whence, + AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) const { if (UINTPTR_MAX - request < (uintptr_t)_hwm) { + if (alloc_failmode == AllocFailStrategy::RETURN_NULL) { + return false; + } signal_out_of_memory(request, whence); } + return true; } public: @@ -232,14 +244,15 @@ char* hwm() const { return _hwm; } // Fast allocate in the arena. Common case is: pointer test + increment. - void* Amalloc(size_t x) { + void* Amalloc(size_t x, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) { assert(is_power_of_2(ARENA_AMALLOC_ALIGNMENT) , "should be a power of 2"); x = ARENA_ALIGN(x); debug_only(if (UseMallocOnly) return malloc(x);) - check_for_overflow(x, "Arena::Amalloc"); + if (!check_for_overflow(x, "Arena::Amalloc", alloc_failmode)) + return NULL; NOT_PRODUCT(inc_bytes_allocated(x);) if (_hwm + x > _max) { - return grow(x); + return grow(x, alloc_failmode); } else { char *old = _hwm; _hwm += x; @@ -247,13 +260,14 @@ } } // Further assume size is padded out to words - void *Amalloc_4(size_t x) { + void *Amalloc_4(size_t x, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) { assert( (x&(sizeof(char*)-1)) == 0, "misaligned size" ); debug_only(if (UseMallocOnly) return malloc(x);) - check_for_overflow(x, "Arena::Amalloc_4"); + if (!check_for_overflow(x, "Arena::Amalloc_4", alloc_failmode)) + return NULL; NOT_PRODUCT(inc_bytes_allocated(x);) if (_hwm + x > _max) { - return grow(x); + return grow(x, alloc_failmode); } else { char *old = _hwm; _hwm += x; @@ -263,7 +277,7 @@ // Allocate with 'double' alignment. It is 8 bytes on sparc. // In other cases Amalloc_D() should be the same as Amalloc_4(). - void* Amalloc_D(size_t x) { + void* Amalloc_D(size_t x, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) { assert( (x&(sizeof(char*)-1)) == 0, "misaligned size" ); debug_only(if (UseMallocOnly) return malloc(x);) #if defined(SPARC) && !defined(_LP64) @@ -271,10 +285,11 @@ size_t delta = (((size_t)_hwm + DALIGN_M1) & ~DALIGN_M1) - (size_t)_hwm; x += delta; #endif - check_for_overflow(x, "Arena::Amalloc_D"); + if (!check_for_overflow(x, "Arena::Amalloc_D", alloc_failmode)) + return NULL; NOT_PRODUCT(inc_bytes_allocated(x);) if (_hwm + x > _max) { - return grow(x); // grow() returns a result aligned >= 8 bytes. + return grow(x, alloc_failmode); // grow() returns a result aligned >= 8 bytes. } else { char *old = _hwm; _hwm += x; @@ -294,7 +309,8 @@ if (((char*)ptr) + size == _hwm) _hwm = (char*)ptr; } - void *Arealloc( void *old_ptr, size_t old_size, size_t new_size ); + void *Arealloc( void *old_ptr, size_t old_size, size_t new_size, + AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM); // Move contents of this arena into an empty arena Arena *move_contents(Arena *empty_arena); @@ -336,9 +352,12 @@ //%note allocation_1 -extern char* resource_allocate_bytes(size_t size); -extern char* resource_allocate_bytes(Thread* thread, size_t size); -extern char* resource_reallocate_bytes( char *old, size_t old_size, size_t new_size); +extern char* resource_allocate_bytes(size_t size, + AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM); +extern char* resource_allocate_bytes(Thread* thread, size_t size, + AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM); +extern char* resource_reallocate_bytes( char *old, size_t old_size, size_t new_size, + AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM); extern void resource_free_bytes( char *old, size_t size ); //---------------------------------------------------------------------- @@ -384,6 +403,13 @@ DEBUG_ONLY(set_allocation_type(res, RESOURCE_AREA);) return res; } + + void* operator new(size_t size, const std::nothrow_t& nothrow_constant) { + address res = (address)resource_allocate_bytes(size, AllocFailStrategy::RETURN_NULL); + DEBUG_ONLY(if (res != NULL) set_allocation_type(res, RESOURCE_AREA);) + return res; + } + void operator delete(void* p); }; @@ -394,6 +420,9 @@ #define NEW_RESOURCE_ARRAY(type, size)\ (type*) resource_allocate_bytes((size) * sizeof(type)) +#define NEW_RESOURCE_ARRAY_RETURN_NULL(type, size)\ + (type*) resource_allocate_bytes((size) * sizeof(type), AllocFailStrategy::RETURN_NULL) + #define NEW_RESOURCE_ARRAY_IN_THREAD(thread, type, size)\ (type*) resource_allocate_bytes(thread, (size) * sizeof(type)) diff -r 85d97ab28295 -r 4e374ade4066 src/share/vm/memory/allocation.inline.hpp --- a/src/share/vm/memory/allocation.inline.hpp Wed May 22 17:42:03 2013 +0100 +++ b/src/share/vm/memory/allocation.inline.hpp Fri Apr 05 08:36:12 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -48,25 +48,29 @@ #endif // allocate using malloc; will fail if no memory available -inline char* AllocateHeap(size_t size, const char* name = NULL) { +inline char* AllocateHeap(size_t size, const char* name = NULL, + AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) { char* p = (char*) os::malloc(size); #ifdef ASSERT if (PrintMallocFree) trace_heap_malloc(size, name, p); #else Unused_Variable(name); #endif - if (p == NULL) vm_exit_out_of_memory(size, name); + if (p == NULL && alloc_failmode == AllocFailStrategy::EXIT_OOM) + vm_exit_out_of_memory(size, "AllocateHeap"); return p; } -inline char* ReallocateHeap(char *old, size_t size, const char* name = NULL) { +inline char* ReallocateHeap(char *old, size_t size, const char* name = NULL, + AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) { char* p = (char*) os::realloc(old,size); #ifdef ASSERT if (PrintMallocFree) trace_heap_malloc(size, name, p); #else Unused_Variable(name); #endif - if (p == NULL) vm_exit_out_of_memory(size, name); + if (p == NULL && alloc_failmode == AllocFailStrategy::EXIT_OOM) + vm_exit_out_of_memory(size, "ReallocateHeap"); From andrew at icedtea.classpath.org Tue Jun 18 14:20:18 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 18 Jun 2013 21:20:18 +0000 Subject: /hg/release/icedtea7-forest-2.3/jdk: 67 new changesets Message-ID: changeset e72b041a1a9a in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=e72b041a1a9a author: andrew date: Tue Jun 11 11:29:06 2013 +0100 6741606: Integrate Apache Santuario Reviewed-by: vinnie, hawtin changeset 0cf22a1abd4a in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=0cf22a1abd4a author: khazra date: Thu Mar 14 13:54:32 2013 -0700 7170730: Improve Windows network stack support. Summary: Enable exclusive binding of ports on Windows Reviewed-by: alanb, chegar, ahgross changeset 7ff337cd8647 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=7ff337cd8647 author: dmocek date: Mon Mar 04 14:34:15 2013 -0800 8000638: Improve deserialization Reviewed-by: smarks, hawtin, mchung changeset 92be319dfe2e in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=92be319dfe2e author: andrew date: Tue Jun 11 11:49:24 2013 +0100 8001032: Restrict object access Summary: Restrict object access; fix reviewed also by Alexander Fomin Reviewed-by: alanb, ahgross changeset 2747ba3ca083 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=2747ba3ca083 author: dmocek date: Wed Mar 13 17:24:34 2013 -0700 8001033: Refactor network address handling in virtual machine identifiers Reviewed-by: smarks, hawtin, mchung changeset f6cc38031358 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=f6cc38031358 author: bae date: Wed Feb 27 11:53:10 2013 +0400 8001034: Memory management improvements Reviewed-by: prr, jgodinez changeset 760639ff8f79 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=760639ff8f79 author: bae date: Thu Mar 28 22:17:04 2013 +0400 8001038: Resourcefully handle resources Reviewed-by: mschoene, prr, bae Contributed-by: jia-hong.chen at oracle.com changeset bc3447cf7585 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=bc3447cf7585 author: dfuchs date: Fri Mar 15 17:59:10 2013 +0100 8001043: Clarify definition restrictions Reviewed-by: alanb, skoivu, smarks changeset f30c9b4a4b83 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=f30c9b4a4b83 author: andrew date: Tue Jun 11 12:35:34 2013 +0100 8001308: Update display of applet windows Summary: Implemented security warning for OS X port Reviewed-by: art, anthony, serb, skoivu changeset 077f9c7597a7 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=077f9c7597a7 author: dmeetry date: Mon Mar 25 12:41:55 2013 +0400 8001309: Better handling of annotation interfaces Reviewed-by: darcy changeset 15a8c0b76e4a in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=15a8c0b76e4a author: khazra date: Thu Mar 28 14:59:22 2013 -0700 8001318: Socket.getLocalAddress not consistent with InetAddress.getLocalHost Reviewed-by: alanb, chegar, hawtin changeset 547f837cc2b7 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=547f837cc2b7 author: mullan date: Fri Apr 05 08:33:25 2013 -0400 8001330: Improve on checking order Reviewed-by: acorn, hawtin changeset 9e7b6601a293 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=9e7b6601a293 author: sla date: Mon Mar 18 15:22:51 2013 +0100 8003703: Update RMI connection dialog box Reviewed-by: skoivu, ahgross, mchung, jbachorik changeset e06fa7741865 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=e06fa7741865 author: alanb date: Wed Feb 27 11:50:30 2013 +0000 8004288: (fs) Files.probeContentType problems Reviewed-by: ahgross, sherman changeset 83d33707b20b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=83d33707b20b author: leonidr date: Tue Mar 19 21:13:09 2013 +0400 8004584: Augment applet contextualization Summary: Do not create the main AppContext for applets Reviewed-by: art, ahgross changeset 44a497fba2d7 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=44a497fba2d7 author: prr date: Sun Mar 31 09:05:58 2013 -0700 8005007: Better glyph processing Reviewed-by: srl, mschoene, bae changeset 1ca52c301b4f in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=1ca52c301b4f author: serb date: Sat Mar 30 22:45:54 2013 +0400 8006328: Improve robustness of sound classes 8009057: Improve MIDI event handling Reviewed-by: amenkov, art, skoivu changeset 16fd1193774e in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=16fd1193774e author: sundar date: Fri Apr 05 15:39:25 2013 +0530 8006611: Improve scripting Reviewed-by: mchung, jdn changeset 7e29566afbf8 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=7e29566afbf8 author: sjiang date: Tue Mar 19 18:45:19 2013 +0100 8007467: Improve robustness of JMX internal APIs Reviewed-by: dfuchs, mchung, skoivu changeset 128526431ace in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=128526431ace author: dsamersoff date: Thu Mar 21 22:32:42 2013 +0400 8007471: Improve MBean notifications Summary: Improve MBean notifications Reviewed-by: dfuchs, mchung, alanb, skoivu changeset 50f222599af3 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=50f222599af3 author: jfranck date: Mon Mar 25 20:18:21 2013 +0100 8007812: (reflect) Class.getEnclosingMethod problematic for some classes Summary: Better checking in getEnclosing(Method|Constructor|Class) Reviewed-by: darcy, ahgross, mchung changeset f5b9e9610a23 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=f5b9e9610a23 author: bae date: Thu Mar 28 23:01:08 2013 +0400 8007925: Improve cmsStageAllocLabV2ToV4curves 8007926: Improve cmsPipelineDup Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset 815e96cb7737 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=815e96cb7737 author: bae date: Thu Mar 21 11:52:10 2013 +0400 8007927: Improve cmsAllocProfileSequenceDescription Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset 748d7ea64b57 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=748d7ea64b57 author: bae date: Thu Mar 21 12:02:04 2013 +0400 8007929: Improve CurvesAlloc Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset c75b3b62fa54 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=c75b3b62fa54 author: dsamersoff date: Wed Mar 27 14:32:58 2013 +0400 8008120: Improve JMX class checking Summary: Improve JMX class checking Reviewed-by: mchung, dfuchs, alanb, skoivu changeset 21f80647e855 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=21f80647e855 author: dsamersoff date: Thu Mar 28 23:39:28 2013 +0400 8008124: Better compliance testing Summary: Better compliance testing Reviewed-by: dfuchs, jfdenise, skoivu, alanb changeset cfea369460b9 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=cfea369460b9 author: andrew date: Tue Jun 11 13:13:12 2013 +0100 8008128: Better API coherence for JMX Summary: Permission for getting classloader Reviewed-by: alanb, dfuchs, skoivu Contributed-by: jean-francois.denise at oracle.com changeset be39bda4ecd8 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=be39bda4ecd8 author: smarks date: Mon Mar 25 17:05:30 2013 +0000 8008132: Better serialization support Reviewed-by: alanb, hawtin changeset ad152cb203a3 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ad152cb203a3 author: jbachorik date: Thu Mar 14 14:42:12 2013 +0100 8008585: Better JMX data handling Reviewed-by: alanb, dfuchs, jfdenise, skoivu, sjiang changeset 73dc90c6ef7c in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=73dc90c6ef7c author: chegar date: Fri Apr 05 18:12:11 2013 +0100 8008593: Better URLClassLoader resource management Reviewed-by: alanb, sherman, hawtin changeset 70c33dc7db09 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=70c33dc7db09 author: jbachorik date: Thu Mar 07 14:05:05 2013 +0100 8008603: Improve provision of JMX providers Reviewed-by: alanb, dfuchs, jfdenise, skoivu changeset 0989f8abd6ed in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=0989f8abd6ed author: jbachorik date: Thu Mar 14 14:45:55 2013 +0100 8008607: Better input checking in JMX Reviewed-by: dfuchs, mchung, skoivu, sjiang changeset 0d86353934f6 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=0d86353934f6 author: egahlin date: Thu Mar 21 13:56:28 2013 +0100 8008611: Better handling of annotations in JMX Reviewed-by: skoivu, dholmes, jfdenise changeset ff3bf10c8a43 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ff3bf10c8a43 author: sjiang date: Thu Mar 21 18:27:25 2013 +0100 8008615: Improve robustness of JMX internal APIs Reviewed-by: dfuchs, skoivu, dholmes changeset 488e04402efa in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=488e04402efa author: jbachorik date: Thu Mar 21 09:26:55 2013 +0100 8008623: Better handling of MBeanServers Reviewed-by: dfuchs, dholmes, skoivu changeset 2495a9eb42f9 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=2495a9eb42f9 author: mullan date: Wed May 01 17:19:04 2013 -0400 8008744: Rework part of fix for JDK-6741606 Reviewed-by: xuelei, ahgross changeset a5178e78385d in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=a5178e78385d author: jbachorik date: Thu Mar 28 09:39:26 2013 +0100 8008982: Adjust JMX for underlying interface changes Reviewed-by: mchung, dholmes, dfuchs, skoivu changeset 3238f918721c in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=3238f918721c author: jfdenise date: Mon Mar 18 13:50:19 2013 +0100 8009004: Better implementation of RMI connections Summary: Better class handling. Reviewed-by: alanb, dfuchs, skoivu, jbachorik Contributed-by: jean-francois.denise at oracle.com changeset d51aeb6916dd in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=d51aeb6916dd author: bae date: Tue Mar 26 11:56:00 2013 +0400 8009013: Better handling of T2K glyphs Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset e66b5826882f in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=e66b5826882f author: jbachorik date: Tue Mar 12 11:09:37 2013 +0100 8009034: Improve resulting notifications in JMX Summary: Disallowing access to mutable shared arrays Reviewed-by: dfuchs, mchung, skoivu changeset d81236ee3e5c in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=d81236ee3e5c author: jbachorik date: Tue Mar 12 09:34:26 2013 +0100 8009038: Improve JMX notification support Summary: Disallowing access to mutable shared arrays Reviewed-by: dfuchs, mchung, skoivu changeset 07c2469dd443 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=07c2469dd443 author: vinnie date: Thu Mar 21 10:42:36 2013 +0000 8009067: Improve storing keys in KeyStore Reviewed-by: mullan, skoivu changeset 98bc478d6eae in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=98bc478d6eae author: andrew date: Tue Jun 11 13:24:21 2013 +0100 8009071: Improve shape handling Reviewed-by: art, mschoene changeset eac9b051c6c3 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=eac9b051c6c3 author: vinnie date: Mon Apr 08 21:17:57 2013 +0100 8009235: Improve handling of TSA data Reviewed-by: ahgross, mullan changeset b1b685bc347b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=b1b685bc347b author: andrew date: Tue Jun 11 14:33:09 2013 +0100 8009424: Adapt Nashorn to JSR-292 implementation change Reviewed-by: jrose, twisti, jdn, mchung changeset d7170d35b70b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=d7170d35b70b author: lancea date: Fri Mar 22 15:40:16 2013 -0400 8009554: Improve SerialJavaObject.getFields Reviewed-by: alanb, skoivu changeset 70d6fc463ac5 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=70d6fc463ac5 author: andrew date: Tue Jun 11 14:44:01 2013 +0100 8009654: Improve stability of cmsnamed Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset b02c906770f7 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=b02c906770f7 author: jbachorik date: Wed Mar 27 13:29:22 2013 +0100 8010209: Better provision of factories Reviewed-by: dcubed, ahgross changeset 63603ef5a5cf in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=63603ef5a5cf author: bae date: Tue Apr 09 15:03:29 2013 +0400 8011243: Improve ImagingLib Reviewed-by: mschoene, prr, vadim changeset f20573a061c1 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=f20573a061c1 author: prr date: Mon Apr 08 12:41:09 2013 -0700 8011248: Better Component Rasters Reviewed-by: bae, vadim, mschoene changeset 7f2aac0f69c4 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=7f2aac0f69c4 author: prr date: Mon Apr 08 12:46:20 2013 -0700 8011253: Better Short Component Rasters Reviewed-by: bae, vadim, mschoene changeset 979a2a491e57 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=979a2a491e57 author: prr date: Mon Apr 08 12:48:19 2013 -0700 8011257: Better Byte Component Rasters Reviewed-by: bae, vadim, mschoene changeset a81db963d00a in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=a81db963d00a author: mchung date: Fri Apr 05 08:43:00 2013 -0700 8011557: Improve reflection utility classes Reviewed-by: ahgross, alanb changeset d8e55eaa1909 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=d8e55eaa1909 author: prr date: Fri Apr 19 15:40:03 2013 -0700 8012421: Better positioning of PairPositioning Reviewed-by: srl, mschoene, vadim changeset f637fd9793b1 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=f637fd9793b1 author: bae date: Wed Apr 24 15:23:44 2013 +0400 8012438: Better image validation Reviewed-by: mschoene, prr, vadim changeset 656508f71824 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=656508f71824 author: bae date: Tue Apr 30 04:20:46 2013 +0400 8012597: Better image channel verification Reviewed-by: ahgross, vadim, prr changeset 40881a4dd6bf in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=40881a4dd6bf author: bae date: Fri Apr 26 09:30:54 2013 +0400 8012601: Better validation of image layouts Reviewed-by: mschoene, prr, vadim changeset 31492cb55734 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=31492cb55734 author: xuelei date: Mon May 13 18:30:45 2013 -0700 8014281: Better checking of XML signature Summary: also reviewed by Andrew Gross and Christophe Ravel Reviewed-by: mullan changeset 408176dd5225 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=408176dd5225 author: andrew date: Tue Jun 11 15:42:46 2013 +0100 8014618: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement Reviewed-by: xuelei Contributed-by: Pasi Eronen changeset 2f69fad72e22 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=2f69fad72e22 author: ksrini date: Thu Aug 16 08:29:30 2012 -0700 7151434: java -jar -XX crashes java launcher Reviewed-by: mchung, darcy, jjh, dholmes changeset 2b209fe2ce9f in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=2b209fe2ce9f author: andrew date: Tue Jun 11 15:54:31 2013 +0100 7142596: RMI JPRT tests are failing Summary: Changed RMI tests to use random port numbers for the RMI Registry and RMID so the tests can be run concurrently without test failures due to tests using the same port numbers. Reviewed-by: smarks, alanb Contributed-by: olivier.lagneau at oracle.com changeset fe8ec79d72d5 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=fe8ec79d72d5 author: andrew date: Fri Jun 14 10:05:04 2013 +0100 Handle NullPointerException in getNotificationInfo changeset e30979f00fa6 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=e30979f00fa6 author: andrew date: Tue Jun 18 06:01:18 2013 -0500 8010118: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive Reviewed-by: alanb, twisti, jrose, kvn changeset 220b1e3fd897 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=220b1e3fd897 author: andrew date: Tue Jun 18 06:29:00 2013 -0500 8009424: Adapt Nashorn to JSR-292 implementation change Reviewed-by: jrose, twisti, jdn, mchung changeset 4767d0a3126b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=4767d0a3126b author: andrew date: Tue Jun 18 07:39:35 2013 -0500 8002070: Remove the stack search for a resource bundle for Logger to use Summary: The fragile, vulnerable, stack crawling has been eliminated from findResourceBundle(String) Reviewed-by: mchung, alanb changeset 29886eb62f75 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=29886eb62f75 author: andrew date: Tue Jun 18 07:54:04 2013 -0500 Correct remaining merge issues from 8009424 changeset 3b50cd01c2d2 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=3b50cd01c2d2 author: andrew date: Tue Jun 18 14:04:33 2013 +0100 Add missing import statements from java.util.logging.Logger diffstat: make/java/java/FILES_c.gmk | 2 - make/java/java/mapfile-vers | 3 - make/java/java/reorder-i586 | 1 - make/java/java/reorder-sparc | 1 - make/java/java/reorder-sparcv9 | 1 - make/java/nio/mapfile-bsd | 1 + make/java/nio/mapfile-linux | 1 + make/java/nio/mapfile-solaris | 1 + make/java/zip/mapfile-vers | 1 + make/java/zip/reorder-i586 | 1 + make/java/zip/reorder-sparc | 1 + make/java/zip/reorder-sparcv9 | 1 + make/sun/awt/Makefile | 81 +- make/sun/awt/ToBin.java | 59 + make/sun/xawt/Makefile | 67 +- make/sun/xawt/ToBin.java | 59 - src/macosx/classes/sun/java2d/opengl/CGLLayer.java | 8 +- src/macosx/classes/sun/lwawt/LWKeyboardFocusManagerPeer.java | 19 +- src/macosx/classes/sun/lwawt/LWToolkit.java | 2 + src/macosx/classes/sun/lwawt/LWWindowPeer.java | 156 +- src/macosx/classes/sun/lwawt/PlatformEventNotifier.java | 65 + src/macosx/classes/sun/lwawt/PlatformWindow.java | 6 +- src/macosx/classes/sun/lwawt/SecurityWarningWindow.java | 35 + src/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java | 12 +- src/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java | 47 +- src/macosx/classes/sun/lwawt/macosx/CPlatformView.java | 29 +- src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java | 82 +- src/macosx/classes/sun/lwawt/macosx/CWarningWindow.java | 455 +++++ src/macosx/classes/sun/lwawt/macosx/CWrapper.java | 4 +- src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java | 7 +- src/macosx/native/jobjc/src/core/native/SEL.m | 4 +- src/macosx/native/sun/awt/AWTView.m | 28 +- src/macosx/native/sun/awt/AWTWindow.m | 3 +- src/macosx/native/sun/awt/CRobot.m | 3 +- src/macosx/native/sun/awt/CWrapper.m | 23 +- src/macosx/native/sun/awt/LWCToolkit.m | 7 +- src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m | 6 +- src/share/bin/java.c | 7 + src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java | 7 +- src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java | 15 +- src/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java | 16 +- src/share/classes/com/sun/jmx/mbeanserver/ConvertingMethod.java | 3 +- src/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java | 15 +- src/share/classes/com/sun/jmx/mbeanserver/Introspector.java | 14 +- src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java | 21 +- src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java | 46 +- src/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java | 4 +- src/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java | 3 +- src/share/classes/com/sun/jmx/mbeanserver/StandardMBeanIntrospector.java | 3 +- src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java | 16 +- src/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java | 18 +- src/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java | 7 +- src/share/classes/com/sun/media/sound/AbstractDataLine.java | 45 +- src/share/classes/com/sun/media/sound/AbstractLine.java | 69 +- src/share/classes/com/sun/media/sound/AbstractMidiDevice.java | 44 +- src/share/classes/com/sun/media/sound/AbstractMidiDeviceProvider.java | 16 +- src/share/classes/com/sun/media/sound/AbstractMixer.java | 54 +- src/share/classes/com/sun/media/sound/AiffFileFormat.java | 10 +- src/share/classes/com/sun/media/sound/AiffFileReader.java | 34 +- src/share/classes/com/sun/media/sound/AiffFileWriter.java | 14 +- src/share/classes/com/sun/media/sound/AlawCodec.java | 14 +- src/share/classes/com/sun/media/sound/AuFileFormat.java | 6 +- src/share/classes/com/sun/media/sound/AuFileReader.java | 34 +- src/share/classes/com/sun/media/sound/AuFileWriter.java | 16 +- src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java | 4 +- src/share/classes/com/sun/media/sound/AudioFloatConverter.java | 39 +- src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java | 51 +- src/share/classes/com/sun/media/sound/AudioFloatInputStream.java | 26 +- src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java | 4 +- src/share/classes/com/sun/media/sound/DLSInfo.java | 4 +- src/share/classes/com/sun/media/sound/DLSInstrument.java | 18 +- src/share/classes/com/sun/media/sound/DLSModulator.java | 16 +- src/share/classes/com/sun/media/sound/DLSRegion.java | 28 +- src/share/classes/com/sun/media/sound/DLSSample.java | 14 +- src/share/classes/com/sun/media/sound/DLSSampleLoop.java | 10 +- src/share/classes/com/sun/media/sound/DLSSampleOptions.java | 14 +- src/share/classes/com/sun/media/sound/DLSSoundbank.java | 12 +- src/share/classes/com/sun/media/sound/DLSSoundbankReader.java | 4 +- src/share/classes/com/sun/media/sound/DataPusher.java | 8 +- src/share/classes/com/sun/media/sound/DirectAudioDevice.java | 44 +- src/share/classes/com/sun/media/sound/DirectAudioDeviceProvider.java | 68 +- src/share/classes/com/sun/media/sound/EmergencySoundbank.java | 4 +- src/share/classes/com/sun/media/sound/EventDispatcher.java | 34 +- src/share/classes/com/sun/media/sound/FFT.java | 12 +- src/share/classes/com/sun/media/sound/FastShortMessage.java | 6 +- src/share/classes/com/sun/media/sound/JARSoundbankReader.java | 22 +- src/share/classes/com/sun/media/sound/JDK13Services.java | 16 +- src/share/classes/com/sun/media/sound/JSSecurityManager.java | 103 +- src/share/classes/com/sun/media/sound/JavaSoundAudioClip.java | 12 +- src/share/classes/com/sun/media/sound/MidiDeviceReceiverEnvelope.java | 4 +- src/share/classes/com/sun/media/sound/MidiDeviceTransmitterEnvelope.java | 4 +- src/share/classes/com/sun/media/sound/MidiInDevice.java | 9 +- src/share/classes/com/sun/media/sound/MidiInDeviceProvider.java | 15 +- src/share/classes/com/sun/media/sound/MidiOutDevice.java | 6 +- src/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java | 15 +- src/share/classes/com/sun/media/sound/MidiUtils.java | 11 +- src/share/classes/com/sun/media/sound/ModelByteBuffer.java | 8 +- src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java | 12 +- src/share/classes/com/sun/media/sound/ModelConnectionBlock.java | 4 +- src/share/classes/com/sun/media/sound/ModelDestination.java | 4 +- src/share/classes/com/sun/media/sound/ModelIdentifier.java | 4 +- src/share/classes/com/sun/media/sound/ModelInstrument.java | 8 +- src/share/classes/com/sun/media/sound/ModelInstrumentComparator.java | 4 +- src/share/classes/com/sun/media/sound/ModelMappedInstrument.java | 6 +- src/share/classes/com/sun/media/sound/ModelPatch.java | 4 +- src/share/classes/com/sun/media/sound/ModelPerformer.java | 6 +- src/share/classes/com/sun/media/sound/ModelSource.java | 4 +- src/share/classes/com/sun/media/sound/ModelStandardDirector.java | 4 +- src/share/classes/com/sun/media/sound/ModelStandardIndexedDirector.java | 4 +- src/share/classes/com/sun/media/sound/ModelStandardTransform.java | 4 +- src/share/classes/com/sun/media/sound/PCMtoPCMCodec.java | 10 +- src/share/classes/com/sun/media/sound/Platform.java | 25 +- src/share/classes/com/sun/media/sound/PortMixer.java | 28 +- src/share/classes/com/sun/media/sound/PortMixerProvider.java | 46 +- src/share/classes/com/sun/media/sound/Printer.java | 10 +- src/share/classes/com/sun/media/sound/RIFFInvalidDataException.java | 4 +- src/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java | 4 +- src/share/classes/com/sun/media/sound/RIFFReader.java | 8 +- src/share/classes/com/sun/media/sound/RIFFWriter.java | 16 +- src/share/classes/com/sun/media/sound/RealTimeSequencer.java | 78 +- src/share/classes/com/sun/media/sound/RealTimeSequencerProvider.java | 4 +- src/share/classes/com/sun/media/sound/SF2GlobalRegion.java | 4 +- src/share/classes/com/sun/media/sound/SF2Instrument.java | 22 +- src/share/classes/com/sun/media/sound/SF2InstrumentRegion.java | 6 +- src/share/classes/com/sun/media/sound/SF2Layer.java | 10 +- src/share/classes/com/sun/media/sound/SF2LayerRegion.java | 6 +- src/share/classes/com/sun/media/sound/SF2Modulator.java | 14 +- src/share/classes/com/sun/media/sound/SF2Sample.java | 24 +- src/share/classes/com/sun/media/sound/SF2Soundbank.java | 36 +- src/share/classes/com/sun/media/sound/SF2SoundbankReader.java | 4 +- src/share/classes/com/sun/media/sound/SoftAbstractResampler.java | 6 +- src/share/classes/com/sun/media/sound/SoftAudioBuffer.java | 4 +- src/share/classes/com/sun/media/sound/SoftAudioPusher.java | 8 +- src/share/classes/com/sun/media/sound/SoftChannel.java | 44 +- src/share/classes/com/sun/media/sound/SoftChannelProxy.java | 4 +- src/share/classes/com/sun/media/sound/SoftChorus.java | 14 +- src/share/classes/com/sun/media/sound/SoftCubicResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java | 38 +- src/share/classes/com/sun/media/sound/SoftFilter.java | 6 +- src/share/classes/com/sun/media/sound/SoftInstrument.java | 8 +- src/share/classes/com/sun/media/sound/SoftJitterCorrector.java | 8 +- src/share/classes/com/sun/media/sound/SoftLanczosResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftLimiter.java | 4 +- src/share/classes/com/sun/media/sound/SoftLinearResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftLinearResampler2.java | 4 +- src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java | 24 +- src/share/classes/com/sun/media/sound/SoftMainMixer.java | 26 +- src/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java | 4 +- src/share/classes/com/sun/media/sound/SoftMixingClip.java | 8 +- src/share/classes/com/sun/media/sound/SoftMixingDataLine.java | 88 +- src/share/classes/com/sun/media/sound/SoftMixingMainMixer.java | 34 +- src/share/classes/com/sun/media/sound/SoftMixingMixer.java | 34 +- src/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java | 6 +- src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java | 10 +- src/share/classes/com/sun/media/sound/SoftPerformer.java | 4 +- src/share/classes/com/sun/media/sound/SoftPointResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftProvider.java | 8 +- src/share/classes/com/sun/media/sound/SoftReceiver.java | 14 +- src/share/classes/com/sun/media/sound/SoftReverb.java | 10 +- src/share/classes/com/sun/media/sound/SoftShortMessage.java | 4 +- src/share/classes/com/sun/media/sound/SoftSincResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftSynthesizer.java | 60 +- src/share/classes/com/sun/media/sound/SoftTuning.java | 6 +- src/share/classes/com/sun/media/sound/SoftVoice.java | 134 +- src/share/classes/com/sun/media/sound/StandardMidiFileReader.java | 29 +- src/share/classes/com/sun/media/sound/StandardMidiFileWriter.java | 10 +- src/share/classes/com/sun/media/sound/SunCodec.java | 18 +- src/share/classes/com/sun/media/sound/SunFileReader.java | 33 +- src/share/classes/com/sun/media/sound/SunFileWriter.java | 17 +- src/share/classes/com/sun/media/sound/Toolkit.java | 9 +- src/share/classes/com/sun/media/sound/UlawCodec.java | 9 +- src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java | 14 +- src/share/classes/com/sun/media/sound/WaveFileFormat.java | 22 +- src/share/classes/com/sun/media/sound/WaveFileReader.java | 34 +- src/share/classes/com/sun/media/sound/WaveFileWriter.java | 14 +- src/share/classes/com/sun/media/sound/WaveFloatFileReader.java | 4 +- src/share/classes/com/sun/media/sound/WaveFloatFileWriter.java | 8 +- src/share/classes/com/sun/org/apache/xml/internal/security/Init.java | 643 +++---- src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/ClassLoaderUtils.java | 280 +++ src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java | 403 +++- src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java | 812 ++++---- src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java | 237 +- src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java | 7 +- src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java | 32 +- src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java | 240 +- src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java | 622 +++--- src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java | 2 + src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties | 249 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java | 5 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java | 10 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java | 3 + src/share/classes/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderUtils.java | 280 +++ src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java | 420 ++-- src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java | 9 +- src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java | 23 +- src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java | 32 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java | 838 ++++----- src/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java | 338 +-- src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java | 395 +++- src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java | 534 +++--- src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java | 12 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverFragment.java | 98 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverXPointer.java | 66 +- src/share/classes/java/awt/Font.java | 40 +- src/share/classes/java/awt/image/BufferedImage.java | 30 +- src/share/classes/java/awt/image/ComponentSampleModel.java | 16 +- src/share/classes/java/awt/image/PixelInterleavedSampleModel.java | 10 +- src/share/classes/java/awt/image/Raster.java | 14 +- src/share/classes/java/io/ObjectOutputStream.java | 13 + src/share/classes/java/io/ObjectStreamClass.java | 18 + src/share/classes/java/io/ObjectStreamField.java | 8 + src/share/classes/java/lang/Class.java | 140 +- src/share/classes/java/lang/ClassLoader.java | 60 +- src/share/classes/java/lang/Package.java | 11 +- src/share/classes/java/lang/Runtime.java | 8 +- src/share/classes/java/lang/System.java | 13 +- src/share/classes/java/lang/Thread.java | 11 +- src/share/classes/java/lang/invoke/MemberName.java | 13 +- src/share/classes/java/lang/invoke/MethodHandleImpl.java | 8 +- src/share/classes/java/lang/invoke/MethodHandleNatives.java | 68 +- src/share/classes/java/lang/invoke/MethodHandleProxies.java | 5 +- src/share/classes/java/lang/invoke/MethodHandles.java | 175 +- src/share/classes/java/lang/reflect/Constructor.java | 5 +- src/share/classes/java/lang/reflect/Field.java | 129 +- src/share/classes/java/lang/reflect/Method.java | 19 +- src/share/classes/java/lang/reflect/Proxy.java | 68 +- src/share/classes/java/net/NetUtil.java | 74 + src/share/classes/java/net/ServerSocket.java | 25 +- src/share/classes/java/net/Socket.java | 8 + src/share/classes/java/net/SocksSocketImpl.java | 9 +- src/share/classes/java/nio/file/Files.java | 11 +- src/share/classes/java/rmi/dgc/VMID.java | 69 +- src/share/classes/java/security/AccessControlContext.java | 13 +- src/share/classes/java/security/AccessController.java | 27 +- src/share/classes/java/security/KeyStore.java | 2 +- src/share/classes/java/security/ProtectionDomain.java | 7 +- src/share/classes/java/sql/DriverManager.java | 68 +- src/share/classes/java/util/ResourceBundle.java | 29 +- src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java | 11 +- src/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java | 18 +- src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java | 13 +- src/share/classes/java/util/logging/LogManager.java | 39 +- src/share/classes/java/util/logging/Logger.java | 99 +- src/share/classes/java/util/zip/ZipFile.java | 26 +- src/share/classes/javax/management/JMX.java | 90 +- src/share/classes/javax/management/MBeanServerFactory.java | 3 +- src/share/classes/javax/management/MBeanServerInvocationHandler.java | 15 +- src/share/classes/javax/management/StandardEmitterMBean.java | 35 +- src/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java | 2 + src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java | 10 +- src/share/classes/javax/management/relation/RelationNotification.java | 255 +- src/share/classes/javax/management/remote/JMXConnectorFactory.java | 39 +- src/share/classes/javax/management/remote/NotificationResult.java | 4 +- src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java | 2 + src/share/classes/javax/management/remote/rmi/RMIConnector.java | 5 +- src/share/classes/javax/script/ScriptEngineManager.java | 48 +- src/share/classes/javax/sound/midi/MetaMessage.java | 18 +- src/share/classes/javax/sound/sampled/Mixer.java | 8 +- src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java | 19 +- src/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java | 19 +- src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java | 2 +- src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheTransform.java | 12 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java | 18 + src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java | 9 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMManifest.java | 21 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java | 36 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java | 18 + src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java | 9 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java | 9 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java | 35 + src/share/classes/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java | 42 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMUtils.java | 4 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLObject.java | 10 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java | 9 +- src/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java | 10 + src/share/classes/sun/applet/AppletSecurity.java | 4 +- src/share/classes/sun/audio/AudioData.java | 4 +- src/share/classes/sun/audio/AudioDataStream.java | 10 +- src/share/classes/sun/audio/AudioDevice.java | 16 +- src/share/classes/sun/audio/AudioPlayer.java | 15 +- src/share/classes/sun/audio/AudioStream.java | 14 +- src/share/classes/sun/audio/AudioStreamSequence.java | 7 +- src/share/classes/sun/audio/AudioTranslatorStream.java | 9 +- src/share/classes/sun/audio/ContinuousAudioDataStream.java | 7 +- src/share/classes/sun/audio/InvalidAudioFormatException.java | 8 +- src/share/classes/sun/awt/AppContext.java | 121 +- src/share/classes/sun/awt/IconInfo.java | 237 ++ src/share/classes/sun/awt/SunToolkit.java | 7 +- src/share/classes/sun/awt/image/ByteBandedRaster.java | 73 +- src/share/classes/sun/awt/image/ByteComponentRaster.java | 23 +- src/share/classes/sun/awt/image/BytePackedRaster.java | 3 +- src/share/classes/sun/awt/image/IntegerComponentRaster.java | 23 +- src/share/classes/sun/awt/image/ShortBandedRaster.java | 66 +- src/share/classes/sun/awt/image/ShortComponentRaster.java | 23 +- src/share/classes/sun/awt/resources/security-icon-bw16.png | Bin src/share/classes/sun/awt/resources/security-icon-bw24.png | Bin src/share/classes/sun/awt/resources/security-icon-bw32.png | Bin src/share/classes/sun/awt/resources/security-icon-bw48.png | Bin src/share/classes/sun/awt/resources/security-icon-interim16.png | Bin src/share/classes/sun/awt/resources/security-icon-interim24.png | Bin src/share/classes/sun/awt/resources/security-icon-interim32.png | Bin src/share/classes/sun/awt/resources/security-icon-interim48.png | Bin src/share/classes/sun/awt/resources/security-icon-yellow16.png | Bin src/share/classes/sun/awt/resources/security-icon-yellow24.png | Bin src/share/classes/sun/awt/resources/security-icon-yellow32.png | Bin src/share/classes/sun/awt/resources/security-icon-yellow48.png | Bin src/share/classes/sun/font/CreatedFontTracker.java | 119 +- src/share/classes/sun/font/ExtendedTextSourceLabel.java | 13 +- src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java | 41 +- src/share/classes/sun/misc/JavaUtilZipFileAccess.java | 32 + src/share/classes/sun/misc/SharedSecrets.java | 11 + src/share/classes/sun/misc/URLClassPath.java | 21 +- src/share/classes/sun/misc/Unsafe.java | 12 +- src/share/classes/sun/net/NetworkClient.java | 8 +- src/share/classes/sun/net/ftp/impl/FtpClient.java | 21 +- src/share/classes/sun/net/httpserver/ServerImpl.java | 11 +- src/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java | 23 +- src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java | 27 +- src/share/classes/sun/nio/ch/DatagramChannelImpl.java | 29 +- src/share/classes/sun/nio/ch/Net.java | 107 +- src/share/classes/sun/nio/ch/ServerSocketAdaptor.java | 3 +- src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java | 40 +- src/share/classes/sun/nio/ch/SocketAdaptor.java | 4 +- src/share/classes/sun/nio/ch/SocketChannelImpl.java | 30 +- src/share/classes/sun/reflect/CallerSensitive.java | 41 + src/share/classes/sun/reflect/Reflection.java | 38 +- src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java | 9 +- src/share/classes/sun/reflect/misc/ReflectUtil.java | 54 +- src/share/classes/sun/rmi/server/Activation.java | 16 +- src/share/classes/sun/rmi/server/LoaderHandler.java | 33 +- src/share/classes/sun/rmi/transport/proxy/WrappedSocket.java | 11 +- src/share/classes/sun/security/pkcs11/P11KeyAgreement.java | 4 +- src/share/classes/sun/security/pkcs11/P11Signature.java | 7 +- src/share/classes/sun/security/pkcs11/P11Util.java | 16 +- src/share/classes/sun/security/timestamp/TimestampToken.java | 6 +- src/share/classes/sun/security/util/KeyUtil.java | 21 +- src/share/classes/sun/security/util/SignatureFileVerifier.java | 29 +- src/share/classes/sun/tools/jconsole/ProxyClient.java | 15 +- src/share/classes/sun/tools/jconsole/VMPanel.java | 11 +- src/share/classes/sun/tools/jconsole/resources/JConsoleResources.java | 5 + src/share/classes/sun/tracing/ProviderSkeleton.java | 31 +- src/share/classes/sun/tracing/dtrace/DTraceProvider.java | 15 +- src/share/lib/security/java.security | 8 +- src/share/lib/security/java.security-macosx | 4 + src/share/lib/security/java.security-solaris | 8 +- src/share/lib/security/java.security-windows | 4 + src/share/native/common/sizecalc.h | 118 + src/share/native/java/lang/ClassLoader.c | 17 - src/share/native/java/lang/SecurityManager.c | 1 - src/share/native/java/util/zip/ZipFile.c | 8 + src/share/native/java/util/zip/zip_util.c | 8 + src/share/native/java/util/zip/zip_util.h | 1 + src/share/native/sun/awt/image/awt_parseImage.c | 167 +- src/share/native/sun/awt/medialib/awt_ImagingLib.c | 466 +++- src/share/native/sun/awt/medialib/mlib_ImageCreate.c | 31 +- src/share/native/sun/awt/splashscreen/java_awt_SplashScreen.c | 3 +- src/share/native/sun/awt/splashscreen/splashscreen_gif.c | 6 +- src/share/native/sun/font/freetypeScaler.c | 13 +- src/share/native/sun/font/layout/LEGlyphStorage.cpp | 16 +- src/share/native/sun/font/layout/LookupProcessor.cpp | 2 +- src/share/native/sun/font/layout/PairPositioningSubtables.cpp | 27 +- src/share/native/sun/font/layout/PairPositioningSubtables.h | 5 +- src/share/native/sun/java2d/cmm/lcms/cmslut.c | 3 + src/share/native/sun/java2d/cmm/lcms/cmsnamed.c | 10 +- src/share/native/sun/java2d/cmm/lcms/cmsopt.c | 9 + src/share/native/sun/java2d/pipe/Region.c | 5 +- src/share/native/sun/reflect/Reflection.c | 6 +- src/solaris/classes/sun/awt/X11/XDecoratedPeer.java | 5 +- src/solaris/classes/sun/awt/X11/XIconInfo.java | 237 -- src/solaris/classes/sun/awt/X11/XIconWindow.java | 9 +- src/solaris/classes/sun/awt/X11/XNETProtocol.java | 12 +- src/solaris/classes/sun/awt/X11/XWM.java | 5 +- src/solaris/classes/sun/awt/X11/XWarningWindow.java | 65 +- src/solaris/classes/sun/awt/X11/XWindowAttributesData.java | 7 +- src/solaris/classes/sun/awt/X11/XWindowPeer.java | 47 +- src/solaris/classes/sun/awt/X11/security-icon-bw16.png | Bin src/solaris/classes/sun/awt/X11/security-icon-bw24.png | Bin src/solaris/classes/sun/awt/X11/security-icon-bw32.png | Bin src/solaris/classes/sun/awt/X11/security-icon-bw48.png | Bin src/solaris/classes/sun/awt/X11/security-icon-interim16.png | Bin src/solaris/classes/sun/awt/X11/security-icon-interim24.png | Bin src/solaris/classes/sun/awt/X11/security-icon-interim32.png | Bin src/solaris/classes/sun/awt/X11/security-icon-interim48.png | Bin src/solaris/classes/sun/awt/X11/security-icon-yellow16.png | Bin src/solaris/classes/sun/awt/X11/security-icon-yellow24.png | Bin src/solaris/classes/sun/awt/X11/security-icon-yellow32.png | Bin src/solaris/classes/sun/awt/X11/security-icon-yellow48.png | Bin src/solaris/classes/sun/nio/ch/SctpNet.java | 62 +- src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java | 2 +- src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java | 3 +- src/solaris/native/sun/awt/awt_GraphicsEnv.c | 5 +- src/solaris/native/sun/awt/awt_GraphicsEnv.h | 3 + src/solaris/native/sun/awt/awt_Robot.c | 8 +- src/solaris/native/sun/awt/awt_UNIXToolkit.c | 10 +- src/solaris/native/sun/awt/fontpath.c | 12 +- src/solaris/native/sun/awt/gtk2_interface.c | 4 +- src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c | 22 +- src/solaris/native/sun/java2d/x11/X11SurfaceData.c | 11 +- src/solaris/native/sun/nio/ch/Net.c | 9 +- src/solaris/native/sun/xawt/XlibWrapper.c | 10 +- src/windows/classes/java/net/DefaultDatagramSocketImplFactory.java | 51 +- src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java | 32 +- src/windows/classes/java/net/DualStackPlainSocketImpl.java | 32 +- src/windows/classes/java/net/PlainSocketImpl.java | 25 +- src/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java | 47 +- src/windows/classes/java/net/TwoStacksPlainSocketImpl.java | 39 +- src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java | 4 +- src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c | 5 +- src/windows/native/java/net/DualStackPlainSocketImpl.c | 6 +- src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c | 11 +- src/windows/native/java/net/TwoStacksPlainSocketImpl.c | 13 +- src/windows/native/java/net/net_util_md.c | 65 +- src/windows/native/java/net/net_util_md.h | 5 +- src/windows/native/sun/awt/splashscreen/splashscreen_sys.c | 31 +- src/windows/native/sun/font/lcdglyph.c | 10 +- src/windows/native/sun/java2d/opengl/WGLSurfaceData.c | 3 +- src/windows/native/sun/java2d/windows/GDIBlitLoops.cpp | 1 + src/windows/native/sun/java2d/windows/GDIRenderer.cpp | 2 +- src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp | 5 +- src/windows/native/sun/nio/ch/Net.c | 18 +- src/windows/native/sun/windows/CmdIDList.cpp | 6 +- src/windows/native/sun/windows/Devices.cpp | 7 +- src/windows/native/sun/windows/ShellFolder2.cpp | 6 + src/windows/native/sun/windows/WPrinterJob.cpp | 2 +- src/windows/native/sun/windows/alloc.h | 3 + src/windows/native/sun/windows/awt.h | 6 +- src/windows/native/sun/windows/awt_BitmapUtil.cpp | 14 +- src/windows/native/sun/windows/awt_Component.cpp | 45 +- src/windows/native/sun/windows/awt_Cursor.cpp | 6 +- src/windows/native/sun/windows/awt_DataTransferer.cpp | 12 +- src/windows/native/sun/windows/awt_DesktopProperties.cpp | 6 +- src/windows/native/sun/windows/awt_DnDDT.cpp | 4 +- src/windows/native/sun/windows/awt_InputMethod.cpp | 8 +- src/windows/native/sun/windows/awt_PrintControl.cpp | 4 +- src/windows/native/sun/windows/awt_PrintJob.cpp | 17 +- src/windows/native/sun/windows/awt_Robot.cpp | 5 + test/Makefile | 5 +- test/ProblemList.txt | 2 +- test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java | 22 +- test/com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java | 45 +- test/java/rmi/Naming/LookupNameWithColon.java | 18 +- test/java/rmi/Naming/RmiIsNoScheme.java | 12 +- test/java/rmi/Naming/UnderscoreHost.java | 71 +- test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java | 6 +- test/java/rmi/activation/Activatable/checkActivateRef/security.policy | 3 +- test/java/rmi/activation/Activatable/checkAnnotations/security.policy | 3 +- test/java/rmi/activation/Activatable/checkImplClassLoader/security.policy | 3 +- test/java/rmi/activation/Activatable/checkRegisterInLog/security.policy | 5 +- test/java/rmi/activation/Activatable/createPrivateActivable/security.policy | 3 +- test/java/rmi/activation/Activatable/downloadParameterClass/security.policy | 3 +- test/java/rmi/activation/Activatable/elucidateNoSuchMethod/security.policy | 3 +- test/java/rmi/activation/Activatable/extLoadedImpl/security.policy | 3 +- test/java/rmi/activation/Activatable/forceLogSnapshot/security.policy | 3 +- test/java/rmi/activation/Activatable/inactiveGroup/security.policy | 5 +- test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java | 4 +- test/java/rmi/activation/Activatable/nestedActivate/security.policy | 5 +- test/java/rmi/activation/Activatable/nonExistentActivatable/security.policy | 3 +- test/java/rmi/activation/Activatable/restartCrashedService/security.policy | 3 +- test/java/rmi/activation/Activatable/restartLatecomer/security.policy | 3 +- test/java/rmi/activation/Activatable/restartService/security.policy | 3 +- test/java/rmi/activation/Activatable/shutdownGracefully/security.policy | 3 +- test/java/rmi/activation/Activatable/unregisterInactive/security.policy | 3 +- test/java/rmi/activation/ActivateFailedException/activateFails/security.policy | 3 +- test/java/rmi/activation/ActivationSystem/activeGroup/security.policy | 3 +- test/java/rmi/activation/ActivationSystem/modifyDescriptor/security.policy | 3 +- test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java | 10 +- test/java/rmi/activation/ActivationSystem/stubClassesPermitted/security.policy | 9 +- test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java | 9 +- test/java/rmi/activation/ActivationSystem/unregisterGroup/security.policy | 3 +- test/java/rmi/activation/CommandEnvironment/SetChildEnv.java | 37 +- test/java/rmi/activation/CommandEnvironment/security.policy | 1 + test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java | 20 +- test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java | 23 +- test/java/rmi/activation/rmidViaInheritedChannel/rmid.security.policy | 1 + test/java/rmi/registry/altSecurityManager/AltSecurityManager.java | 45 +- test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java | 11 +- test/java/rmi/registry/emptyName/EmptyName.java | 6 +- test/java/rmi/registry/interfaceHash/InterfaceHash.java | 6 +- test/java/rmi/registry/multipleRegistries/MultipleRegistries.java | 15 +- test/java/rmi/registry/readTest/readTest.java | 9 +- test/java/rmi/registry/readTest/readTest.sh | 5 +- test/java/rmi/registry/reexport/Reexport.java | 25 +- test/java/rmi/reliability/juicer/AppleUserImpl.java | 22 +- test/java/rmi/reliability/juicer/ApplicationServer.java | 27 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/EchoImpl.java | 7 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java | 16 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy | 3 + test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl.java | 5 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java | 14 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy | 2 + test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/EchoImpl.java | 5 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java | 15 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/security.policy | 9 + test/java/rmi/server/RemoteServer/AddrInUse.java | 12 +- test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java | 10 +- test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownImpl.java | 5 +- test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java | 12 +- test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java | 9 +- test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java | 8 +- test/java/rmi/server/Unreferenced/leaseCheckInterval/SelfTerminator.java | 6 +- test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java | 8 +- test/java/rmi/server/useCustomRef/UseCustomRef.java | 8 +- test/java/rmi/server/useCustomRef/security.policy | 3 + test/java/rmi/testlibrary/ActivationLibrary.java | 39 +- test/java/rmi/testlibrary/RMID.java | 25 +- test/java/rmi/testlibrary/RegistryRunner.java | 9 +- test/java/rmi/testlibrary/StreamPipe.java | 2 +- test/java/rmi/testlibrary/TestLibrary.java | 132 +- test/java/rmi/transport/checkFQDN/CheckFQDN.java | 13 +- test/java/rmi/transport/checkFQDN/CheckFQDNClient.java | 5 +- test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java | 13 +- test/java/rmi/transport/checkLeaseInfoLeak/LeaseLeakClient.java | 6 +- test/java/rmi/transport/checkLeaseInfoLeak/security.policy | 1 + test/java/rmi/transport/closeServerSocket/CloseServerSocket.java | 10 +- test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java | 13 +- test/java/rmi/transport/dgcDeadLock/TestImpl.java | 10 +- test/java/rmi/transport/handshakeFailure/HandshakeFailure.java | 7 +- test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java | 7 +- test/java/rmi/transport/httpSocket/HttpSocketTest.java | 16 +- test/java/rmi/transport/httpSocket/security.policy | 4 + test/java/rmi/transport/pinClientSocketFactory/PinClientSocketFactory.java | 6 +- test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java | 9 +- test/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java | 7 +- test/javax/xml/crypto/dsig/GenerationTests.java | 8 +- test/javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java | 7 +- test/javax/xml/crypto/dsig/ValidationTests.java | 4 +- test/sun/reflect/CallerSensitive/CallerSensitiveFinder.java | 248 ++ test/sun/reflect/CallerSensitive/ClassFileReader.java | 338 ++++ test/sun/reflect/CallerSensitive/MethodFinder.java | 201 ++ test/sun/reflect/CallerSensitive/MissingCallerSensitive.java | 73 + test/sun/rmi/rmic/newrmic/equivalence/AppleUserImpl.java | 17 +- test/sun/rmi/rmic/newrmic/equivalence/run.sh | 4 +- test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java | 8 +- test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java | 11 +- test/sun/rmi/transport/proxy/EagerHttpFallback.java | 8 +- test/sun/rmi/transport/tcp/DeadCachedConnection.java | 4 +- test/tools/launcher/Arrrghs.java | 10 +- 537 files changed, 11451 insertions(+), 6754 deletions(-) diffs (truncated from 34158 to 500 lines): diff -r d9291e4158bb -r 3b50cd01c2d2 make/java/java/FILES_c.gmk --- a/make/java/java/FILES_c.gmk Wed May 22 17:42:12 2013 +0100 +++ b/make/java/java/FILES_c.gmk Tue Jun 18 14:04:33 2013 +0100 @@ -48,7 +48,6 @@ Proxy.c \ RandomAccessFile.c \ RandomAccessFile_md.c \ - ResourceBundle.c \ Runtime.c \ SecurityManager.c \ Shutdown.c \ @@ -69,7 +68,6 @@ jdk_util_md.c \ check_version.c \ java_props_md.c \ - DriverManager.c \ ConstantPool.c \ MessageUtils.c \ GC.c \ diff -r d9291e4158bb -r 3b50cd01c2d2 make/java/java/mapfile-vers --- a/make/java/java/mapfile-vers Wed May 22 17:42:12 2013 +0100 +++ b/make/java/java/mapfile-vers Tue Jun 18 14:04:33 2013 +0100 @@ -135,7 +135,6 @@ Java_java_lang_ClassLoader_00024NativeLibrary_find; Java_java_lang_ClassLoader_00024NativeLibrary_load; Java_java_lang_ClassLoader_00024NativeLibrary_unload; - Java_java_lang_ClassLoader_getCaller; Java_java_lang_ClassLoader_registerNatives; Java_java_lang_Compiler_registerNatives; Java_java_lang_Double_longBitsToDouble; @@ -233,8 +232,6 @@ Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedExceptionAction_2Ljava_security_AccessControlContext_2; Java_java_security_AccessController_getStackAccessControlContext; Java_java_security_AccessController_getInheritedAccessControlContext; - Java_java_sql_DriverManager_getCallerClassLoader; - Java_java_util_ResourceBundle_getClassContext; Java_java_util_TimeZone_getSystemTimeZoneID; Java_java_util_TimeZone_getSystemGMTOffsetID; Java_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8; diff -r d9291e4158bb -r 3b50cd01c2d2 make/java/java/reorder-i586 --- a/make/java/java/reorder-i586 Wed May 22 17:42:12 2013 +0100 +++ b/make/java/java/reorder-i586 Tue Jun 18 14:04:33 2013 +0100 @@ -73,7 +73,6 @@ # Test Sleep # Test IntToString # Test LoadToolkit -text: .text%Java_java_util_ResourceBundle_getClassContext; text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2; text: .text%JNU_GetEnv; text: .text%Java_java_io_UnixFileSystem_checkAccess; diff -r d9291e4158bb -r 3b50cd01c2d2 make/java/java/reorder-sparc --- a/make/java/java/reorder-sparc Wed May 22 17:42:12 2013 +0100 +++ b/make/java/java/reorder-sparc Tue Jun 18 14:04:33 2013 +0100 @@ -78,7 +78,6 @@ # Test Sleep # Test IntToString # Test LoadToolkit -text: .text%Java_java_util_ResourceBundle_getClassContext; text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2; text: .text%JNU_GetEnv; text: .text%Java_java_io_UnixFileSystem_checkAccess; diff -r d9291e4158bb -r 3b50cd01c2d2 make/java/java/reorder-sparcv9 --- a/make/java/java/reorder-sparcv9 Wed May 22 17:42:12 2013 +0100 +++ b/make/java/java/reorder-sparcv9 Tue Jun 18 14:04:33 2013 +0100 @@ -74,7 +74,6 @@ # Test Sleep # Test IntToString # Test LoadToolkit -text: .text%Java_java_util_ResourceBundle_getClassContext; text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2; text: .text%JNU_GetEnv; text: .text%Java_java_io_UnixFileSystem_checkAccess; diff -r d9291e4158bb -r 3b50cd01c2d2 make/java/nio/mapfile-bsd --- a/make/java/nio/mapfile-bsd Wed May 22 17:42:12 2013 +0100 +++ b/make/java/nio/mapfile-bsd Tue Jun 18 14:04:33 2013 +0100 @@ -108,6 +108,7 @@ Java_sun_nio_ch_Net_setInterface6; Java_sun_nio_ch_Net_getInterface6; Java_sun_nio_ch_Net_shutdown; + Java_sun_nio_ch_Net_isExclusiveBindAvailable; Java_sun_nio_ch_PollArrayWrapper_interrupt; Java_sun_nio_ch_PollArrayWrapper_poll0; Java_sun_nio_ch_ServerSocketChannelImpl_accept0; diff -r d9291e4158bb -r 3b50cd01c2d2 make/java/nio/mapfile-linux --- a/make/java/nio/mapfile-linux Wed May 22 17:42:12 2013 +0100 +++ b/make/java/nio/mapfile-linux Tue Jun 18 14:04:33 2013 +0100 @@ -116,6 +116,7 @@ Java_sun_nio_ch_Net_setInterface6; Java_sun_nio_ch_Net_getInterface6; Java_sun_nio_ch_Net_shutdown; + Java_sun_nio_ch_Net_isExclusiveBindAvailable; Java_sun_nio_ch_PollArrayWrapper_interrupt; Java_sun_nio_ch_PollArrayWrapper_poll0; Java_sun_nio_ch_ServerSocketChannelImpl_accept0; diff -r d9291e4158bb -r 3b50cd01c2d2 make/java/nio/mapfile-solaris --- a/make/java/nio/mapfile-solaris Wed May 22 17:42:12 2013 +0100 +++ b/make/java/nio/mapfile-solaris Tue Jun 18 14:04:33 2013 +0100 @@ -104,6 +104,7 @@ Java_sun_nio_ch_Net_setInterface6; Java_sun_nio_ch_Net_getInterface6; Java_sun_nio_ch_Net_shutdown; + Java_sun_nio_ch_Net_isExclusiveBindAvailable; Java_sun_nio_ch_PollArrayWrapper_interrupt; Java_sun_nio_ch_PollArrayWrapper_poll0; Java_sun_nio_ch_ServerSocketChannelImpl_accept0; diff -r d9291e4158bb -r 3b50cd01c2d2 make/java/zip/mapfile-vers --- a/make/java/zip/mapfile-vers Wed May 22 17:42:12 2013 +0100 +++ b/make/java/zip/mapfile-vers Tue Jun 18 14:04:33 2013 +0100 @@ -68,6 +68,7 @@ Java_java_util_zip_ZipFile_initIDs; Java_java_util_zip_ZipFile_open; Java_java_util_zip_ZipFile_read; + Java_java_util_zip_ZipFile_startsWithLOC; ZIP_Close; ZIP_CRC32; diff -r d9291e4158bb -r 3b50cd01c2d2 make/java/zip/reorder-i586 --- a/make/java/zip/reorder-i586 Wed May 22 17:42:12 2013 +0100 +++ b/make/java/zip/reorder-i586 Tue Jun 18 14:04:33 2013 +0100 @@ -19,6 +19,7 @@ text: .text%Java_java_util_zip_ZipFile_initIDs; text: .text%Java_java_util_zip_ZipFile_open; text: .text%Java_java_util_zip_ZipFile_getTotal; +text: .text%Java_java_util_zip_ZipFile_startsWithLOC; text: .text%Java_java_util_zip_ZipFile_getEntry; text: .text%Java_java_util_zip_ZipFile_freeEntry; text: .text%Java_java_util_zip_ZipFile_getEntryTime; diff -r d9291e4158bb -r 3b50cd01c2d2 make/java/zip/reorder-sparc --- a/make/java/zip/reorder-sparc Wed May 22 17:42:12 2013 +0100 +++ b/make/java/zip/reorder-sparc Tue Jun 18 14:04:33 2013 +0100 @@ -18,6 +18,7 @@ text: .text%Java_java_util_zip_ZipFile_initIDs; text: .text%Java_java_util_zip_ZipFile_open; text: .text%Java_java_util_zip_ZipFile_getTotal; +text: .text%Java_java_util_zip_ZipFile_startsWithLOC; text: .text%Java_java_util_zip_ZipFile_getEntry; text: .text%Java_java_util_zip_ZipFile_freeEntry; text: .text%Java_java_util_zip_ZipFile_getEntryTime; diff -r d9291e4158bb -r 3b50cd01c2d2 make/java/zip/reorder-sparcv9 --- a/make/java/zip/reorder-sparcv9 Wed May 22 17:42:12 2013 +0100 +++ b/make/java/zip/reorder-sparcv9 Tue Jun 18 14:04:33 2013 +0100 @@ -18,6 +18,7 @@ text: .text%Java_java_util_zip_ZipFile_initIDs; text: .text%Java_java_util_zip_ZipFile_open; text: .text%Java_java_util_zip_ZipFile_getTotal; +text: .text%Java_java_util_zip_ZipFile_startsWithLOC; text: .text%Java_java_util_zip_ZipFile_getEntry; text: .text%Java_java_util_zip_ZipFile_freeEntry; text: .text%Java_java_util_zip_ZipFile_getEntryTime; diff -r d9291e4158bb -r 3b50cd01c2d2 make/sun/awt/Makefile --- a/make/sun/awt/Makefile Wed May 22 17:42:12 2013 +0100 +++ b/make/sun/awt/Makefile Tue Jun 18 14:04:33 2013 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -38,6 +38,10 @@ OTHER_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES +ifneq ($(PLATFORM), windows) +CLASSES_INIT += $(TEMPDIR)/.gen_icons +endif + # # Files # @@ -208,6 +212,79 @@ endif build: fontconfigs +ifneq ($(PLATFORM), windows) + +GEN_DIR=$(GENSRCDIR)/sun/awt/ + +ifdef OPENJDK + ICONS_PATH_PREFIX=$(PLATFORM_SRC) +else + ICONS_PATH_PREFIX=$(CLOSED_SRC)/solaris +endif + +ICONS = \ + $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon16.png \ + $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon24.png \ + $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon32.png \ + $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon48.png + +ICONPATH=$(SHARE_SRC)/classes/sun/awt/resources + +ICONS += \ + $(ICONPATH)/security-icon-bw16.png \ + $(ICONPATH)/security-icon-interim16.png \ + $(ICONPATH)/security-icon-yellow16.png \ + $(ICONPATH)/security-icon-bw24.png \ + $(ICONPATH)/security-icon-interim24.png \ + $(ICONPATH)/security-icon-yellow24.png \ + $(ICONPATH)/security-icon-bw32.png \ + $(ICONPATH)/security-icon-interim32.png \ + $(ICONPATH)/security-icon-yellow32.png \ + $(ICONPATH)/security-icon-bw48.png \ + $(ICONPATH)/security-icon-interim48.png \ + $(ICONPATH)/security-icon-yellow48.png + +TEMPDIR_CLASSES = $(TEMPDIR)/classes + +generated.clean: + $(RM) -r $(GEN_DIR)/*.java + $(RM) -r $(TEMPDIR)/.gen_icons + +$(TEMPDIR_CLASSES)/sun/awt/ToBin.class: ToBin.java + @$(prep-target) + $(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $< + +$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/ToBin.class $(ICONS) + $(prep-target) + for i in $(ICONS); do \ + filename=`basename $$i`; \ + name=`$(ECHO) $$filename | $(TR) '\-.' '__'`; \ + classname=$(GEN_DIR)/AWTIcon32_$$name.java; \ + $(RM) $$classname; \ + $(ECHO) "package sun.awt;" >> $$classname ; \ + $(ECHO) "public class AWTIcon32_$$name {" >> $$classname; \ + $(ECHO) "public final static int[] $$name = { " >> $$classname; \ + $(CAT) $$i | \ + $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ + -Djava.awt.headless=true \ + sun.awt.ToBin >> $$classname; \ + $(ECHO) "}; }" >> $$classname; \ + classname=$(GEN_DIR)/AWTIcon64_$$name.java; \ + $(RM) $$classname; \ + $(ECHO) "package sun.awt;" >> $$classname ; \ + $(ECHO) "public class AWTIcon64_$$name {" >> $$classname; \ + $(ECHO) "public final static long[] $$name = { " >> $$classname; \ + $(CAT) $$i | \ + $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ + -Djava.awt.headless=true \ + sun.awt.ToBin >> $$classname; \ + $(ECHO) "}; }" >> $$classname; \ + done + $(TOUCH) $@ + +clean clobber:: generated.clean +endif + ifeq ($(PLATFORM), windows) # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv WINDOWS @@ -565,5 +642,5 @@ java.lang.Integer \ java.lang.ThreadGroup -.PHONY: dgalibs dgalib.clean fontconfigs fontconfigs.clean +.PHONY: dgalibs dgalib.clean fontconfigs fontconfigs.clean generated.clean diff -r d9291e4158bb -r 3b50cd01c2d2 make/sun/awt/ToBin.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/sun/awt/ToBin.java Tue Jun 18 14:04:33 2013 +0100 @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code 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 + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package sun.awt; + +import java.io.*; +import java.awt.image.*; +import javax.imageio.*; +import java.awt.*; + +public class ToBin { + public static void main(String[] args) throws Exception { + BufferedImage im = ImageIO.read(System.in); + BufferedImage bi = null; + int iconWidth = im.getWidth(null); + int iconHeight = im.getHeight(null); + if (im != null && iconHeight != 0 && iconWidth != 0) { + bi = new BufferedImage(iconWidth, iconHeight, BufferedImage.TYPE_INT_ARGB); + Graphics g = bi.getGraphics(); + try { + g.drawImage(im, 0, 0, iconWidth, iconHeight, null); + } finally { + g.dispose(); + } + } + DataBuffer srcBuf = bi.getData().getDataBuffer(); + int[] buf = ((DataBufferInt)srcBuf).getData(); + System.out.print(iconWidth + ","); + System.out.println(iconHeight + ","); + for (int i = 0; i < buf.length; i++) { + System.out.print("0x" + Integer.toHexString(buf[i]) + ", "); + if (i % 10 == 0) { + System.out.println(); + } + } + } +} diff -r d9291e4158bb -r 3b50cd01c2d2 make/sun/xawt/Makefile --- a/make/sun/xawt/Makefile Wed May 22 17:42:12 2013 +0100 +++ b/make/sun/xawt/Makefile Tue Jun 18 14:04:33 2013 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -39,7 +39,7 @@ GEN_DIR=$(GENSRCDIR)/sun/awt/X11 -CLASSES_INIT += $(TEMPDIR)/.gen.wrappers $(TEMPDIR)/.gen_icons touch.wrappers +CLASSES_INIT += $(TEMPDIR)/.gen.wrappers touch.wrappers .PHONY: generated.clean @@ -383,70 +383,7 @@ $(RM) -r $(WRAPPER_GENERATOR_TEMPDIR) $(RM) -r $(WRAPPER_GENERATOR_DIR) $(RM) -r $(GEN_DIR)/*.java - $(RM) -r $(TEMPDIR)/.gen_icons -ifdef OPENJDK - ICONS_PATH_PREFIX=$(PLATFORM_SRC) -else - ICONS_PATH_PREFIX=$(CLOSED_SRC)/solaris -endif - -ICONS = \ - $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon16.png \ - $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon24.png \ - $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon32.png \ - $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon48.png - - -ICONPATH=$(PLATFORM_SRC)/classes/sun/awt/X11 - -ICONS += \ - $(ICONPATH)/security-icon-bw16.png \ - $(ICONPATH)/security-icon-interim16.png \ - $(ICONPATH)/security-icon-yellow16.png \ - $(ICONPATH)/security-icon-bw24.png \ - $(ICONPATH)/security-icon-interim24.png \ - $(ICONPATH)/security-icon-yellow24.png \ - $(ICONPATH)/security-icon-bw32.png \ - $(ICONPATH)/security-icon-interim32.png \ - $(ICONPATH)/security-icon-yellow32.png \ - $(ICONPATH)/security-icon-bw48.png \ - $(ICONPATH)/security-icon-interim48.png \ - $(ICONPATH)/security-icon-yellow48.png - -TEMPDIR_CLASSES = $(TEMPDIR)/classes - -$(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class: ToBin.java - @$(prep-target) - $(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $< - -$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class $(ICONS) - $(prep-target) - for i in $(ICONS); do \ - filename=`basename $$i`; \ - name=`$(ECHO) $$filename | $(TR) '\-.' '__'`; \ - classname=$(GEN_DIR)/XAWTIcon32_$$name.java; \ - $(RM) $$classname; \ - $(ECHO) "package sun.awt.X11;" >> $$classname ; \ - $(ECHO) "public class XAWTIcon32_$$name {" >> $$classname; \ - $(ECHO) "public static int[] $$name = { " >> $$classname; \ - $(CAT) $$i | \ - $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ - -Djava.awt.headless=true \ - sun.awt.X11.ToBin >> $$classname; \ - $(ECHO) "}; }" >> $$classname; \ - classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \ - $(RM) $$classname; \ - $(ECHO) "package sun.awt.X11;" >> $$classname ; \ - $(ECHO) "public class XAWTIcon64_$$name {" >> $$classname; \ - $(ECHO) "public static long[] $$name = { " >> $$classname; \ - $(CAT) $$i | \ - $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ - -Djava.awt.headless=true \ - sun.awt.X11.ToBin >> $$classname; \ - $(ECHO) "}; }" >> $$classname; \ - done - $(TOUCH) $@ clean clobber:: generated.clean diff -r d9291e4158bb -r 3b50cd01c2d2 make/sun/xawt/ToBin.java --- a/make/sun/xawt/ToBin.java Wed May 22 17:42:12 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code 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 - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package sun.awt.X11; - -import java.io.*; -import java.awt.image.*; -import javax.imageio.*; -import java.awt.*; - -public class ToBin { - public static void main(String[] args) throws Exception { - BufferedImage im = ImageIO.read(System.in); - BufferedImage bi = null; - int iconWidth = im.getWidth(null); - int iconHeight = im.getHeight(null); - if (im != null && iconHeight != 0 && iconWidth != 0) { - bi = new BufferedImage(iconWidth, iconHeight, BufferedImage.TYPE_INT_ARGB); - Graphics g = bi.getGraphics(); - try { - g.drawImage(im, 0, 0, iconWidth, iconHeight, null); - } finally { - g.dispose(); - } - } - DataBuffer srcBuf = bi.getData().getDataBuffer(); - int[] buf = ((DataBufferInt)srcBuf).getData(); - System.out.print(iconWidth + ","); - System.out.println(iconHeight + ","); - for (int i = 0; i < buf.length; i++) { - System.out.print("0x" + Integer.toHexString(buf[i]) + ", "); - if (i % 10 == 0) { - System.out.println(); - } - } - } -} diff -r d9291e4158bb -r 3b50cd01c2d2 src/macosx/classes/sun/java2d/opengl/CGLLayer.java --- a/src/macosx/classes/sun/java2d/opengl/CGLLayer.java Wed May 22 17:42:12 2013 +0100 +++ b/src/macosx/classes/sun/java2d/opengl/CGLLayer.java Tue Jun 18 14:04:33 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -72,7 +72,7 @@ } public int getTransparency() { - return (peer.isOpaque() ? Transparency.OPAQUE : Transparency.TRANSLUCENT); + return (isOpaque() ? Transparency.OPAQUE : Transparency.TRANSLUCENT); } public Object getDestination() { @@ -80,14 +80,14 @@ } public SurfaceData replaceSurfaceData() { - if (peer.getBounds().isEmpty()) { + if (getBounds().isEmpty()) { surfaceData = NullSurfaceData.theInstance; return surfaceData; From bugzilla-daemon at icedtea.classpath.org Wed Jun 19 06:11:58 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 19 Jun 2013 13:11:58 +0000 Subject: [Bug 1482] New: Property access fails when JNLP is remote, works when local Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1482 Bug ID: 1482 Summary: Property access fails when JNLP is remote, works when local Classification: Unclassified Product: IcedTea-Web Version: unspecified Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P3 Component: NetX (javaws) Assignee: omajid at redhat.com Reporter: aleksi.kallio at csc.fi CC: unassigned at icedtea.classpath.org I have an application that reads system property "user.home" and sets another property based on that (to dynamically set Log4j logging dir). This fails with IcedTea-web on remote JNLP files. The property I am setting ends up empty and Log4j tries to log to the filesystem root, which gives naturally "permission denied". If the file is downloaded and codebase/href updated to local, then it starts to work. It also works on Oracle JRE javaws. The applications has "all-permissions" and the JAR is signed with a trusted certificate. So is there something funny happening in security manager when properties are being accessed? The local version of JNLP looks like this: $ cat chipster-local.jnlp Chipster client -config http://chipster.csc.fi/chipster-config.xml -module fi.csc.microarray.module.chipster.MicroarrayModule The only difference between normal (remote) and local is: $ diff chipster.jnlp chipster-local.jnlp 2c2 < --- > And the end result of using these is: $ javaws chipster-local.jnlp => WORKS $ javaws chipster.jnlp => FAILS $ javaws http://chipster.csc.fi/chipster.jnlp => FAILS (also downloading the JAR and doing "java -jar" works) -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130619/d3e7c503/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Jun 19 06:34:57 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 19 Jun 2013 13:34:57 +0000 Subject: [Bug 1482] Property access fails when JNLP is remote, works when local In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1482 Adam Domurad changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |adomurad at redhat.com Assignee|omajid at redhat.com |aazores at redhat.com -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130619/d223c47f/attachment.html From jvanek at redhat.com Wed Jun 19 06:52:38 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 19 Jun 2013 15:52:38 +0200 Subject: [rfc] [icedtea-web] head, 1.4, 1.3, 1.2 - broken by last CPU Message-ID: <51C1B7A6.80908@redhat.com> Hi! One of the recent fixes to openjdk - 8004584.patch.jdk - have removed potentionaly dangerous retriving of application context: public AppletSecurity() { reset(); - mainAppContext = AppContext.getAppContext(); } By this itw stopped working. I have started with simple patch yesterday morning, Adam continued in his timezone and me back today ... merged result is attached:) Thanx! J. -------------- next part -------------- diff -r 1a327a09262e netx/net/sourceforge/jnlp/runtime/Boot.java --- a/netx/net/sourceforge/jnlp/runtime/Boot.java Mon Jun 10 13:22:53 2013 +0200 +++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Wed Jun 19 10:32:32 2013 +0200 @@ -35,6 +35,8 @@ import net.sourceforge.jnlp.cache.UpdatePolicy; import net.sourceforge.jnlp.security.viewer.CertificateViewer; import net.sourceforge.jnlp.services.ServiceUtil; +import sun.awt.AppContext; +import sun.awt.SunToolkit; /** * This is the main entry point for the JNLP client. The main @@ -113,6 +115,9 @@ * Launch the JNLP file specified by the command-line arguments. */ public static void main(String[] argsIn) { + if (AppContext.getAppContext() == null) { + SunToolkit.createNewAppContext(); + } args = argsIn; if (null != getOption("-viewer")) { diff -r 1a327a09262e netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Mon Jun 10 13:22:53 2013 +0200 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Wed Jun 19 10:32:32 2013 +0200 @@ -234,7 +234,7 @@ try { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (Exception e) { - // ignore it + e.printStackTrace(); } doMainAppContextHacks(); diff -r 1a327a09262e plugin/icedteanp/java/sun/applet/PluginMain.java --- a/plugin/icedteanp/java/sun/applet/PluginMain.java Mon Jun 10 13:22:53 2013 +0200 +++ b/plugin/icedteanp/java/sun/applet/PluginMain.java Wed Jun 19 10:32:32 2013 +0200 @@ -72,6 +72,8 @@ import java.net.ProxySelector; import java.util.Enumeration; import java.util.Properties; +import sun.awt.AppContext; +import sun.awt.SunToolkit; import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.runtime.JNLPRuntime; @@ -94,6 +96,9 @@ */ public static void main(String args[]) throws IOException { + if (AppContext.getAppContext() == null) { + SunToolkit.createNewAppContext(); + } if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) { System.err.println("Invalid pipe names provided. Refusing to proceed."); System.exit(1); From adomurad at redhat.com Wed Jun 19 07:08:30 2013 From: adomurad at redhat.com (Adam Domurad) Date: Wed, 19 Jun 2013 10:08:30 -0400 Subject: [rfc] [icedtea-web] head, 1.4, 1.3, 1.2 - broken by last CPU In-Reply-To: <51C1B7A6.80908@redhat.com> References: <51C1B7A6.80908@redhat.com> Message-ID: <51C1BB5E.1020307@redhat.com> On 06/19/2013 09:52 AM, Jiri Vanek wrote: > Hi! > > One of the recent fixes to openjdk - 8004584.patch.jdk - have removed > potentionaly dangerous retriving of application context: > > public AppletSecurity() { > reset(); > - mainAppContext = AppContext.getAppContext(); > } > > > By this itw stopped working. > > I have started with simple patch yesterday morning, Adam continued in > his timezone and me back today ... merged result is attached:) > > Thanx! > J. Yes looks good. Please do push to all branches. Thank you! -Adam From ptisnovs at icedtea.classpath.org Wed Jun 19 07:42:06 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 19 Jun 2013 14:42:06 +0000 Subject: /hg/gfx-test: Added stubs for another three new test suites. Message-ID: changeset 874dc662bb7d in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=874dc662bb7d author: Pavel Tisnovsky date: Wed Jun 19 16:45:32 2013 +0200 Added stubs for another three new test suites. diffstat: ChangeLog | 9 + Makefile | 6 + src/org/gfxtest/testsuites/BitBltAffineScaleTransformOp.java | 76 ++++++++++ src/org/gfxtest/testsuites/BitBltAffineShearTransformOp.java | 76 ++++++++++ src/org/gfxtest/testsuites/BitBltAffineTranslateTransformOp.java | 76 ++++++++++ 5 files changed, 243 insertions(+), 0 deletions(-) diffs (279 lines): diff -r 3b4f1b1e8451 -r 874dc662bb7d ChangeLog --- a/ChangeLog Tue Jun 18 14:10:38 2013 +0200 +++ b/ChangeLog Wed Jun 19 16:45:32 2013 +0200 @@ -1,3 +1,12 @@ +2013-06-19 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltAffineScaleTransformOp.java: + * src/org/gfxtest/testsuites/BitBltAffineShearTransformOp.java: + * src/org/gfxtest/testsuites/BitBltAffineTranslateTransformOp.java: + Added stubs for another three new test suites. + * Makefile: + Added new classes to compile and new tests to run. + 2013-06-18 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java: diff -r 3b4f1b1e8451 -r 874dc662bb7d Makefile --- a/Makefile Tue Jun 18 14:10:38 2013 +0200 +++ b/Makefile Wed Jun 19 16:45:32 2013 +0200 @@ -153,6 +153,9 @@ $(CLASSES)/$(TESTSUITE_DIR)/BitBltAffineIdentityTransformOp.class \ $(CLASSES)/$(TESTSUITE_DIR)/BitBltAffineQuadrantRotateTransformOp.class \ $(CLASSES)/$(TESTSUITE_DIR)/BitBltAffineRotateTransformOp.class \ + $(CLASSES)/$(TESTSUITE_DIR)/BitBltAffineScaleTransformOp.class \ + $(CLASSES)/$(TESTSUITE_DIR)/BitBltAffineShearTransformOp.class \ + $(CLASSES)/$(TESTSUITE_DIR)/BitBltAffineTranslateTransformOp.class \ $(CLASSES)/$(TESTSUITE_DIR)/BitBltColorConvertOp.class \ $(CLASSES)/$(TESTSUITE_DIR)/BitBltConvolveOp.class \ $(CLASSES)/$(TESTSUITE_DIR)/BitBltCustomOp.class \ @@ -262,6 +265,9 @@ $(RESULTS)/BitBltAffineIdentityTransformOp \ $(RESULTS)/BitBltAffineQuadrantRotateTransformOp \ $(RESULTS)/BitBltAffineRotateTransformOp \ + $(RESULTS)/BitBltAffineScaleTransformOp \ + $(RESULTS)/BitBltAffineShearTransformOp \ + $(RESULTS)/BitBltAffineTranslateTransformOp \ $(RESULTS)/BitBltColorConvertOp \ $(RESULTS)/BitBltConvolveOp \ $(RESULTS)/BitBltCustomOp \ diff -r 3b4f1b1e8451 -r 874dc662bb7d src/org/gfxtest/testsuites/BitBltAffineScaleTransformOp.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/testsuites/BitBltAffineScaleTransformOp.java Wed Jun 19 16:45:32 2013 +0200 @@ -0,0 +1,76 @@ +/* + Java gfx-test framework + + Copyright (C) 2013 Red Hat + +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. +*/ + +package org.gfxtest.testsuites; + +import org.gfxtest.framework.GfxTest; +import org.gfxtest.framework.annotations.BitBltOperation; +import org.gfxtest.framework.annotations.BitBltOperations; +import org.gfxtest.framework.annotations.GraphicsPrimitive; +import org.gfxtest.framework.annotations.GraphicsPrimitives; +import org.gfxtest.framework.annotations.RenderStyle; +import org.gfxtest.framework.annotations.RenderStyles; +import org.gfxtest.framework.annotations.TestType; +import org.gfxtest.framework.annotations.TestTypes; +import org.gfxtest.framework.annotations.Transformation; +import org.gfxtest.framework.annotations.Transformations; +import org.gfxtest.framework.annotations.Zoom; + + + + at TestType(TestTypes.RENDER_TEST) + at GraphicsPrimitive(GraphicsPrimitives.COMMON_BITMAP) + at RenderStyle(RenderStyles.NORMAL) + at BitBltOperation(BitBltOperations.BITBLT) + at Transformation(Transformations.SCALE) + at Zoom(1) +public class BitBltAffineScaleTransformOp extends GfxTest +{ + /** + * Entry point to the test suite. + * + * @param args not used in this case + */ + public static void main(String[] args) + { + new BitBltAffineScaleTransformOp().runTestSuite(args); + } + +} diff -r 3b4f1b1e8451 -r 874dc662bb7d src/org/gfxtest/testsuites/BitBltAffineShearTransformOp.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/testsuites/BitBltAffineShearTransformOp.java Wed Jun 19 16:45:32 2013 +0200 @@ -0,0 +1,76 @@ +/* + Java gfx-test framework + + Copyright (C) 2013 Red Hat + +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. +*/ + +package org.gfxtest.testsuites; + +import org.gfxtest.framework.GfxTest; +import org.gfxtest.framework.annotations.BitBltOperation; +import org.gfxtest.framework.annotations.BitBltOperations; +import org.gfxtest.framework.annotations.GraphicsPrimitive; +import org.gfxtest.framework.annotations.GraphicsPrimitives; +import org.gfxtest.framework.annotations.RenderStyle; +import org.gfxtest.framework.annotations.RenderStyles; +import org.gfxtest.framework.annotations.TestType; +import org.gfxtest.framework.annotations.TestTypes; +import org.gfxtest.framework.annotations.Transformation; +import org.gfxtest.framework.annotations.Transformations; +import org.gfxtest.framework.annotations.Zoom; + + + + at TestType(TestTypes.RENDER_TEST) + at GraphicsPrimitive(GraphicsPrimitives.COMMON_BITMAP) + at RenderStyle(RenderStyles.NORMAL) + at BitBltOperation(BitBltOperations.BITBLT) + at Transformation(Transformations.SKEW) + at Zoom(1) +public class BitBltAffineShearTransformOp extends GfxTest +{ + /** + * Entry point to the test suite. + * + * @param args not used in this case + */ + public static void main(String[] args) + { + new BitBltAffineShearTransformOp().runTestSuite(args); + } + +} diff -r 3b4f1b1e8451 -r 874dc662bb7d src/org/gfxtest/testsuites/BitBltAffineTranslateTransformOp.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/testsuites/BitBltAffineTranslateTransformOp.java Wed Jun 19 16:45:32 2013 +0200 @@ -0,0 +1,76 @@ +/* + Java gfx-test framework + + Copyright (C) 2013 Red Hat + +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. +*/ + +package org.gfxtest.testsuites; + +import org.gfxtest.framework.GfxTest; +import org.gfxtest.framework.annotations.BitBltOperation; +import org.gfxtest.framework.annotations.BitBltOperations; +import org.gfxtest.framework.annotations.GraphicsPrimitive; +import org.gfxtest.framework.annotations.GraphicsPrimitives; +import org.gfxtest.framework.annotations.RenderStyle; +import org.gfxtest.framework.annotations.RenderStyles; +import org.gfxtest.framework.annotations.TestType; +import org.gfxtest.framework.annotations.TestTypes; +import org.gfxtest.framework.annotations.Transformation; +import org.gfxtest.framework.annotations.Transformations; +import org.gfxtest.framework.annotations.Zoom; + + + + at TestType(TestTypes.RENDER_TEST) + at GraphicsPrimitive(GraphicsPrimitives.COMMON_BITMAP) + at RenderStyle(RenderStyles.NORMAL) + at BitBltOperation(BitBltOperations.BITBLT) + at Transformation(Transformations.TRANSLATE) + at Zoom(1) +public class BitBltAffineTranslateTransformOp extends GfxTest +{ + /** + * Entry point to the test suite. + * + * @param args not used in this case + */ + public static void main(String[] args) + { + new BitBltAffineTranslateTransformOp().runTestSuite(args); + } + +} From ptisnovs at icedtea.classpath.org Wed Jun 19 07:47:19 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 19 Jun 2013 14:47:19 +0000 Subject: /hg/rhino-tests: Updated four tests in SimpleBindingsClassTest f... Message-ID: changeset 5f4e9220c8a0 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=5f4e9220c8a0 author: Pavel Tisnovsky date: Wed Jun 19 16:50:46 2013 +0200 Updated four tests in SimpleBindingsClassTest for (Open)JDK8 API: getMethod, getMethods, getDeclaredMethod and getDeclaredMethods. diffstat: ChangeLog | 6 + src/org/RhinoTests/SimpleBindingsClassTest.java | 138 +++++++++++++++++++++++- 2 files changed, 140 insertions(+), 4 deletions(-) diffs (196 lines): diff -r 620b718077c0 -r 5f4e9220c8a0 ChangeLog --- a/ChangeLog Tue Jun 18 14:24:02 2013 +0200 +++ b/ChangeLog Wed Jun 19 16:50:46 2013 +0200 @@ -1,3 +1,9 @@ +2013-06-19 Pavel Tisnovsky + + * src/org/RhinoTests/SimpleBindingsClassTest.java: + Updated four tests in SimpleBindingsClassTest for (Open)JDK8 API: + getMethod, getMethods, getDeclaredMethod and getDeclaredMethods. + 2013-06-18 Pavel Tisnovsky * src/org/RhinoTests/ScriptExceptionClassTest.java: diff -r 620b718077c0 -r 5f4e9220c8a0 src/org/RhinoTests/SimpleBindingsClassTest.java --- a/src/org/RhinoTests/SimpleBindingsClassTest.java Tue Jun 18 14:24:02 2013 +0200 +++ b/src/org/RhinoTests/SimpleBindingsClassTest.java Wed Jun 19 16:50:46 2013 +0200 @@ -696,6 +696,31 @@ "public void javax.script.SimpleBindings.putAll(java.util.Map)", }; + final String[] methodsThatShouldExist_jdk8 = { + "public boolean java.lang.Object.equals(java.lang.Object)", + "public boolean javax.script.SimpleBindings.containsKey(java.lang.Object)", + "public boolean javax.script.SimpleBindings.containsValue(java.lang.Object)", + "public boolean javax.script.SimpleBindings.isEmpty()", + "public final native java.lang.Class java.lang.Object.getClass()", + "public final native void java.lang.Object.notify()", + "public final native void java.lang.Object.notifyAll()", + "public final native void java.lang.Object.wait(long) throws java.lang.InterruptedException", + "public final void java.lang.Object.wait() throws java.lang.InterruptedException", + "public final void java.lang.Object.wait(long,int) throws java.lang.InterruptedException", + "public int javax.script.SimpleBindings.size()", + "public java.lang.Object javax.script.SimpleBindings.get(java.lang.Object)", + "public java.lang.Object javax.script.SimpleBindings.put(java.lang.Object,java.lang.Object)", + "public java.lang.Object javax.script.SimpleBindings.put(java.lang.String,java.lang.Object)", + "public java.lang.Object javax.script.SimpleBindings.remove(java.lang.Object)", + "public java.lang.String java.lang.Object.toString()", + "public java.util.Collection javax.script.SimpleBindings.values()", + "public java.util.Set javax.script.SimpleBindings.entrySet()", + "public java.util.Set javax.script.SimpleBindings.keySet()", + "public native int java.lang.Object.hashCode()", + "public void javax.script.SimpleBindings.clear()", + "public void javax.script.SimpleBindings.putAll(java.util.Map)", + }; + // get all inherited methods Method[] methods = this.simpleBindingsClass.getMethods(); // and transform the array into a list of method names @@ -703,7 +728,20 @@ for (Method method : methods) { methodsAsString.add(method.toString()); } - String[] methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + + String[] methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } + // check if all required methods really exists for (String methodThatShouldExists : methodsThatShouldExist) { assertTrue(methodsAsString.contains(methodThatShouldExists), @@ -750,6 +788,23 @@ "public void javax.script.SimpleBindings.putAll(java.util.Map)", }; + final String[] declaredMethodsThatShouldExist_jdk8 = { + "private void javax.script.SimpleBindings.checkKey(java.lang.Object)", + "public boolean javax.script.SimpleBindings.containsKey(java.lang.Object)", + "public boolean javax.script.SimpleBindings.containsValue(java.lang.Object)", + "public boolean javax.script.SimpleBindings.isEmpty()", + "public int javax.script.SimpleBindings.size()", + "public java.lang.Object javax.script.SimpleBindings.get(java.lang.Object)", + "public java.lang.Object javax.script.SimpleBindings.put(java.lang.Object,java.lang.Object)", + "public java.lang.Object javax.script.SimpleBindings.put(java.lang.String,java.lang.Object)", + "public java.lang.Object javax.script.SimpleBindings.remove(java.lang.Object)", + "public java.util.Collection javax.script.SimpleBindings.values()", + "public java.util.Set javax.script.SimpleBindings.entrySet()", + "public java.util.Set javax.script.SimpleBindings.keySet()", + "public void javax.script.SimpleBindings.clear()", + "public void javax.script.SimpleBindings.putAll(java.util.Map)", + }; + // get all declared methods Method[] declaredMethods = this.simpleBindingsClass.getDeclaredMethods(); // and transform the array into a list of method names @@ -757,7 +812,20 @@ for (Method method : declaredMethods) { methodsAsString.add(method.toString()); } - String[] declaredMethodsThatShouldExist = getJavaVersion() < 7 ? declaredMethodsThatShouldExist_jdk6 : declaredMethodsThatShouldExist_jdk7; + + String[] declaredMethodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk6; + break; + case 7: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk7; + break; + case 8: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk8; + break; + } + // check if all required methods really exists for (String methodThatShouldExists : declaredMethodsThatShouldExist) { assertTrue(methodsAsString.contains(methodThatShouldExists), @@ -818,7 +886,42 @@ methodsThatShouldExist_jdk7.put("notify", new Class[] {}); methodsThatShouldExist_jdk7.put("notifyAll", new Class[] {}); - Map methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + Map methodsThatShouldExist_jdk8 = new TreeMap(); + methodsThatShouldExist_jdk8.put("remove", new Class[] {java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("get", new Class[] {java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("put", new Class[] {java.lang.String.class, java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("put", new Class[] {java.lang.Object.class, java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("values", new Class[] {}); + methodsThatShouldExist_jdk8.put("clear", new Class[] {}); + methodsThatShouldExist_jdk8.put("isEmpty", new Class[] {}); + methodsThatShouldExist_jdk8.put("size", new Class[] {}); + methodsThatShouldExist_jdk8.put("entrySet", new Class[] {}); + methodsThatShouldExist_jdk8.put("putAll", new Class[] {java.util.Map.class}); + methodsThatShouldExist_jdk8.put("keySet", new Class[] {}); + methodsThatShouldExist_jdk8.put("containsValue", new Class[] {java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("containsKey", new Class[] {java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("wait", new Class[] {long.class, int.class}); + methodsThatShouldExist_jdk8.put("wait", new Class[] {long.class}); + methodsThatShouldExist_jdk8.put("wait", new Class[] {}); + methodsThatShouldExist_jdk8.put("equals", new Class[] {java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("toString", new Class[] {}); + methodsThatShouldExist_jdk8.put("hashCode", new Class[] {}); + methodsThatShouldExist_jdk8.put("getClass", new Class[] {}); + methodsThatShouldExist_jdk8.put("notify", new Class[] {}); + methodsThatShouldExist_jdk8.put("notifyAll", new Class[] {}); + + Map methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } // check if all required methods really exist for (Map.Entry methodThatShouldExists : methodsThatShouldExist.entrySet()) { @@ -876,7 +979,34 @@ methodsThatShouldExist_jdk7.put("containsKey", new Class[] {java.lang.Object.class}); methodsThatShouldExist_jdk7.put("containsValue", new Class[] {java.lang.Object.class}); - Map methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + Map methodsThatShouldExist_jdk8 = new TreeMap(); + methodsThatShouldExist_jdk8.put("remove", new Class[] {java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("get", new Class[] {java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("put", new Class[] {java.lang.String.class, java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("put", new Class[] {java.lang.Object.class, java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("values", new Class[] {}); + methodsThatShouldExist_jdk8.put("clear", new Class[] {}); + methodsThatShouldExist_jdk8.put("isEmpty", new Class[] {}); + methodsThatShouldExist_jdk8.put("size", new Class[] {}); + methodsThatShouldExist_jdk8.put("entrySet", new Class[] {}); + methodsThatShouldExist_jdk8.put("putAll", new Class[] {java.util.Map.class}); + methodsThatShouldExist_jdk8.put("checkKey", new Class[] {java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("keySet", new Class[] {}); + methodsThatShouldExist_jdk8.put("containsValue", new Class[] {java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("containsKey", new Class[] {java.lang.Object.class}); + + Map methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } // check if all required methods really exist for (Map.Entry methodThatShouldExists : methodsThatShouldExist.entrySet()) { From omajid at redhat.com Wed Jun 19 07:56:16 2013 From: omajid at redhat.com (Omair Majid) Date: Wed, 19 Jun 2013 10:56:16 -0400 Subject: [ANNOUNCE] IcedTea-Web breaks with latest OpenJDK security release Message-ID: <51C1C690.8000807@redhat.com> Hi, All known releases of IcedTea-Web stop working when the latest OpenJDK security update is installed. This is caused by the changes in AppContext-related code introduced by the OpenJDK security update. A patch to make sure IcedTea-Web continues working has been posted [1]. Please apply it to your builds to make sure IcedTea-Web continues working. We will try and get a new release out soon to address this and any other problems we discover. Thanks, Omair [1] http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-June/023745.html From henrik at kaarposoft.dk Thu Jun 20 01:30:04 2013 From: henrik at kaarposoft.dk (Henrik /KaarPoSoft) Date: Thu, 20 Jun 2013 10:30:04 +0200 Subject: Problems building IcedTea with clang Message-ID: <51C2BD8C.2030406@kaarposoft.dk> Dear all, I have build IcedTea 2.4.0 with gcc 4.7.2 without problems. However, building fails with clang 3.2. Before digging myself into debugging this, I would like to reach out to you on this list for any insights you may have on the issue. I can hardly think I am the first one to try building IcedTea with clang... To build with clang I use the same build script as for gcc, but start with: CC="clang"; export CC CXX="clang++"; export CXX The build starts as expected, and it seems that clang is indeed being used as the compiler. However, building fails with non-void function 'getDefaultScopeID' should return a value [-Wreturn-type] in src/solaris/native/java/net/net_util_md.c:117:9 (the relevant part of the log is attached). In net_util_md.c:117 we have a CHECK_NULL which expands to "if ((x) == NULL) return;" which is problematic as it is a return without value inside a non-void function. If I understand correctly, this is not allowed in c99. So I tried CC="clang -std=gnu89"; export CC CXX="clang++ -std=gnu89"; export CXX but this also fails in the same way (log attached). I could of course patch this manually, but I am fearing that I will run into many more such issues in an uphill battle. So: Has anyone build IcedTea 2.4.0 with clang 3.2 ? Or maybe with some other version combination ? Any hints would be most appreciated! /Henrik -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea7.log Type: text/x-log Size: 2628 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130620/f8fb1247/icedtea7.log -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea7_gnu89.log Type: text/x-log Size: 2639 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130620/f8fb1247/icedtea7_gnu89.log From ptisnovs at icedtea.classpath.org Thu Jun 20 02:08:01 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 20 Jun 2013 09:08:01 +0000 Subject: /hg/gfx-test: Ten new tests added into BitBltUsingBgColor test s... Message-ID: changeset 6be1d654c48d in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=6be1d654c48d author: Pavel Tisnovsky date: Thu Jun 20 11:11:32 2013 +0200 Ten new tests added into BitBltUsingBgColor test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 156 +++++++++++++++++++++ 2 files changed, 161 insertions(+), 0 deletions(-) diffs (185 lines): diff -r 874dc662bb7d -r 6be1d654c48d ChangeLog --- a/ChangeLog Wed Jun 19 16:45:32 2013 +0200 +++ b/ChangeLog Thu Jun 20 11:11:32 2013 +0200 @@ -1,3 +1,8 @@ +2013-06-20 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Ten new tests added into BitBltUsingBgColor test suite. + 2013-06-19 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltAffineScaleTransformOp.java: diff -r 874dc662bb7d -r 6be1d654c48d src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Wed Jun 19 16:45:32 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Thu Jun 20 11:11:32 2013 +0200 @@ -694,6 +694,57 @@ } /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_USHORT_555_RGB + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltDiagonalCheckerBufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_USHORT_565_RGB + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltDiagonalCheckerBufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_USHORT_GRAY + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltDiagonalCheckerBufferedImageTypeUshortGRAY(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY, backgroundColor); + } + + /** * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. * Background color is set to Color.black. * @@ -2254,6 +2305,111 @@ } /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.black. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.blue. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.green. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.cyan. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.red. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.magenta. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.yellow. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.yellow); + } + + /** * Entry point to the test suite. * * @param args not used in this case From ptisnovs at icedtea.classpath.org Thu Jun 20 02:13:49 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 20 Jun 2013 09:13:49 +0000 Subject: /hg/rhino-tests: Small updates in getAnnotation and getAnnotatio... Message-ID: changeset 005b996d98c9 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=005b996d98c9 author: Pavel Tisnovsky date: Thu Jun 20 11:17:20 2013 +0200 Small updates in getAnnotation and getAnnotations tests in ScriptEngineManagerClassTest. diffstat: ChangeLog | 5 ++ src/org/RhinoTests/ScriptEngineManagerClassTest.java | 36 ++++++++++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diffs (79 lines): diff -r 5f4e9220c8a0 -r 005b996d98c9 ChangeLog --- a/ChangeLog Wed Jun 19 16:50:46 2013 +0200 +++ b/ChangeLog Thu Jun 20 11:17:20 2013 +0200 @@ -1,3 +1,8 @@ +2013-06-20 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptEngineManagerClassTest.java: + Small updates in getAnnotation and getAnnotations tests. + 2013-06-19 Pavel Tisnovsky * src/org/RhinoTests/SimpleBindingsClassTest.java: diff -r 5f4e9220c8a0 -r 005b996d98c9 src/org/RhinoTests/ScriptEngineManagerClassTest.java --- a/src/org/RhinoTests/ScriptEngineManagerClassTest.java Wed Jun 19 16:50:46 2013 +0200 +++ b/src/org/RhinoTests/ScriptEngineManagerClassTest.java Thu Jun 20 11:17:20 2013 +0200 @@ -1074,6 +1074,9 @@ final String[] annotationsThatShouldExists_jdk7 = { }; + final String[] annotationsThatShouldExists_jdk8 = { + }; + // get all annotations Annotation[] annotations = this.scriptEngineManagerClass.getAnnotations(); // and transform the array into a list of annotation names @@ -1081,7 +1084,20 @@ for (Annotation annotation : annotations) { annotationsAsString.add(annotation.toString()); } - String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + + String[] annotationsThatShouldExists = null; + switch (getJavaVersion()) { + case 6: + annotationsThatShouldExists = annotationsThatShouldExists_jdk6; + break; + case 7: + annotationsThatShouldExists = annotationsThatShouldExists_jdk7; + break; + case 8: + annotationsThatShouldExists = annotationsThatShouldExists_jdk8; + break; + } + // check if all required annotations really exists for (String annotationThatShouldExists : annotationsThatShouldExists) { assertTrue(annotationsAsString.contains(annotationThatShouldExists), @@ -1100,6 +1116,9 @@ final String[] annotationsThatShouldExists_jdk7 = { }; + final String[] annotationsThatShouldExists_jdk8 = { + }; + // get all annotations Annotation[] annotations = this.scriptEngineManagerClass.getDeclaredAnnotations(); // and transform the array into a list of annotation names @@ -1107,7 +1126,20 @@ for (Annotation annotation : annotations) { annotationsAsString.add(annotation.toString()); } - String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + + String[] annotationsThatShouldExists = null; + switch (getJavaVersion()) { + case 6: + annotationsThatShouldExists = annotationsThatShouldExists_jdk6; + break; + case 7: + annotationsThatShouldExists = annotationsThatShouldExists_jdk7; + break; + case 8: + annotationsThatShouldExists = annotationsThatShouldExists_jdk8; + break; + } + // check if all required annotations really exists for (String annotationThatShouldExists : annotationsThatShouldExists) { assertTrue(annotationsAsString.contains(annotationThatShouldExists), From jvanek at icedtea.classpath.org Thu Jun 20 06:21:21 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 20 Jun 2013 13:21:21 +0000 Subject: /hg/icedtea-web: Made it work with OpenJDK build 25 by creating ... Message-ID: changeset 2469bedc6d63 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=2469bedc6d63 author: Jiri Vanek date: Thu Jun 20 15:20:57 2013 +0200 Made it work with OpenJDK build 25 by creating application as soon as possible diffstat: ChangeLog | 10 ++++++++++ netx/net/sourceforge/jnlp/runtime/Boot.java | 5 +++++ netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 2 +- plugin/icedteanp/java/sun/applet/PluginMain.java | 5 +++++ 4 files changed, 21 insertions(+), 1 deletions(-) diffs (73 lines): diff -r fa6a80c73e0d -r 2469bedc6d63 ChangeLog --- a/ChangeLog Tue Jun 18 15:57:01 2013 -0400 +++ b/ChangeLog Thu Jun 20 15:20:57 2013 +0200 @@ -1,3 +1,13 @@ +2013-06-20 Jiri Vanek + + Made it work with OpenJDK build 25 + * netx/net/sourceforge/jnlp/runtime/Boot.java: (main) + Application context created as soon as possible + * plugin/icedteanp/java/sun/applet/PluginMain.java:(main) + Application context created as soon as possible + * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: Do not consume + exception after setLookAndFeel. + 2013-06-18 Andrew Azores * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: diff -r fa6a80c73e0d -r 2469bedc6d63 netx/net/sourceforge/jnlp/runtime/Boot.java --- a/netx/net/sourceforge/jnlp/runtime/Boot.java Tue Jun 18 15:57:01 2013 -0400 +++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Thu Jun 20 15:20:57 2013 +0200 @@ -35,6 +35,8 @@ import net.sourceforge.jnlp.cache.UpdatePolicy; import net.sourceforge.jnlp.security.viewer.CertificateViewer; import net.sourceforge.jnlp.services.ServiceUtil; +import sun.awt.AppContext; +import sun.awt.SunToolkit; /** * This is the main entry point for the JNLP client. The main @@ -113,6 +115,9 @@ * Launch the JNLP file specified by the command-line arguments. */ public static void main(String[] argsIn) { + if (AppContext.getAppContext() == null) { + SunToolkit.createNewAppContext(); + } args = argsIn; if (null != getOption("-viewer")) { diff -r fa6a80c73e0d -r 2469bedc6d63 netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Tue Jun 18 15:57:01 2013 -0400 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Thu Jun 20 15:20:57 2013 +0200 @@ -234,7 +234,7 @@ try { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (Exception e) { - // ignore it + e.printStackTrace(); } doMainAppContextHacks(); diff -r fa6a80c73e0d -r 2469bedc6d63 plugin/icedteanp/java/sun/applet/PluginMain.java --- a/plugin/icedteanp/java/sun/applet/PluginMain.java Tue Jun 18 15:57:01 2013 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginMain.java Thu Jun 20 15:20:57 2013 +0200 @@ -72,6 +72,8 @@ import java.net.ProxySelector; import java.util.Enumeration; import java.util.Properties; +import sun.awt.AppContext; +import sun.awt.SunToolkit; import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.runtime.JNLPRuntime; @@ -94,6 +96,9 @@ */ public static void main(String args[]) throws IOException { + if (AppContext.getAppContext() == null) { + SunToolkit.createNewAppContext(); + } if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) { System.err.println("Invalid pipe names provided. Refusing to proceed."); System.exit(1); From jvanek at icedtea.classpath.org Thu Jun 20 06:26:29 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 20 Jun 2013 13:26:29 +0000 Subject: /hg/release/icedtea-web-1.4: Made it work with OpenJDK build 25 ... Message-ID: changeset b1b17bb14ab0 in /hg/release/icedtea-web-1.4 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=b1b17bb14ab0 author: Jiri Vanek date: Thu Jun 20 15:26:14 2013 +0200 Made it work with OpenJDK build 25 by creating application as soon as possible diffstat: ChangeLog | 10 ++++++++++ netx/net/sourceforge/jnlp/runtime/Boot.java | 5 +++++ netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 2 +- plugin/icedteanp/java/sun/applet/PluginMain.java | 5 +++++ 4 files changed, 21 insertions(+), 1 deletions(-) diffs (73 lines): diff -r adaba1e22d66 -r b1b17bb14ab0 ChangeLog --- a/ChangeLog Fri Jun 07 16:05:13 2013 -0400 +++ b/ChangeLog Thu Jun 20 15:26:14 2013 +0200 @@ -1,3 +1,13 @@ +2013-06-20 Jiri Vanek + + Made it work with OpenJDK build 25 + * netx/net/sourceforge/jnlp/runtime/Boot.java: (main) + Application context created as soon as possible + * plugin/icedteanp/java/sun/applet/PluginMain.java:(main) + Application context created as soon as possible + * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: Do not consume + exception after setLookAndFeel. + 2013-06-07 Adam Domurad Fix PR1465 diff -r adaba1e22d66 -r b1b17bb14ab0 netx/net/sourceforge/jnlp/runtime/Boot.java --- a/netx/net/sourceforge/jnlp/runtime/Boot.java Fri Jun 07 16:05:13 2013 -0400 +++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Thu Jun 20 15:26:14 2013 +0200 @@ -35,6 +35,8 @@ import net.sourceforge.jnlp.cache.UpdatePolicy; import net.sourceforge.jnlp.security.viewer.CertificateViewer; import net.sourceforge.jnlp.services.ServiceUtil; +import sun.awt.AppContext; +import sun.awt.SunToolkit; /** * This is the main entry point for the JNLP client. The main @@ -113,6 +115,9 @@ * Launch the JNLP file specified by the command-line arguments. */ public static void main(String[] argsIn) { + if (AppContext.getAppContext() == null) { + SunToolkit.createNewAppContext(); + } args = argsIn; if (null != getOption("-viewer")) { diff -r adaba1e22d66 -r b1b17bb14ab0 netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Fri Jun 07 16:05:13 2013 -0400 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Thu Jun 20 15:26:14 2013 +0200 @@ -234,7 +234,7 @@ try { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (Exception e) { - // ignore it + e.printStackTrace(); } doMainAppContextHacks(); diff -r adaba1e22d66 -r b1b17bb14ab0 plugin/icedteanp/java/sun/applet/PluginMain.java --- a/plugin/icedteanp/java/sun/applet/PluginMain.java Fri Jun 07 16:05:13 2013 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginMain.java Thu Jun 20 15:26:14 2013 +0200 @@ -72,6 +72,8 @@ import java.net.ProxySelector; import java.util.Enumeration; import java.util.Properties; +import sun.awt.AppContext; +import sun.awt.SunToolkit; import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.runtime.JNLPRuntime; @@ -94,6 +96,9 @@ */ public static void main(String args[]) throws IOException { + if (AppContext.getAppContext() == null) { + SunToolkit.createNewAppContext(); + } if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) { System.err.println("Invalid pipe names provided. Refusing to proceed."); System.exit(1); From jvanek at icedtea.classpath.org Thu Jun 20 06:27:32 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 20 Jun 2013 13:27:32 +0000 Subject: /hg/release/icedtea-web-1.3: Made it work with OpenJDK build 25 ... Message-ID: changeset e5e87b61a02d in /hg/release/icedtea-web-1.3 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.3?cmd=changeset;node=e5e87b61a02d author: Jiri Vanek date: Thu Jun 20 15:27:22 2013 +0200 Made it work with OpenJDK build 25 by creating application as soon as possible diffstat: ChangeLog | 10 ++++++++++ netx/net/sourceforge/jnlp/runtime/Boot.java | 5 +++++ netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 2 +- plugin/icedteanp/java/sun/applet/PluginMain.java | 5 +++++ 4 files changed, 21 insertions(+), 1 deletions(-) diffs (73 lines): diff -r 3c5e0952d876 -r e5e87b61a02d ChangeLog --- a/ChangeLog Thu Jun 06 17:09:54 2013 +0200 +++ b/ChangeLog Thu Jun 20 15:27:22 2013 +0200 @@ -1,3 +1,13 @@ +2013-06-20 Jiri Vanek + + Made it work with OpenJDK build 25 + * netx/net/sourceforge/jnlp/runtime/Boot.java: (main) + Application context created as soon as possible + * plugin/icedteanp/java/sun/applet/PluginMain.java:(main) + Application context created as soon as possible + * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: Do not consume + exception after setLookAndFeel. + 2013-06-06 Jiri Vanek Made all tests running wit junit4.10 and higher diff -r 3c5e0952d876 -r e5e87b61a02d netx/net/sourceforge/jnlp/runtime/Boot.java --- a/netx/net/sourceforge/jnlp/runtime/Boot.java Thu Jun 06 17:09:54 2013 +0200 +++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Thu Jun 20 15:27:22 2013 +0200 @@ -35,6 +35,8 @@ import net.sourceforge.jnlp.cache.UpdatePolicy; import net.sourceforge.jnlp.security.viewer.CertificateViewer; import net.sourceforge.jnlp.services.ServiceUtil; +import sun.awt.AppContext; +import sun.awt.SunToolkit; /** * This is the main entry point for the JNLP client. The main @@ -113,6 +115,9 @@ * Launch the JNLP file specified by the command-line arguments. */ public static void main(String[] argsIn) { + if (AppContext.getAppContext() == null) { + SunToolkit.createNewAppContext(); + } args = argsIn; if (null != getOption("-viewer")) { diff -r 3c5e0952d876 -r e5e87b61a02d netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Thu Jun 06 17:09:54 2013 +0200 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Thu Jun 20 15:27:22 2013 +0200 @@ -233,7 +233,7 @@ try { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (Exception e) { - // ignore it + e.printStackTrace(); } doMainAppContextHacks(); diff -r 3c5e0952d876 -r e5e87b61a02d plugin/icedteanp/java/sun/applet/PluginMain.java --- a/plugin/icedteanp/java/sun/applet/PluginMain.java Thu Jun 06 17:09:54 2013 +0200 +++ b/plugin/icedteanp/java/sun/applet/PluginMain.java Thu Jun 20 15:27:22 2013 +0200 @@ -72,6 +72,8 @@ import java.net.ProxySelector; import java.util.Enumeration; import java.util.Properties; +import sun.awt.AppContext; +import sun.awt.SunToolkit; import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.runtime.JNLPRuntime; @@ -94,6 +96,9 @@ */ public static void main(String args[]) throws IOException { + if (AppContext.getAppContext() == null) { + SunToolkit.createNewAppContext(); + } if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) { System.err.println("Invalid pipe names provided. Refusing to proceed."); System.exit(1); From jvanek at icedtea.classpath.org Thu Jun 20 06:34:12 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 20 Jun 2013 13:34:12 +0000 Subject: /hg/release/icedtea-web-1.2: Made it work with OpenJDK build 25 ... Message-ID: changeset 55f0cf95f6aa in /hg/release/icedtea-web-1.2 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.2?cmd=changeset;node=55f0cf95f6aa author: Jiri Vanek date: Thu Jun 20 15:34:04 2013 +0200 Made it work with OpenJDK build 25 by creating application as soon as possible diffstat: ChangeLog | 10 ++++++++++ netx/net/sourceforge/jnlp/runtime/Boot.java | 5 +++++ netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 2 +- plugin/icedteanp/java/sun/applet/PluginMain.java | 5 +++++ 4 files changed, 21 insertions(+), 1 deletions(-) diffs (73 lines): diff -r 608e7e60cf31 -r 55f0cf95f6aa ChangeLog --- a/ChangeLog Wed Apr 17 10:07:27 2013 +0200 +++ b/ChangeLog Thu Jun 20 15:34:04 2013 +0200 @@ -1,3 +1,13 @@ +2013-06-20 Jiri Vanek + + Made it work with OpenJDK build 25 + * netx/net/sourceforge/jnlp/runtime/Boot.java: (main) + Application context created as soon as possible + * plugin/icedteanp/java/sun/applet/PluginMain.java:(main) + Application context created as soon as possible + * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: Do not consume + exception after setLookAndFeel. + 2013-04-11 Adam Domurad CVE-2013-1926, RH916774: Class-loader incorrectly shared for applets with diff -r 608e7e60cf31 -r 55f0cf95f6aa netx/net/sourceforge/jnlp/runtime/Boot.java --- a/netx/net/sourceforge/jnlp/runtime/Boot.java Wed Apr 17 10:07:27 2013 +0200 +++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Thu Jun 20 15:34:04 2013 +0200 @@ -35,6 +35,8 @@ import net.sourceforge.jnlp.cache.UpdatePolicy; import net.sourceforge.jnlp.security.viewer.CertificateViewer; import net.sourceforge.jnlp.services.ServiceUtil; +import sun.awt.AppContext; +import sun.awt.SunToolkit; /** * This is the main entry point for the JNLP client. The main @@ -113,6 +115,9 @@ * Launch the JNLP file specified by the command-line arguments. */ public static void main(String[] argsIn) { + if (AppContext.getAppContext() == null) { + SunToolkit.createNewAppContext(); + } args = argsIn; if (null != getOption("-viewer")) { diff -r 608e7e60cf31 -r 55f0cf95f6aa netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Wed Apr 17 10:07:27 2013 +0200 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Thu Jun 20 15:34:04 2013 +0200 @@ -240,7 +240,7 @@ try { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (Exception e) { - // ignore it + e.printStackTrace(); } doMainAppContextHacks(); diff -r 608e7e60cf31 -r 55f0cf95f6aa plugin/icedteanp/java/sun/applet/PluginMain.java --- a/plugin/icedteanp/java/sun/applet/PluginMain.java Wed Apr 17 10:07:27 2013 +0200 +++ b/plugin/icedteanp/java/sun/applet/PluginMain.java Thu Jun 20 15:34:04 2013 +0200 @@ -72,6 +72,8 @@ import java.net.ProxySelector; import java.util.Enumeration; import java.util.Properties; +import sun.awt.AppContext; +import sun.awt.SunToolkit; import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.runtime.JNLPRuntime; @@ -94,6 +96,9 @@ */ public static void main(String args[]) throws IOException { + if (AppContext.getAppContext() == null) { + SunToolkit.createNewAppContext(); + } if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) { System.err.println("Invalid pipe names provided. Refusing to proceed."); System.exit(1); From jvanek at redhat.com Thu Jun 20 07:03:11 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 20 Jun 2013 16:03:11 +0200 Subject: [rfc][icedtea-web] removal of Boot13 class Message-ID: <51C30B9F.3050400@redhat.com> Hi! This class should be synced (with boot) or deleted. My lazy part is for second opinion. And the reasonable part says there is no need to hold the lazy part back. J. -------------- next part -------------- A non-text attachment was scrubbed... Name: removedBoo13.patch Type: text/x-patch Size: 4736 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130620/f6a990c2/removedBoo13.patch From omajid at redhat.com Thu Jun 20 07:32:54 2013 From: omajid at redhat.com (Omair Majid) Date: Thu, 20 Jun 2013 10:32:54 -0400 Subject: [rfc][icedtea-web] removal of Boot13 class In-Reply-To: <51C30B9F.3050400@redhat.com> References: <51C30B9F.3050400@redhat.com> Message-ID: <51C31296.8060607@redhat.com> On 06/20/2013 10:03 AM, Jiri Vanek wrote: > Hi! > > This class should be synced (with boot) or deleted. My lazy part is for > second opinion. And the reasonable part says there is no need to hold > the lazy part back. Sounds okay to me. This class was provided for compatibility with Java 1.3, but not used as the default. From what I can tell, Sun's 1.3 JDK reached End-Of-Life in 2006. All OpenJDK versions should work with the 'standard' Boot class. Cheers, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From jvanek at icedtea.classpath.org Thu Jun 20 08:01:06 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 20 Jun 2013 15:01:06 +0000 Subject: /hg/icedtea-web: Removed out-of date Boot13 class Message-ID: changeset e09b9813d6de in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=e09b9813d6de author: Jiri Vanek date: Thu Jun 20 17:00:52 2013 +0200 Removed out-of date Boot13 class diffstat: ChangeLog | 6 + NEWS | 1 + netx/net/sourceforge/jnlp/runtime/Boot.java | 3 - netx/net/sourceforge/jnlp/runtime/Boot13.java | 98 --------------------------- 4 files changed, 7 insertions(+), 101 deletions(-) diffs (139 lines): diff -r 2469bedc6d63 -r e09b9813d6de ChangeLog --- a/ChangeLog Thu Jun 20 15:20:57 2013 +0200 +++ b/ChangeLog Thu Jun 20 17:00:52 2013 +0200 @@ -1,3 +1,9 @@ +2013-06-20 Jiri Vanek + + Removed out-of date support for jdk 1.5 and older + * netx/net/sourceforge/jnlp/runtime/Boot.java: removed memories to Boot13 + * netx/net/sourceforge/jnlp/runtime/Boot13.java: removed + 2013-06-20 Jiri Vanek Made it work with OpenJDK build 25 diff -r 2469bedc6d63 -r e09b9813d6de NEWS --- a/NEWS Thu Jun 20 15:20:57 2013 +0200 +++ b/NEWS Thu Jun 20 17:00:52 2013 +0200 @@ -9,6 +9,7 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY New in release 1.5 (2013-XX-XX): +* JDK older then 1.5 no longer supported * NetX - PR1465 - java.io.FileNotFoundException while trying to download a JAR file * Plugin diff -r 2469bedc6d63 -r e09b9813d6de netx/net/sourceforge/jnlp/runtime/Boot.java --- a/netx/net/sourceforge/jnlp/runtime/Boot.java Thu Jun 20 15:20:57 2013 +0200 +++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Thu Jun 20 17:00:52 2013 +0200 @@ -171,9 +171,6 @@ JNLPRuntime.setInitialArgments(Arrays.asList(argsIn)); - // do in a privileged action to clear the security context of - // the Boot13 class, which doesn't have any privileges in - // JRE1.3; JRE1.4 works without Boot13 or this PrivilegedAction. AccessController.doPrivileged(new Boot()); } diff -r 2469bedc6d63 -r e09b9813d6de netx/net/sourceforge/jnlp/runtime/Boot13.java --- a/netx/net/sourceforge/jnlp/runtime/Boot13.java Thu Jun 20 15:20:57 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,98 +0,0 @@ -// Copyright (C) 2001-2003 Jon A. Maxwell (JAM) -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library 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 -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -package net.sourceforge.jnlp.runtime; - -import java.lang.reflect.*; -import java.net.*; -import java.security.*; - -/** - * Allows a Policy and SecurityManager to be set in JRE1.3 without - * running the code with only applet permissions; this class is - * for backward compatibility only and is totally unnecessary if - * running in jdk 1.4 or later (can call Boot directly). - * - * @author Jon A. Maxwell (JAM) - initial author - * @version $Revision: 1.5 $ - */ -public class Boot13 extends URLClassLoader { - - // The problem with setting a Policy in jdk1.3 is that the - // system and application classes seem to be loaded in such a - // way that only their protection domain determines the - // permissions; the policy object is never asked for permissions - // after the class is loaded. This hack creates a classloader - // that loads duplicate versions of the classes in such a - // manner where they ask with the policy object. The jdk1.4 - // correctly honors the Policy object making this unneccessary - // post-1.3. - - private Boot13(URL source[]) { - super(source); - } - - protected PermissionCollection getPermissions(CodeSource source) { - Permissions result = new Permissions(); - result.add(new AllPermission()); - - return result; - } - - public Class loadClass(String name) throws ClassNotFoundException { - Class c = findLoadedClass(name); - if (c != null) - return c; - - // reverse the search order so that classes from this - // classloader, which sets the right permissions, are found - // before the parent classloader which has the same classes - // but the wrong permissions. - try { - return findClass(name); - } catch (ClassNotFoundException ex) { - } - - return getParent().loadClass(name); - } - - public static void main(final String args[]) throws Exception { - URL cs = Boot13.class.getProtectionDomain().getCodeSource().getLocation(); - // instead of using a custom loadClass search order, we could - // put the classes in a boot/ subdir of the JAR and load - // them from there. This would be an improvement by not - // allowing applications to get a duplicate jnlp engine (one - // with applet access permissions) by using the system - // classloader but a drawback by not allowing Boot to be - // called directly. - //cs = new URL("jar:"+cs+"!/boot/"); - - if (cs == null) { - System.err.println("fatal: cannot determine code source."); - System.exit(1); - } - - Boot13 b = new Boot13(new URL[] { cs }); - - Thread.currentThread().setContextClassLoader(b); // try to prevent getting the non-policy version of classes - - Class c = b.loadClass("net.sourceforge.jnlp.runtime.Boot"); - Method main = c.getDeclaredMethod("main", new Class[] { String[].class }); - - main.invoke(null, new Object[] { args }); - } - -} From jvanek at redhat.com Thu Jun 20 08:17:44 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 20 Jun 2013 17:17:44 +0200 Subject: Fwd: [rfc][icedtea-web] renewed tagsoup In-Reply-To: <51B5F346.4070106@redhat.com> References: <51ADE9CB.2090709@redhat.com> <51B5F346.4070106@redhat.com> Message-ID: <51C31D18.40908@redhat.com> On 06/10/2013 05:39 PM, Adam Domurad wrote: > On 06/04/2013 09:21 AM, Jiri Vanek wrote: >> attached missing attachment >> >> -------- Original Message -------- >> Subject: [rfc][icedtea-web] renewed tagsoup >> Date: Tue, 04 Jun 2013 15:18:40 +0200 >> From: Jiri Vanek >> To: IcedTea Distro List >> >> Again, I'm trying to reincarnate old Omair's tagsoup patch. >> As this was developed by Omair, then rewritten by Adam, and now by Me, I > > I wouldn't say I rewrote it. Thank for review anyway :) > >> think it is quite reviwed :) >> tests are adapted, and few added >> >> Ok for head? Some tests included. >> >> Also do not forget taht the results of this patch are visible only with >> tagsoup installed. Without it, or with -xml it behaves as normlay. >> (note, this will need to go to wiki) >> By the way the PR1026 is fixed by this, and there can come more >> >> I have already made quite deep testing, and some more testing will come, >> so please do not halt this for tests. Soem reproducers are in row. >> >> J. > > Thank you very much for doing this! > > We should collect what we could be fixed by this: > > 1. Mario noticed invalid XML warnings here: > > javaws http://docs.oracle.com/javase/tutorialJWS/uiswing/misc/ex7/GradientTranslucentWindowDemo.jnlp > Status: Still broken. Unfortunately tagsoup cannot fix this unclosed string. I wonder what if > anything we should do about this ? > > 2. From PR1026, applet at http://www.knuddels.de:8080/index.html?v=90aez&c=7 > Status: Now works (as you have noted) > > Actually I'm having trouble finding more. We should aim to support as much broken XML as there is > out there, so hopefully we have more than one confirmed fixed case before deciding to go this route. I believe there is not osu many of them. But they exists. I recently found my old one (but already fixed) > > > Comments inline: > >> diff -r 6209aba5fa14 NEWS >> --- a/NEWS Tue Jun 04 13:22:38 2013 +0200 >> +++ b/NEWS Tue Jun 04 14:46:38 2013 +0200 >> @@ -9,8 +9,10 @@ >> CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY >> >> New in release 1.5 (2013-XX-XX): >> +* IcedTea-Web now using tagsoup as default (tagsoup depndence) sanitizer for input > > [typo] depndence -> dependence fixed > >> * NetX >> - Netx can now parse malformed jnlp files using tagsoup > > Huh, why is this already in the diff ? This is a better message, IMO. 'for input' is pretty vague. Because it have fixed the bug. And xml parsing is no longer stricxt with tagsoup > >> + - PR1026 - Apps fail to run because of the nanoxml parser's strict XML validation >> * Plugin >> - PR854: Resizing an applet several times causes 100% CPU load >> @@ -472,6 +486,10 @@ >> mkdir -p stamps >> touch $@ >> >> +netx-dummy.jar: >> + echo "Manifest-Version: 1.0" > netx-dummy-manifest.mf >> + jar cfm $@ netx-dummy-manifest.mf >> + > > What is this used for ? Good catch. It was in one older versions. And I removed all traces of this - and missed this two. Removed. thanx! > >> stamps/netx-dist.stamp: stamps/netx.stamp $(abs_top_builddir)/netx.manifest >> (cd $(NETX_DIR) ; \ >> mkdir -p lib ; \ >> @@ -486,6 +504,7 @@ >> >> clean-netx: >> rm -rf $(NETX_DIR) >> + rm -f netx-dummy.jar >> rm -f stamps/netx-dist.stamp >> rm -f netx-source-files.txt >> rm -f stamps/netx.stamp >> @@ -1006,7 +1025,7 @@ >> mkdir -p $(NETX_UNIT_TEST_DIR) && \ > > > >> diff -r 01b48fc84f85 -r 6209aba5fa14 NEWS >> --- a/NEWS Mon Jun 03 14:16:42 2013 +0200 >> +++ b/NEWS Tue Jun 04 13:22:38 2013 +0200 > > Two diffs to the same file ? How'd that happen :-) ?? I'm wondering to! > >> @@ -9,6 +9,8 @@ >> CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY >> >> New in release 1.5 (2013-XX-XX): >> +* NetX >> + - Netx can now parse malformed jnlp files using tagsoup >> * Plugin >> - PR854: Resizing an applet several times causes 100% CPU load >> >> diff -r 01b48fc84f85 -r 6209aba5fa14 acinclude.m4 >> --- a/acinclude.m4 Mon Jun 03 14:16:42 2013 +0200 >> +++ b/acinclude.m4 Tue Jun 04 13:22:38 2013 +0200 >> @@ -403,6 +403,31 @@ >> fi >> ]) >> snip >> - private JNLPFile(Reader input, boolean strict) throws ParseException { >> - // todo: now that we are using NanoXML we can use a Reader >> - //parse(Parser.getRootNode(input), strict, null); >> - } >> +// private JNLPFile(Reader input, ParserSettings settings) throws ParseException { >> +// todo: now that we are using NanoXML we can use a Reader >> +// parse(Parser.getRootNode(input), settings, null); >> +// } > > I'm in favour of just axing this. ok > > [..snip..] >> + HTMLSchema schema = new HTMLSchema(); >> + XMLReader reader = new Parser(); >> + >> + reader.setProperty(Parser.schemaProperty, schema); >> + reader.setFeature(Parser.bogonsEmptyFeature, false); >> + reader.setFeature(Parser.ignorableWhitespaceFeature, true); >> + reader.setFeature(Parser.ignoreBogonsFeature, false); > > It'd be nice to get some comments here about why these are chosen. just hinted.. Needs more investigations > > [..snip..] >> diff -r 01b48fc84f85 -r 6209aba5fa14 netx/net/sourceforge/jnlp/XmlParser.java >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/netx/net/sourceforge/jnlp/XmlParser.java Tue Jun 04 13:22:38 2013 +0200 >> @@ -0,0 +1,183 @@ >> +/* >> + Copyright (C) 2013 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. >> + */ >> + >> +package net.sourceforge.jnlp; >> + >> +import static net.sourceforge.jnlp.runtime.Translator.R; >> + >> +import java.io.BufferedInputStream; >> +import java.io.IOException; >> +import java.io.InputStream; >> +import java.io.InputStreamReader; >> +import java.io.PipedInputStream; >> +import java.io.PipedOutputStream; >> + >> +import net.sourceforge.nanoxml.XMLElement; >> + >> +//import javax.xml.parsers.*; // commented to use right Node >> +//import org.w3c.dom.*; // class for using Tiny XML | NanoXML >> +//import org.xml.sax.*; >> +//import gd.xml.tiny.*; > > [nit] Hm can we remove these ? I don't insist but they aren't clarifying anything for me, they're > just confusing. I would rather keep them in. as remainder of our shame - and as remainder that we can use DOM once :) > > [..snip..] >> diff -r 01b48fc84f85 -r 6209aba5fa14 netx/net/sourceforge/jnlp/resources/Messages.properties >> --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Mon Jun 03 14:16:42 2013 +0200 >> +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Tue Jun 04 13:22:38 2013 +0200 >> @@ -189,6 +189,7 @@ >> BOHeadless = Disables download window, other UIs. >> BOStrict = Enables strict checking of JNLP file format. >> BOViewer = Shows the trusted certificate viewer. >> +BOXml = Uses an strict XML parser to parse the JNLP file. > > [typo] 'Uses an strict' -> 'Uses a strict' Fixed (how come! not my sentence! :) ) > > [..snip..] > > Overall looks good to me. > > Cheers, > -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: tagsoup2.diff Type: text/x-patch Size: 99429 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130620/8c96dd19/tagsoup2.diff From aazores at redhat.com Thu Jun 20 08:28:35 2013 From: aazores at redhat.com (Andrew Azores) Date: Thu, 20 Jun 2013 11:28:35 -0400 Subject: [rfc][icedtea-web] JNLP Extensions and jnlp_href - PR974 Message-ID: <51C31FA3.2050000@redhat.com> Changelog: * netx/net/sourceforge/jnlp/PluginBridge.java (PluginBridge, getResources): Constructor stores list of extensions, getResources returns this list when called with ExtensionDesc.class argument * tests/reproducers/simple/ExtensionJnlpsInApplet/testcases/ExtensionJnlpsInAppletTest.java: tests browser launch of HTML file with embedded JNLP applet containing extension JNLP * tests/reproducers/simple/ExtensionJnlpsInApplet/resources/Helper.jar: same * tests/reproducers/simple/ExtensionJnlpsInApplet/resources/TestApplet.jar: same * tests/reproducers/simple/ExtensionJnlpsInApplet/resources/applet.html: same * tests/reproducers/simple/ExtensionJnlpsInApplet/resources/applet.jnlp: same * tests/reproducers/simple/ExtensionJnlpsInApplet/resources/helper.jnlp: same * tests/reproducers/simple/ExtensionJnlpsInApplet/srcs/Helper.java: same * tests/reproducers/simple/ExtensionJnlpsInApplet/srcs/TestApplet.java: same Not too much to explain this time around I don't think. The original bug report gives good details on the issue as well. Thanks, Andrew A From adomurad at redhat.com Thu Jun 20 10:09:39 2013 From: adomurad at redhat.com (Adam Domurad) Date: Thu, 20 Jun 2013 13:09:39 -0400 Subject: Fwd: [rfc][icedtea-web] renewed tagsoup In-Reply-To: <51C31D18.40908@redhat.com> References: <51ADE9CB.2090709@redhat.com> <51B5F346.4070106@redhat.com> <51C31D18.40908@redhat.com> Message-ID: <51C33753.5050702@redhat.com> OK. Looks ready to push after one nit and one typo inside a method name. Do you have any thoughts about the Oracle examples still being broken ? It is rather unfortunate. I don't believe tagsoup can support these. Oracle's parser is quite quirky. It seems like it is written like that tag parser we got rid of. To fix it, we would need to hack on some support for assuming that: sometag = "somestring should become sometag = "somestring" [..snip..] > + * [1] http://home.ccil.org/~cowan/XML/tagsoup/ > + */ > +public class MalformedXMLParser extends XMLParser { > + > + /** > + * Parses the data from an {@link InputStream} to create a XML tree. > + * Returns a {@link Node} representing the root of the tree. > + * > + * @param input the {@link InputStream} to read data from > + * @throws ParseException if an exception occurs while parsing the input > + */ > + @Override > + public Node getRootNode(InputStream input) throws ParseException { > + if (JNLPRuntime.isDebug()) { > + System.out.println("Using MalformedXMLParser"); > + } > + InputStream xmlInput = xmlizeInputStream(input); > + return super.getRootNode(xmlInput); > + } > + > + /** > + * Reads malformed XML from the InputStream original and returns a new > + * InputStream which can be used to read a well-formed version of the input > + * > + * @param original > + * @return an {@link InputStream} which can be used to read a well-formed > + * version of the input XML > + * @throws ParseException > + */ > + private InputStream xmlizeInputStream(InputStream original) throws ParseException { > + try { > + ByteArrayOutputStream out = new ByteArrayOutputStream(); > + > + HTMLSchema schema = new HTMLSchema(); > + XMLReader reader = new Parser(); > + > + //TODO walk through the javadoc and tune more such a settings > + //see tagsoup javadoc for details [nit] s/such a// Just a note, I played around with them but couldn't find anything particularly useful. > + reader.setProperty(Parser.schemaProperty, schema); > + reader.setFeature(Parser.bogonsEmptyFeature, false); > + reader.setFeature(Parser.ignorableWhitespaceFeature, true); > + reader.setFeature(Parser.ignoreBogonsFeature, false); > + > + Writer writeger = new OutputStreamWriter(out); > + XMLWriter x = new XMLWriter(writeger); > + > + reader.setContentHandler(x); > + > + InputSource s = new InputSource(original); > + > + reader.parse(s); > + return new ByteArrayInputStream(out.toByteArray()); > + } catch (SAXException e) { > + throw new ParseException(R("PBadXML"), e); > + } catch (IOException e) { > + throw new ParseException(R("PBadXML"), e); > + } > + > + } > + > +} > diff -r e09b9813d6de netx/net/sourceforge/jnlp/Parser.java > --- a/netx/net/sourceforge/jnlp/Parser.java Thu Jun 20 17:00:52 2013 +0200 > +++ b/netx/net/sourceforge/jnlp/Parser.java Thu Jun 20 17:16:59 2013 +0200 > @@ -1,5 +1,5 @@ > // Copyright (C) 2001-2003 Jon A. Maxwell (JAM) > -// Copyright (C) 2012 Red Hat, Inc. > +// Copyright (C) 2009-2013 Red Hat, Inc. > // > // This library is free software; you can redistribute it and/or > // modify it under the terms of the GNU Lesser General Public > @@ -20,16 +20,14 @@ > import static net.sourceforge.jnlp.runtime.Translator.R; > > import java.io.*; > +import java.lang.reflect.InvocationTargetException; > +import java.lang.reflect.Method; > import java.net.*; > import java.util.*; > -//import javax.xml.parsers.*; // commented to use right Node > -//import org.w3c.dom.*; // class for using Tiny XML | NanoXML > -//import org.xml.sax.*; > -//import gd.xml.tiny.*; > + > import net.sourceforge.jnlp.UpdateDesc.Check; > import net.sourceforge.jnlp.UpdateDesc.Policy; > import net.sourceforge.jnlp.runtime.JNLPRuntime; > -import net.sourceforge.nanoxml.*; > > /** > * Contains methods to parse an XML document into a JNLPFile. > @@ -106,12 +104,11 @@ > * @param file the (uninitialized) file reference > * @param base if codebase is not specified, a default base for relative URLs > * @param root the root node > - * @param strict whether to enforce strict compliance with the JNLP spec > - * @param allowExtensions whether to allow extensions to the JNLP spec > + * @param settings the parser settings to use when parsing the JNLP file > * @throws ParseException if the JNLP file is invalid > */ > - public Parser(JNLPFile file, URL base, Node root, boolean strict, boolean allowExtensions) throws ParseException { > - this(file, base, root, strict, allowExtensions, null); > + public Parser(JNLPFile file, URL base, Node root, ParserSettings settings) throws ParseException { > + this(file, base, root, settings, null); > } > > /** > @@ -126,16 +123,15 @@ > * @param file the (uninitialized) file reference > * @param base if codebase is not specified, a default base for relative URLs > * @param root the root node > - * @param strict whether to enforce strict compliance with the JNLP spec > - * @param allowExtensions whether to allow extensions to the JNLP spec > + * @param settings the parser settings to use when parsing the JNLP file > * @param codebase codebase to use if we did not parse one from JNLP file. > * @throws ParseException if the JNLP file is invalid > */ > - public Parser(JNLPFile file, URL base, Node root, boolean strict, boolean allowExtensions, URL codebase) throws ParseException { > + public Parser(JNLPFile file, URL base, Node root, ParserSettings settings, URL codebase) throws ParseException { > this.file = file; > this.root = root; > - this.strict = strict; > - this.allowExtensions = allowExtensions; > + this.strict = settings.isStrict(); > + this.allowExtensions = settings.isExtensionAllowed(); > > // ensure it's a JNLP node > if (root == null || !root.getNodeName().equals("jnlp")) > @@ -1265,116 +1261,33 @@ > * > * @throws ParseException if the JNLP file is invalid > */ > - public static Node getRootNode(InputStream input) throws ParseException { > + public static Node getRootNode(InputStream input, ParserSettings settings) throws ParseException { > + String className = null; > + if (settings.isMalfromedXmlAllowed()) { > + className = "net.sourceforge.jnlp.MalformedXMLParser"; > + } else { > + className = "net.sourceforge.jnlp.XMLParser"; > + } > + > try { > - /* SAX > - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); > - factory.setValidating(false); > - factory.setNamespaceAware(true); > - DocumentBuilder builder = factory.newDocumentBuilder(); > - builder.setErrorHandler(errorHandler); > + Class klass = null; > + try { > + klass = Class.forName(className); > + } catch (ClassNotFoundException e) { > + klass = Class.forName("net.sourceforge.jnlp.XMLParser"); > + } > + Object instance = klass.newInstance(); > + Method m = klass.getMethod("getRootNode", InputStream.class); > > - Document doc = builder.parse(input); > - return doc.getDocumentElement(); > - */ > - > - /* TINY > - Node document = new Node(TinyParser.parseXML(input)); > - Node jnlpNode = getChildNode(document, "jnlp"); // skip comments > - */ > - > - //A BufferedInputStream is used to allow marking and reseting > - //of a stream. > - BufferedInputStream bs = new BufferedInputStream(input); > - > - /* NANO */ > - final XMLElement xml = new XMLElement(); > - final PipedInputStream pin = new PipedInputStream(); > - final PipedOutputStream pout = new PipedOutputStream(pin); > - final InputStreamReader isr = new InputStreamReader(bs, getEncoding(bs)); > - // Clean the jnlp xml file of all comments before passing > - // it to the parser. > - new Thread( > - new Runnable() { > - public void run() { > - (new XMLElement()).sanitizeInput(isr, pout); > - try { > - pout.close(); > - } catch (IOException ioe) { > - ioe.printStackTrace(); > - } > - } > - }).start(); > - xml.parseFromReader(new InputStreamReader(pin)); > - Node jnlpNode = new Node(xml); > - return jnlpNode; > - } catch (Exception ex) { > - throw new ParseException(R("PBadXML"), ex); > + return (Node) m.invoke(instance, input); > + } catch (InvocationTargetException e) { > + if (e.getCause() instanceof ParseException) { > + throw (ParseException)(e.getCause()); > + } > + throw new ParseException(R("PBadXML"), e); > + } catch (Exception e) { > + throw new ParseException(R("PBadXML"), e); > } > } > > - /** > - * Returns the name of the encoding used in this InputStream. > - * > - * @param input the InputStream > - * @return a String representation of encoding > - */ > - private static String getEncoding(InputStream input) throws IOException { > - //Fixme: This only recognizes UTF-8, UTF-16, and > - //UTF-32, which is enough to parse the prolog portion of xml to > - //find out the exact encoding (if it exists). The reason being > - //there could be other encodings, such as ISO 8859 which is 8-bits > - //but it supports latin characters. > - //So what needs to be done is to parse the prolog and retrieve > - //the exact encoding from it. > - > - int[] s = new int[4]; > - String encoding = "UTF-8"; > - > - //Determine what the first four bytes are and store > - //them into an int array. > - input.mark(4); > - for (int i = 0; i < 4; i++) { > - s[i] = input.read(); > - } > - input.reset(); > - > - //Set the encoding base on what the first four bytes of the > - //inputstream turn out to be (following the information from > - //www.w3.org/TR/REC-xml/#sec-guessing). > - if (s[0] == 255) { > - if (s[1] == 254) { > - if (s[2] != 0 || s[3] != 0) { > - encoding = "UnicodeLittle"; > - } else { > - encoding = "X-UTF-32LE-BOM"; > - } > - } > - } else if (s[0] == 254 && s[1] == 255 && (s[2] != 0 || > - s[3] != 0)) { > - encoding = "UTF-16"; > - > - } else if (s[0] == 0 && s[1] == 0 && s[2] == 254 && > - s[3] == 255) { > - encoding = "X-UTF-32BE-BOM"; > - > - } else if (s[0] == 0 && s[1] == 0 && s[2] == 0 && > - s[3] == 60) { > - encoding = "UTF-32BE"; > - > - } else if (s[0] == 60 && s[1] == 0 && s[2] == 0 && > - s[3] == 0) { > - encoding = "UTF-32LE"; > - > - } else if (s[0] == 0 && s[1] == 60 && s[2] == 0 && > - s[3] == 63) { > - encoding = "UTF-16BE"; > - } else if (s[0] == 60 && s[1] == 0 && s[2] == 63 && > - s[3] == 0) { > - encoding = "UTF-16LE"; > - } > - > - return encoding; > - } > - > } > diff -r e09b9813d6de netx/net/sourceforge/jnlp/ParserSettings.java > --- a/netx/net/sourceforge/jnlp/ParserSettings.java Thu Jun 20 17:00:52 2013 +0200 > +++ b/netx/net/sourceforge/jnlp/ParserSettings.java Thu Jun 20 17:16:59 2013 +0200 > @@ -35,7 +35,6 @@ > exception statement from your version. > */ > > - > package net.sourceforge.jnlp; > > /** > @@ -46,16 +45,34 @@ > public class ParserSettings { > > private final boolean isStrict; > + private final boolean extensionAllowed; > + private final boolean malformedXmlAllowed; > > + /** Create a new ParserSettings with the defautl parser settings */ > public ParserSettings() { > - isStrict = false; > + this(false, true, true); > } > > - public ParserSettings(boolean strict) { > - isStrict = strict; > + /** Create a new ParserSettings object */ > + public ParserSettings(boolean strict, boolean extensionAllowed, boolean malformedXmlAllowed) { > + this.isStrict = strict; > + this.extensionAllowed = extensionAllowed; > + this.malformedXmlAllowed = malformedXmlAllowed; > } > > + /** @return true if extensions to the spec are allowed */ > + public boolean isExtensionAllowed() { > + return extensionAllowed; > + } > + > + /** @return true if parsing malformed xml is allowed */ > + public boolean isMalfromedXmlAllowed() { s/Malfromed/Malformed/ > + return malformedXmlAllowed; > + } > + > + /** @return true if strict parsing mode is to be used */ > public boolean isStrict() { > return isStrict; > } > -} > + > +} > \ No newline at end of file > diff -r e09b9813d6de netx/net/sourceforge/jnlp/PluginBridge.java > --- a/netx/net/sourceforge/jnlp/PluginBridge.java Thu Jun 20 17:00:52 2013 +0200 > +++ b/netx/net/sourceforge/jnlp/PluginBridge.java Thu Jun 20 17:16:59 2013 +0200 > @@ -96,14 +96,15 @@ > try { > // Use codeBase as the context for the URL. If jnlp_href's > // value is a complete URL, it will replace codeBase's context. [..snip..] Thank you for handling this! Happy hacking, -Adam From aazores at redhat.com Thu Jun 20 12:02:23 2013 From: aazores at redhat.com (Andrew Azores) Date: Thu, 20 Jun 2013 15:02:23 -0400 Subject: [rfc][icedtea-web] JNLP Extensions and jnlp_href - PR974 In-Reply-To: <51C31FA3.2050000@redhat.com> References: <51C31FA3.2050000@redhat.com> Message-ID: <51C351BF.40700@redhat.com> On 06/20/2013 11:28 AM, Andrew Azores wrote: > Changelog: > > * netx/net/sourceforge/jnlp/PluginBridge.java (PluginBridge, > getResources): Constructor stores list of extensions, getResources > returns this list when called with ExtensionDesc.class argument > > * > tests/reproducers/simple/ExtensionJnlpsInApplet/testcases/ExtensionJnlpsInAppletTest.java: > tests browser launch of HTML file with embedded JNLP applet containing > extension JNLP > * > tests/reproducers/simple/ExtensionJnlpsInApplet/resources/Helper.jar: > same > * > tests/reproducers/simple/ExtensionJnlpsInApplet/resources/TestApplet.jar: > same > * > tests/reproducers/simple/ExtensionJnlpsInApplet/resources/applet.html: > same > * > tests/reproducers/simple/ExtensionJnlpsInApplet/resources/applet.jnlp: > same > * > tests/reproducers/simple/ExtensionJnlpsInApplet/resources/helper.jnlp: > same > * tests/reproducers/simple/ExtensionJnlpsInApplet/srcs/Helper.java: same > * > tests/reproducers/simple/ExtensionJnlpsInApplet/srcs/TestApplet.java: > same > > Not too much to explain this time around I don't think. The original > bug report gives good details on the issue as well. > > Thanks, > > Andrew A Sorry, forgot attachments on this... Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: fix.patch Type: text/x-patch Size: 2382 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130620/7e924e7b/fix.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: reproducer.patch Type: text/x-patch Size: 8690 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130620/7e924e7b/reproducer.patch From aazores at redhat.com Thu Jun 20 12:48:38 2013 From: aazores at redhat.com (Andrew Azores) Date: Thu, 20 Jun 2013 15:48:38 -0400 (EDT) Subject: [rfc][icedtea-web] JNLP Extensions and jnlp_href - PR974 In-Reply-To: <51C351BF.40700@redhat.com> References: <51C31FA3.2050000@redhat.com> <51C351BF.40700@redhat.com> Message-ID: <1061269710.325475.1371757718533.JavaMail.root@redhat.com> Please disregard this for the time being. Sorry. I've broken something and I only just realized it. Andrew A ----- Original Message ----- From: "Andrew Azores" To: distro-pkg-dev at openjdk.java.net Sent: Thursday, June 20, 2013 3:02:23 PM Subject: Re: [rfc][icedtea-web] JNLP Extensions and jnlp_href - PR974 On 06/20/2013 11:28 AM, Andrew Azores wrote: > Changelog: > > * netx/net/sourceforge/jnlp/PluginBridge.java (PluginBridge, > getResources): Constructor stores list of extensions, getResources > returns this list when called with ExtensionDesc.class argument > > * > tests/reproducers/simple/ExtensionJnlpsInApplet/testcases/ExtensionJnlpsInAppletTest.java: > tests browser launch of HTML file with embedded JNLP applet containing > extension JNLP > * > tests/reproducers/simple/ExtensionJnlpsInApplet/resources/Helper.jar: > same > * > tests/reproducers/simple/ExtensionJnlpsInApplet/resources/TestApplet.jar: > same > * > tests/reproducers/simple/ExtensionJnlpsInApplet/resources/applet.html: > same > * > tests/reproducers/simple/ExtensionJnlpsInApplet/resources/applet.jnlp: > same > * > tests/reproducers/simple/ExtensionJnlpsInApplet/resources/helper.jnlp: > same > * tests/reproducers/simple/ExtensionJnlpsInApplet/srcs/Helper.java: same > * > tests/reproducers/simple/ExtensionJnlpsInApplet/srcs/TestApplet.java: > same > > Not too much to explain this time around I don't think. The original > bug report gives good details on the issue as well. > > Thanks, > > Andrew A Sorry, forgot attachments on this... Andrew A From omajid at redhat.com Thu Jun 20 12:52:39 2013 From: omajid at redhat.com (Omair Majid) Date: Thu, 20 Jun 2013 15:52:39 -0400 Subject: [rfc][icedtea-web] JNLP Extensions and jnlp_href - PR974 In-Reply-To: <51C351BF.40700@redhat.com> References: <51C31FA3.2050000@redhat.com> <51C351BF.40700@redhat.com> Message-ID: <51C35D87.8060907@redhat.com> On 06/20/2013 03:02 PM, Andrew Azores wrote: > diff --git a/tests/reproducers/simple/ExtensionJnlpsInApplet/resources/Helper.jar b/tests/reproducers/simple/ExtensionJnlpsInApplet/resources/Helper.jar > new file mode 100644 > index 0000000000000000000000000000000000000000..ca3ebb85340e3d8547fc83de52d96f6483f16749 > GIT binary patch > literal 659 > zc$^FHW at Zs#;Nak3Q1ZRx#DD}i8CV#6T|*poJ^kGD|D9rBU}gyLX6FD&F+r6C;M6Pv > z#Bj~Nj((nQuE8OCzHXm=&z$!0*44Yn>#eJG?#%hkK?YZhA3QD6^YYd4^u1WRiiLB= > zYsn+h651I*#8uUvFVV7iE-v~+Ty+}5)a*}1ABz~lj(D`@xU at 6S3KtYdNTE4`2Z%jV > za|%+6^pbNDi;H9X&hi}$5NJLBLO%EJF+ZI*QQTtFj<_j_9csF<{Z7Gbt;|!!8z)6n > zFz~A`Q=K?t_8jBlPj`2I|GCSa;Y)z&!bLOOPdeOmXkEacqB2?0vG9(lqpYl1Q^34a > z9%uZj zdBO5nc zI+9Ie>z$|kArWhHw*O at Vg+c7DB@Mt>Vc=r~g#jaz2m at +Vz#<70kEj48R?)R02dxN- > mHd`EVifjTX3XmPfgJQxVv > diff --git a/tests/reproducers/simple/ExtensionJnlpsInApplet/resources/TestApplet.jar b/tests/reproducers/simple/ExtensionJnlpsInApplet/resources/TestApplet.jar > new file mode 100644 > index 0000000000000000000000000000000000000000..fe33f3f19bead7d4f2d049b5cd21191c2a854d34 > GIT binary patch > literal 864 > zc$^FHW at Zs#;Nak3Q1`v$#DD}i8CV#6T|*poJ^kGD|D9rBU}gyLX6FD&F+r6C;M6Pv > z#Bj~Nj((nQuE8OCzHXm=&z$!0*44Yn>#eJG?#%hkK?YZhA3QD6^YYd4^u1WRiiLB= > zYsn+h651I*#8uUvFVV7iE-v~+Ty+}5)a*}1Kh at Hny|j9+A|@WK*}~vkq@!`dQ}^N1 > zM^Bl+Zu=}eNj(Z^a}0{xq|n?Z0K_4w#U+jf1v#lDddWG7#l^KjvHHx8BDR zed|}+Ywf3w!gAU|6Fb-i9rsj7nI@)K-_BVsWZ%txq*?xfd*^0dua4Ro)$easzuWo! > z+ at 5{5`x$N=*wilbsaC>Ov3*gy&@r2yWTkdb at nF4WtaE&Gx7-!-2oLjPHL||gDkO31 > zx|{44>E~K at 6Q3(i^l{Eo4p=qkZTxBJNZzG8*T~(Dn0-3R>CCn at J!>1vWwt)vb?Yi; > z<_njtZ^|}HYVDr3q2|lMV#CMDV#Q2P7jHAv5jYX%uxsap#FP*P&kLoQr71BicBf{P > zZ+ws}=*`rcxAVZJB7yRssi(e8Vfi$dFI9b2UDM(FxAx^mUVU&PaJGHd-Nup-+b1T| > zj5Tkr;OzOw$i3sN3fIoAq^IwFEvmJ0R?X1fz36bCw)TEu%PFUKd+sxF*(5gaZ% zYi`+B!AE_44d*YvY{*pOOZcE%D!YbPmLD^Gbcx5o4D > z1MB}EC#PTW-{)U4qmWDaJt)@JMtyrz!N|an!UT#nMkWyk)HDT4ZJ-2+3Q&?Kx>n at G > oAcCUJ7DwVlHUX4qkR2v~V!}- References: <51ADE9CB.2090709@redhat.com> <51B5F346.4070106@redhat.com> <51C31D18.40908@redhat.com> <51C33753.5050702@redhat.com> Message-ID: <51C407C1.1050603@redhat.com> On 06/20/2013 07:09 PM, Adam Domurad wrote: > OK. Looks ready to push after one nit and one typo inside a method name. thanx pushing. > > Do you have any thoughts about the Oracle examples still being broken ? It is rather unfortunate. I > don't believe tagsoup can support these. > > Oracle's parser is quite quirky. It seems like it is written like that tag parser we got rid of. > > To fix it, we would need to hack on some support for assuming that: > > sometag = "somestring > > should become > sometag = "somestring" Hmm.. Contribute to tagsoup? > > > [..snip..] > >> + * [1] http://home.ccil.org/~cowan/XML/tagsoup/ >> + */ >> +public class MalformedXMLParser extends XMLParser { >> + >> + /** >> + * Parses the data from an {@link InputStream} to create a XML tree. >> + * Returns a {@link Node} representing the root of the tree. >> + * >> + * @param input the {@link InputStream} to read data from >> + * @throws ParseException if an exception occurs while parsing the input >> + */ >> + @Override >> + public Node getRootNode(InputStream input) throws ParseException { >> + if (JNLPRuntime.isDebug()) { >> + System.out.println("Using MalformedXMLParser"); >> + } >> + InputStream xmlInput = xmlizeInputStream(input); >> + return super.getRootNode(xmlInput); >> + } >> + >> + /** >> + * Reads malformed XML from the InputStream original and returns a new >> + * InputStream which can be used to read a well-formed version of the input >> + * >> + * @param original >> + * @return an {@link InputStream} which can be used to read a well-formed >> + * version of the input XML >> + * @throws ParseException >> + */ >> + private InputStream xmlizeInputStream(InputStream original) throws ParseException { >> + try { >> + ByteArrayOutputStream out = new ByteArrayOutputStream(); >> + >> + HTMLSchema schema = new HTMLSchema(); >> + XMLReader reader = new Parser(); >> + >> + //TODO walk through the javadoc and tune more such a settings >> + //see tagsoup javadoc for details > > [nit] s/such a// removed > > Just a note, I played around with them but couldn't find anything particularly useful. thanx! I have just brief look, so I assume you saved me a bunch of time. > >> + reader.setProperty(Parser.schemaProperty, schema); >> + reader.setFeature(Parser.bogonsEmptyFeature, false); >> + reader.setFeature(Parser.ignorableWhitespaceFeature, true); >> + reader.setFeature(Parser.ignoreBogonsFeature, false); >> + >> + Writer writeger = new OutputStreamWriter(out); >> + XMLWriter x = new XMLWriter(writeger); >> + >> + /** @return true if extensions to the spec are allowed */ >> + public boolean isExtensionAllowed() { >> + return extensionAllowed; >> + } >> + >> + /** @return true if parsing malformed xml is allowed */ >> + public boolean isMalfromedXmlAllowed() { > > s/Malfromed/Malformed/ fixed > >> + return malformedXmlAllowed; >> + } >> + >> + /** @return true if strict parsing mode is to be used */ >> public boolean isStrict() { >> return isStrict; >> } >> -} >> + >> +} >> \ No newline at end of file >> diff -r e09b9813d6de netx/net/sourceforge/jnlp/PluginBridge.java >> --- a/netx/net/sourceforge/jnlp/PluginBridge.java Thu Jun 20 17:00:52 2013 +0200 >> +++ b/netx/net/sourceforge/jnlp/PluginBridge.java Thu Jun 20 17:16:59 2013 +0200 >> @@ -96,14 +96,15 @@ >> try { >> // Use codeBase as the context for the URL. If jnlp_href's >> // value is a complete URL, it will replace codeBase's context. > > [..snip..] > > Thank you for handling this! > > Happy hacking, > -Adam From ptisnovs at icedtea.classpath.org Fri Jun 21 03:11:18 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 21 Jun 2013 10:11:18 +0000 Subject: /hg/gfx-test: Eight new methods used by several gfx. tests added... Message-ID: changeset bc102f07b264 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=bc102f07b264 author: Pavel Tisnovsky date: Fri Jun 21 12:14:47 2013 +0200 Eight new methods used by several gfx. tests added into CommonBitmapOperations. diffstat: ChangeLog | 5 + src/org/gfxtest/framework/CommonBitmapOperations.java | 216 ++++++++++++++++++ 2 files changed, 221 insertions(+), 0 deletions(-) diffs (287 lines): diff -r 6be1d654c48d -r bc102f07b264 ChangeLog --- a/ChangeLog Thu Jun 20 11:11:32 2013 +0200 +++ b/ChangeLog Fri Jun 21 12:14:47 2013 +0200 @@ -1,3 +1,8 @@ +2013-06-21 Pavel Tisnovsky + + * src/org/gfxtest/framework/CommonBitmapOperations.java: + Eight new methods used by several gfx. tests. + 2013-06-20 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r 6be1d654c48d -r bc102f07b264 src/org/gfxtest/framework/CommonBitmapOperations.java --- a/src/org/gfxtest/framework/CommonBitmapOperations.java Thu Jun 20 11:11:32 2013 +0200 +++ b/src/org/gfxtest/framework/CommonBitmapOperations.java Fri Jun 21 12:14:47 2013 +0200 @@ -974,6 +974,33 @@ } /** + * Create new buffered image containing black and white horizontal stripes + * then perform basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + * @param rop + * selected raster operation + */ + public static TestResult doBitBltTestWithHorizontalStripesImage(TestImage image, Graphics2D graphics2d, int imageType, BufferedImageOp rop) + { + // create new buffered bitmap with given type + // bitmap should contains checker pattern + BufferedImage bufferedImage = ImageFactory.createHorizontalStripesImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling, no flipping and no cropping and using RescaleOp + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, rop) ? TestResult.PASSED : TestResult.FAILED; + } + + /** * Create new buffered image containing black and white vertical stripes then perform basic BitBlt test. * * @param image @@ -1026,6 +1053,33 @@ } /** + * Create new buffered image containing black and white vertical stripes + * then perform basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + * @param rop + * selected raster operation + */ + public static TestResult doBitBltTestWithVerticalStripesImage(TestImage image, Graphics2D graphics2d, int imageType, BufferedImageOp rop) + { + // create new buffered bitmap with given type + // bitmap should contains checker pattern + BufferedImage bufferedImage = ImageFactory.createVerticalStripesImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling, no flipping and no cropping and using RescaleOp + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, rop) ? TestResult.PASSED : TestResult.FAILED; + } + + /** * Create new buffered image containing black and white diagonal stripes then perform basic BitBlt test. * * @param image @@ -1078,6 +1132,33 @@ } /** + * Create new buffered image containing black and white diagonal stripes + * then perform basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + * @param rop + * selected raster operation + */ + public static TestResult doBitBltTestWithDiagonalStripesImage(TestImage image, Graphics2D graphics2d, int imageType, BufferedImageOp rop) + { + // create new buffered bitmap with given type + // bitmap should contains checker pattern + BufferedImage bufferedImage = ImageFactory.createDiagonalStripesImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling, no flipping and no cropping and using RescaleOp + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, rop) ? TestResult.PASSED : TestResult.FAILED; + } + + /** * Create new buffered image containing horizontal color stripes and then * perform basic BitBlt test. * @@ -1132,6 +1213,33 @@ } /** + * Create new buffered image containing horizontal color stripes and then + * perform basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + * @param rop + * selected raster operation + */ + public static TestResult doBitBltTestWithHorizontalColorStripesImage(TestImage image, Graphics2D graphics2d, int imageType, BufferedImageOp rop) + { + // create new buffered bitmap with given type + // bitmap should contains checker pattern + BufferedImage bufferedImage = ImageFactory.createHorizontalColorStripesImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling, no flipping and no cropping and using RescaleOp + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, rop) ? TestResult.PASSED : TestResult.FAILED; + } + + /** * Create new buffered image containing vertical color stripes and then * perform basic BitBlt test. * @@ -1186,6 +1294,33 @@ } /** + * Create new buffered image containing vertical color stripes and then + * perform basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + * @param rop + * selected raster operation + */ + public static TestResult doBitBltTestWithVerticalColorStripesImage(TestImage image, Graphics2D graphics2d, int imageType, BufferedImageOp rop) + { + // create new buffered bitmap with given type + // bitmap should contains checker pattern + BufferedImage bufferedImage = ImageFactory.createVerticalColorStripesImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling, no flipping and no cropping and using RescaleOp + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, rop) ? TestResult.PASSED : TestResult.FAILED; + } + + /** * Create new buffered image containing diagonal color stripes and then * perform basic BitBlt test. * @@ -1240,6 +1375,33 @@ } /** + * Create new buffered image containing diagonal color stripes and then + * perform basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + * @param rop + * selected raster operation + */ + public static TestResult doBitBltTestWithDiagonalColorStripesImage(TestImage image, Graphics2D graphics2d, int imageType, BufferedImageOp rop) + { + // create new buffered bitmap with given type + // bitmap should contains checker pattern + BufferedImage bufferedImage = ImageFactory.createDiagonalColorStripesImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling, no flipping and no cropping and using RescaleOp + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, rop) ? TestResult.PASSED : TestResult.FAILED; + } + + /** * Create new buffered image containing black and white dot pattern and then * perform basic BitBlt test. * @@ -1294,6 +1456,33 @@ } /** + * Create new buffered image containing black and white dot pattern and then + * perform basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + * @param rop + * selected raster operation + */ + public static TestResult doBitBltTestWithBWDotsImage(TestImage image, Graphics2D graphics2d, int imageType, BufferedImageOp rop) + { + // create new buffered bitmap with given type + // bitmap should contains checker pattern + BufferedImage bufferedImage = ImageFactory.createBWDotsPatternImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling, no flipping and no cropping and using RescaleOp + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, rop) ? TestResult.PASSED : TestResult.FAILED; + } + + /** * Create new buffered image containing color dot pattern and then perform basic BitBlt test. * * @param image @@ -1348,6 +1537,33 @@ } /** + * Create new buffered image containing color dot pattern and then perform + * basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + * @param rop + * selected raster operation + */ + public static TestResult doBitBltTestWithColorDotsImage(TestImage image, Graphics2D graphics2d, int imageType, BufferedImageOp rop) + { + // create new buffered bitmap with given type + // bitmap should contains checker pattern + BufferedImage bufferedImage = ImageFactory.createColorDotsPatternImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling, no flipping and no cropping and using RescaleOp + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, rop) ? TestResult.PASSED : TestResult.FAILED; + } + + /** * Create new buffered image containing horizontal grayscale gradient and then perform basic BitBlt test. * * @param image From ptisnovs at icedtea.classpath.org Fri Jun 21 03:14:16 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 21 Jun 2013 10:14:16 +0000 Subject: /hg/rhino-tests: Small updates in getAnnotation and getAnnotatio... Message-ID: changeset 91109f10e626 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=91109f10e626 author: Pavel Tisnovsky date: Fri Jun 21 12:17:48 2013 +0200 Small updates in getAnnotation and getAnnotations tests in SimpleBindingsClassTest. diffstat: ChangeLog | 5 +++ src/org/RhinoTests/SimpleBindingsClassTest.java | 36 +++++++++++++++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diffs (79 lines): diff -r 005b996d98c9 -r 91109f10e626 ChangeLog --- a/ChangeLog Thu Jun 20 11:17:20 2013 +0200 +++ b/ChangeLog Fri Jun 21 12:17:48 2013 +0200 @@ -1,3 +1,8 @@ +2013-06-21 Pavel Tisnovsky + + * src/org/RhinoTests/SimpleBindingsClassTest.java: + Small updates in getAnnotation and getAnnotations tests. + 2013-06-20 Pavel Tisnovsky * src/org/RhinoTests/ScriptEngineManagerClassTest.java: diff -r 005b996d98c9 -r 91109f10e626 src/org/RhinoTests/SimpleBindingsClassTest.java --- a/src/org/RhinoTests/SimpleBindingsClassTest.java Thu Jun 20 11:17:20 2013 +0200 +++ b/src/org/RhinoTests/SimpleBindingsClassTest.java Fri Jun 21 12:17:48 2013 +0200 @@ -1038,6 +1038,9 @@ final String[] annotationsThatShouldExists_jdk7 = { }; + final String[] annotationsThatShouldExists_jdk8 = { + }; + // get all annotations Annotation[] annotations = this.simpleBindingsClass.getAnnotations(); // and transform the array into a list of annotation names @@ -1045,7 +1048,20 @@ for (Annotation annotation : annotations) { annotationsAsString.add(annotation.toString()); } - String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + + String[] annotationsThatShouldExists = null; + switch (getJavaVersion()) { + case 6: + annotationsThatShouldExists = annotationsThatShouldExists_jdk6; + break; + case 7: + annotationsThatShouldExists = annotationsThatShouldExists_jdk7; + break; + case 8: + annotationsThatShouldExists = annotationsThatShouldExists_jdk8; + break; + } + // check if all required annotations really exists for (String annotationThatShouldExists : annotationsThatShouldExists) { assertTrue(annotationsAsString.contains(annotationThatShouldExists), @@ -1064,6 +1080,9 @@ final String[] annotationsThatShouldExists_jdk7 = { }; + final String[] annotationsThatShouldExists_jdk8 = { + }; + // get all annotations Annotation[] annotations = this.simpleBindingsClass.getDeclaredAnnotations(); // and transform the array into a list of annotation names @@ -1071,7 +1090,20 @@ for (Annotation annotation : annotations) { annotationsAsString.add(annotation.toString()); } - String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + + String[] annotationsThatShouldExists = null; + switch (getJavaVersion()) { + case 6: + annotationsThatShouldExists = annotationsThatShouldExists_jdk6; + break; + case 7: + annotationsThatShouldExists = annotationsThatShouldExists_jdk7; + break; + case 8: + annotationsThatShouldExists = annotationsThatShouldExists_jdk8; + break; + } + // check if all required annotations really exists for (String annotationThatShouldExists : annotationsThatShouldExists) { assertTrue(annotationsAsString.contains(annotationThatShouldExists), From jvanek at icedtea.classpath.org Fri Jun 21 03:15:10 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Fri, 21 Jun 2013 10:15:10 +0000 Subject: /hg/icedtea-web: Added tagsup (optional dependence) as sanitizer... Message-ID: changeset a236aa5f729b in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=a236aa5f729b author: Jiri Vanek date: Fri Jun 21 12:15:03 2013 +0200 Added tagsup (optional dependence) as sanitizer for (possibly) invalid xml files diffstat: ChangeLog | 30 + Makefile.am | 31 +- NEWS | 3 + acinclude.m4 | 25 + configure.ac | 2 + netx/net/sourceforge/jnlp/JNLPCreator.java | 4 +- netx/net/sourceforge/jnlp/JNLPFile.java | 72 +- netx/net/sourceforge/jnlp/Launcher.java | 10 +- netx/net/sourceforge/jnlp/MalformedXMLParser.java | 123 +++++ netx/net/sourceforge/jnlp/Parser.java | 157 +----- netx/net/sourceforge/jnlp/ParserSettings.java | 27 +- netx/net/sourceforge/jnlp/PluginBridge.java | 5 +- netx/net/sourceforge/jnlp/XmlParser.java | 183 ++++++++ netx/net/sourceforge/jnlp/resources/Messages.properties | 1 + netx/net/sourceforge/jnlp/runtime/Boot.java | 14 +- netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 7 +- tests/netx/unit/net/sourceforge/jnlp/JNLPFileTest.java | 4 +- tests/netx/unit/net/sourceforge/jnlp/ParserBasic.java | 5 +- tests/netx/unit/net/sourceforge/jnlp/ParserCornerCases.java | 76 ++- tests/netx/unit/net/sourceforge/jnlp/ParserMalformedXml.java | 23 +- tests/netx/unit/net/sourceforge/jnlp/ParserTest.java | 213 +++++---- tests/netx/unit/net/sourceforge/jnlp/PluginBridgeTest.java | 5 +- tests/netx/unit/net/sourceforge/jnlp/splashscreen/parts/InformationElementTest.java | 12 +- 23 files changed, 699 insertions(+), 333 deletions(-) diffs (truncated from 2122 to 500 lines): diff -r e09b9813d6de -r a236aa5f729b ChangeLog --- a/ChangeLog Thu Jun 20 17:00:52 2013 +0200 +++ b/ChangeLog Fri Jun 21 12:15:03 2013 +0200 @@ -1,3 +1,33 @@ +2013-06-21 Jiri Vanek + Adam Domurad + Omair Majid + + Added tagsup (optional dependence) as sanitizer for (possibly) invalid xml files + * Makefile.am: (LAUNCHER_BOOTCLASSPATH) (PLUGIN_BOOTCLASSPATH) (NETX_CLASSPATH_ARG) + (PLUGIN_COVERAGE_BOOTCLASSPATH) enriched for TAGSOUP_JAR + * acinclude.m4: (IT_CHECK_FOR_TAGSOUP) new macro + * configure.ac: used this new macro + * tests/netx/unit/net/sourceforge/jnlp/ParserBasic.java: + * netx/net/sourceforge/jnlp/JNLPCreator.java: (create) + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: + * /netx/net/sourceforge/jnlp/JNLPFile.java: (JNLPFile) construcotrs + * netx/net/sourceforge/jnlp/PluginBridge.java + * netx/net/sourceforge/jnlp/Launcher.java: (main) + all adapted to take ParserSettings instead of individual parameters + * netx/net/sourceforge/jnlp/MalformedXMLParser.java: new file, bridge + between tagsoup and our parser + * netx/net/sourceforge/jnlp/XmlParser.java: new file, bridge to old parser + * netx/net/sourceforge/jnlp/Parser.java: refactored to be able both with + * netx/net/sourceforge/jnlp/ParserSettings.java: reworked to serve as + gatherer for various individual parser flags + * netx/net/sourceforge/jnlp/resources/Messages.propertie: (BOXml) + new key describing -xml switch + * tests/netx/unit/net/sourceforge/jnlp/ParserCornerCases.java: + * tests/netx/unit/net/sourceforge/jnlp/ParserMalformedXml.java: + * tests/netx/unit/net/sourceforge/jnlp/ParserTest.java: + Tests adapted to newest state (both for included/excluded tagsoup) and + new (testTagNotClosedNoTagSoup) (testUnquotedAttributesNoTagSoup) + 2013-06-20 Jiri Vanek Removed out-of date support for jdk 1.5 and older diff -r e09b9813d6de -r a236aa5f729b Makefile.am --- a/Makefile.am Thu Jun 20 17:00:52 2013 +0200 +++ b/Makefile.am Fri Jun 21 12:15:03 2013 +0200 @@ -119,9 +119,9 @@ # IllegalAccessException # - we want full privileges # -export LAUNCHER_BOOTCLASSPATH="-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar$(RHINO_RUNTIME)" -export PLUGIN_BOOTCLASSPATH='"-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar:$(datadir)/$(PACKAGE_NAME)/plugin.jar$(RHINO_RUNTIME)"' -export PLUGIN_COVERAGE_BOOTCLASSPATH='"-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar:$(datadir)/$(PACKAGE_NAME)/plugin.jar$(RHINO_RUNTIME):$(JACOCO_CLASSPATH)"' +export LAUNCHER_BOOTCLASSPATH="-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar$(RHINO_RUNTIME):$(TAGSOUP_JAR)" +export PLUGIN_BOOTCLASSPATH='"-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar:$(datadir)/$(PACKAGE_NAME)/plugin.jar$(RHINO_RUNTIME):$(TAGSOUP_JAR)"' +export PLUGIN_COVERAGE_BOOTCLASSPATH='"-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar:$(datadir)/$(PACKAGE_NAME)/plugin.jar$(RHINO_RUNTIME):$(JACOCO_CLASSPATH):$(TAGSOUP_JAR)"' # Fake update version to work with the Deployment Toolkit script used by Oracle # http://download.oracle.com/javase/tutorial/deployment/deploymentInDepth/depltoolkit_index.html @@ -138,7 +138,15 @@ net.sourceforge.jnlp.security.viewer net.sourceforge.jnlp.services \ net.sourceforge.jnlp.tools net.sourceforge.jnlp.util +NETX_EXCLUDE_SRCS= + # Conditional defintions +if HAVE_TAGSOUP +NETX_CLASSPATH_ARG=-classpath $(TAGSOUP_JAR) +else +NETX_EXCLUDE_SRCS+=net.sourceforge.jnlp.MalformedXMLParser.java +endif + if ENABLE_PLUGIN export ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin export LIVECONNECT_DIR = netscape sun/applet @@ -415,6 +423,7 @@ $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ -d $(abs_top_builddir)/liveconnect \ -bootclasspath $(NETX_DIR):$(RUNTIME) \ + $(NETX_CLASSPATH_ARG) \ -sourcepath $(LIVECONNECT_SRCS) \ @liveconnect-source-files.txt ; \ fi @@ -445,7 +454,11 @@ # a patch applied to sun.plugin.AppletViewerPanel and generated sources netx-source-files.txt: - find $(NETX_SRCDIR) -name '*.java' | sort > $@ + find $(NETX_SRCDIR) -name '*.java' | sort > $@ ; \ + for src in $(NETX_EXCLUDE_SRCS) ; \ + do \ + sed -i "/$${src}/ d" $@ ; \ + done if !WITH_RHINO sed -i '/RhinoBasedPacEvaluator/ d' $@ endif @@ -459,6 +472,7 @@ -d $(NETX_DIR) \ -sourcepath $(NETX_SRCDIR) \ -bootclasspath $(RUNTIME) \ + $(NETX_CLASSPATH_ARG) \ @netx-source-files.txt (cd $(NETX_RESOURCE_DIR); \ for files in $$(find . -type f); \ @@ -1006,7 +1020,7 @@ mkdir -p $(NETX_UNIT_TEST_DIR) && \ $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ -d $(NETX_UNIT_TEST_DIR) \ - -classpath $(JUNIT_JAR):$(abs_top_builddir)/liveconnect/lib/classes.jar:$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR) \ + -classpath $(JUNIT_JAR):$(abs_top_builddir)/liveconnect/lib/classes.jar:$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR):$(TAGSOUP_JAR) \ @netx-unit-tests-source-files.txt && \ mkdir -p stamps && \ touch $@ @@ -1036,7 +1050,7 @@ done ; \ cd $(NETX_UNIT_TEST_DIR) ; \ class_names=`cat $(UNIT_CLASS_NAMES)` ; \ - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR) \ + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR):$(TAGSOUP_JAR) \ $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names if WITH_XSLTPROC -$(XSLTPROC) --stringparam logs logs_unit.html $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(NETX_UNIT_TEST_DIR)/tests-output.xml > $(TESTS_DIR)/index_unit.html @@ -1073,6 +1087,9 @@ -cp $(RHINO_RUNTIME) \ -cp $(TEST_EXTENSIONS_DIR) \ -cp $(TEST_EXTENSIONS_SRCDIR) \ +if HAVE_TAGSOUP + -cp $(TAGSOUP_JAR) \ +endif -cp . \ -ix "-org.junit.*" \ -ix "-junit.*" \ @@ -1117,7 +1134,7 @@ mv $(NETX_UNIT_TEST_DIR)/$$file $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)" ; \ done ;\ class_names=`cat $(UNIT_CLASS_NAMES)` ; \ - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):.:$(TEST_EXTENSIONS_SRCDIR) \ + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):.:$(TEST_EXTENSIONS_SRCDIR):$(TAGSOUP_JAR) \ $(BOOT_DIR)/bin/java $(JACOCO_AGENT_SWITCH) -Xbootclasspath:$(RUNTIME) CommandLine $$class_names ; \ for file in $(EMMA_MODIFIED_FILES) ; do \ mv $(NETX_UNIT_TEST_DIR)/$$file $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_SUFFIX)" ; \ diff -r e09b9813d6de -r a236aa5f729b NEWS --- a/NEWS Thu Jun 20 17:00:52 2013 +0200 +++ b/NEWS Fri Jun 21 12:15:03 2013 +0200 @@ -9,9 +9,12 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY New in release 1.5 (2013-XX-XX): +* IcedTea-Web now using tagsoup as default (tagsoup dependence) sanitizer for input * JDK older then 1.5 no longer supported * NetX - PR1465 - java.io.FileNotFoundException while trying to download a JAR file + - Netx can now parse malformed jnlp files using tagsoup + - PR1026 - Apps fail to run because of the nanoxml parser's strict XML validation * Plugin - PR854: Resizing an applet several times causes 100% CPU load diff -r e09b9813d6de -r a236aa5f729b acinclude.m4 --- a/acinclude.m4 Thu Jun 20 17:00:52 2013 +0200 +++ b/acinclude.m4 Fri Jun 21 12:15:03 2013 +0200 @@ -403,6 +403,31 @@ fi ]) +AC_DEFUN_ONCE([IT_CHECK_FOR_TAGSOUP], +[ + AC_MSG_CHECKING([for tagsoup]) + AC_ARG_WITH([tagsoup], + [AS_HELP_STRING([--with-tagsoup], + [tagsoup.jar])], + [ + TAGSOUP_JAR=${withval} + ], + [ + TAGSOUP_JAR= + ]) + if test -z "${TAGSOUP_JAR}"; then + for dir in /usr/share/java /usr/local/share/java ; do + if test -f $dir/tagsoup.jar; then + TAGSOUP_JAR=$dir/tagsoup.jar + break + fi + done + fi + AC_MSG_RESULT(${TAGSOUP_JAR}) + AC_SUBST(TAGSOUP_JAR) + AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != xno]) +]) + dnl Generic macro to check for a Java class dnl Takes the name of the class as an argument. The macro name dnl is usually the name of the class with '.' diff -r e09b9813d6de -r a236aa5f729b configure.ac --- a/configure.ac Thu Jun 20 17:00:52 2013 +0200 +++ b/configure.ac Fri Jun 21 12:15:03 2013 +0200 @@ -111,6 +111,8 @@ IT_FIND_OPTIONAL_JAR([asm], ASM, [/usr/share/java/objectweb-asm4/asm-all.jar /usr/share/java/objectweb-asm4/asm-all-4.0.jar /usr/share/java/objectweb-asm/asm-all.jar]) +IT_CHECK_FOR_TAGSOUP + AC_CONFIG_FILES([jrunscript], [chmod u+x jrunscript]) AC_CONFIG_FILES([build.properties]) diff -r e09b9813d6de -r a236aa5f729b netx/net/sourceforge/jnlp/JNLPCreator.java --- a/netx/net/sourceforge/jnlp/JNLPCreator.java Thu Jun 20 17:00:52 2013 +0200 +++ b/netx/net/sourceforge/jnlp/JNLPCreator.java Fri Jun 21 12:15:03 2013 +0200 @@ -28,8 +28,8 @@ import net.sourceforge.jnlp.cache.UpdatePolicy; public class JNLPCreator { - public JNLPFile create(URL location, Version version, boolean strict, + public JNLPFile create(URL location, Version version, ParserSettings settings, UpdatePolicy policy, URL forceCodebase) throws IOException, ParseException { - return new JNLPFile(location, version, strict, policy, forceCodebase); + return new JNLPFile(location, version, settings, policy, forceCodebase); } } diff -r e09b9813d6de -r a236aa5f729b netx/net/sourceforge/jnlp/JNLPFile.java --- a/netx/net/sourceforge/jnlp/JNLPFile.java Thu Jun 20 17:00:52 2013 +0200 +++ b/netx/net/sourceforge/jnlp/JNLPFile.java Fri Jun 21 12:15:03 2013 +0200 @@ -67,6 +67,9 @@ /** the network location of this JNLP file */ protected URL fileLocation; + /** the ParserSettings which were used to parse this file */ + protected ParserSettings parserSettings = null; + /** A key that uniquely identifies connected instances (main jnlp+ext) */ protected String uniqueKey = null; @@ -145,7 +148,7 @@ * @throws ParseException if the JNLP file was invalid */ public JNLPFile(URL location) throws IOException, ParseException { - this(location, false); // not strict + this(location, new ParserSettings()); } /** @@ -153,12 +156,12 @@ * default policy. * * @param location the location of the JNLP file - * @param strict whether to enforce the spec when + * @param settings the parser settings to use while parsing the file * @throws IOException if an IO exception occurred * @throws ParseException if the JNLP file was invalid */ - public JNLPFile(URL location, boolean strict) throws IOException, ParseException { - this(location, (Version) null, strict); + public JNLPFile(URL location, ParserSettings settings) throws IOException, ParseException { + this(location, (Version) null, settings); } /** @@ -167,12 +170,12 @@ * * @param location the location of the JNLP file * @param version the version of the JNLP file - * @param strict whether to enforce the spec when + * @param settings the parser settings to use while parsing the file * @throws IOException if an IO exception occurred * @throws ParseException if the JNLP file was invalid */ - public JNLPFile(URL location, Version version, boolean strict) throws IOException, ParseException { - this(location, version, strict, JNLPRuntime.getDefaultUpdatePolicy()); + public JNLPFile(URL location, Version version, ParserSettings settings) throws IOException, ParseException { + this(location, version, settings, JNLPRuntime.getDefaultUpdatePolicy()); } /** @@ -186,8 +189,8 @@ * @throws IOException if an IO exception occurred * @throws ParseException if the JNLP file was invalid */ - public JNLPFile(URL location, Version version, boolean strict, UpdatePolicy policy) throws IOException, ParseException { - this(location, version, strict, policy, null); + public JNLPFile(URL location, Version version, ParserSettings settings, UpdatePolicy policy) throws IOException, ParseException { + this(location, version, settings, policy, null); } /** @@ -196,15 +199,16 @@ * * @param location the location of the JNLP file * @param version the version of the JNLP file - * @param strict whether to enforce the spec when + * @param settings the parser settings to use while parsing the file * @param policy the update policy * @param forceCodebase codebase to use if not specified in JNLP file. * @throws IOException if an IO exception occurred * @throws ParseException if the JNLP file was invalid */ - protected JNLPFile(URL location, Version version, boolean strict, UpdatePolicy policy, URL forceCodebase) throws IOException, ParseException { - Node root = Parser.getRootNode(openURL(location, version, policy)); - parse(root, strict, location, forceCodebase); + protected JNLPFile(URL location, Version version, ParserSettings settings, UpdatePolicy policy, URL forceCodebase) throws IOException, ParseException { + InputStream input = openURL(location, version, policy); + this.parserSettings = settings; + parse(input, location, forceCodebase); //Downloads the original jnlp file into the cache if possible //(i.e. If the jnlp file being launched exist locally, but it @@ -231,13 +235,13 @@ * @param location the location of the JNLP file * @param uniqueKey A string that uniquely identifies connected instances * @param version the version of the JNLP file - * @param strict whether to enforce the spec when + * @param settings the parser settings to use while parsing the file * @param policy the update policy * @throws IOException if an IO exception occurred * @throws ParseException if the JNLP file was invalid */ - public JNLPFile(URL location, String uniqueKey, Version version, boolean strict, UpdatePolicy policy) throws IOException, ParseException { - this(location, version, strict, policy); + public JNLPFile(URL location, String uniqueKey, Version version, ParserSettings settings, UpdatePolicy policy) throws IOException, ParseException { + this(location, version, settings, policy); this.uniqueKey = uniqueKey; if (JNLPRuntime.isDebug()) @@ -250,8 +254,9 @@ * @throws IOException if an IO exception occurred * @throws ParseException if the JNLP file was invalid */ - public JNLPFile(InputStream input, boolean strict) throws ParseException { - this(input, null, strict); + public JNLPFile(InputStream input, ParserSettings settings) throws ParseException { + this.parserSettings = settings; + parse(input, null, null); } /** @@ -263,22 +268,11 @@ * @throws IOException if an IO exception occurred * @throws ParseException if the JNLP file was invalid */ - public JNLPFile(InputStream input, URL codebase, boolean strict) throws ParseException { - parse(Parser.getRootNode(input), strict, null, codebase); + public JNLPFile(InputStream input, URL codebase, ParserSettings settings) throws ParseException { + this.parserSettings = settings; + parse(input, null, codebase); } - /** - * Create a JNLPFile from a character stream. - * - * @param input the stream - * @param strict whether to enforce the spec when - * @throws IOException if an IO exception occurred - * @throws ParseException if the JNLP file was invalid - */ - private JNLPFile(Reader input, boolean strict) throws ParseException { - // todo: now that we are using NanoXML we can use a Reader - //parse(Parser.getRootNode(input), strict, null); - } /** * Open the jnlp file URL from the cache if there, otherwise @@ -338,6 +332,13 @@ } /** + * Returns the ParserSettings that was used to parse this file + */ + public ParserSettings getParserSettings() { + return parserSettings; + } + + /** * Returns the JNLP file's version. */ public Version getFileVersion() { @@ -685,15 +686,16 @@ * from the constructor. * * @param root the root node - * @param strict whether to enforce the spec when + * @param settings the parser settings to use while parsing the file * @param location the file location or null */ - private void parse(Node root, boolean strict, URL location, URL forceCodebase) throws ParseException { + private void parse(InputStream input, URL location, URL forceCodebase) throws ParseException { try { //if (location != null) // location = new URL(location, "."); // remove filename - Parser parser = new Parser(this, location, root, strict, true, forceCodebase); // true == allow extensions + Node root = Parser.getRootNode(input, parserSettings); + Parser parser = new Parser(this, location, root, parserSettings, forceCodebase); // true == allow extensions // JNLP tag information specVersion = parser.getSpecVersion(); diff -r e09b9813d6de -r a236aa5f729b netx/net/sourceforge/jnlp/Launcher.java --- a/netx/net/sourceforge/jnlp/Launcher.java Thu Jun 20 17:00:52 2013 +0200 +++ b/netx/net/sourceforge/jnlp/Launcher.java Fri Jun 21 12:15:03 2013 +0200 @@ -477,12 +477,12 @@ try { JNLPFile file = null; - file = new JNLPFile(location, parserSettings.isStrict()); + file = new JNLPFile(location, parserSettings); if (fromSource) { // Launches the jnlp file where this file originated. if (file.getSourceLocation() != null) { - file = new JNLPFile(file.getSourceLocation(), parserSettings.isStrict()); + file = new JNLPFile(file.getSourceLocation(), parserSettings); } } return file; @@ -504,9 +504,11 @@ JNLPFile file = null; try { - file = new JNLPFile(location, (Version) null, true, updatePolicy); // strict + ParserSettings settings = new ParserSettings(true, true, false); + file = new JNLPFile(location, (Version) null, settings, updatePolicy); // strict } catch (ParseException ex) { - file = new JNLPFile(location, (Version) null, false, updatePolicy); + ParserSettings settings = new ParserSettings(false, true, true); + file = new JNLPFile(location, (Version) null, settings, updatePolicy); // only here if strict failed but lax did not fail LaunchException lex = diff -r e09b9813d6de -r a236aa5f729b netx/net/sourceforge/jnlp/MalformedXMLParser.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/netx/net/sourceforge/jnlp/MalformedXMLParser.java Fri Jun 21 12:15:03 2013 +0200 @@ -0,0 +1,123 @@ +/* + Copyright (C) 2013 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. + */ +package net.sourceforge.jnlp; + +import static net.sourceforge.jnlp.runtime.Translator.R; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; + +import net.sourceforge.jnlp.runtime.JNLPRuntime; + +import org.ccil.cowan.tagsoup.HTMLSchema; +import org.ccil.cowan.tagsoup.Parser; +import org.ccil.cowan.tagsoup.XMLWriter; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.XMLReader; + +/** + * An specialized {@link XMLParser} that uses TagSoup[1] to parse + * malformed XML + * + * Used by net.sourceforge.jnlp.Parser + * + * [1] http://home.ccil.org/~cowan/XML/tagsoup/ + */ +public class MalformedXMLParser extends XMLParser { + + /** + * Parses the data from an {@link InputStream} to create a XML tree. + * Returns a {@link Node} representing the root of the tree. + * + * @param input the {@link InputStream} to read data from + * @throws ParseException if an exception occurs while parsing the input + */ + @Override + public Node getRootNode(InputStream input) throws ParseException { + if (JNLPRuntime.isDebug()) { + System.out.println("Using MalformedXMLParser"); From ptisnovs at redhat.com Fri Jun 21 06:23:33 2013 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Fri, 21 Jun 2013 09:23:33 -0400 (EDT) Subject: [rfc][icedtea-web] More testing for IcedTeaScriptablePluginObject.cc + memory leak fixes In-Reply-To: <51AE0EA4.5040405@redhat.com> References: <51AE0EA4.5040405@redhat.com> Message-ID: <285720524.3087046.1371821013322.JavaMail.root@redhat.com> Hi Adam, both patches looks correct, ok for HEAD :-) I suppose that your later patches are applicable only when that two patches are applied/pushed, right? Cheers, Pavel ----- Adam Domurad wrote: > Hi all, I am looking into making the 'getvalue' NPAPI hook non-blocking. > This involves the Java-in-Javascript wrappers, so I'm trying to put more > of it under test. > > Included is a leak fix and extra C++ test infrastructure + tests. It is > working very well at detecting leaks due to 'new' without a > corresponding 'delete'. > > Before the fix two tests should report 1 leak with 'new'. After fix all > tests should pass. > > Test ChangeLog: > 2013-XX-XX Adam Domurad > > * plugin/icedteanp/IcedTeaPluginUtils.cc: Add global state clearing > utility functions. > * plugin/icedteanp/IcedTeaPluginUtils.h: Same. > * tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc: Test > scriptable object creation and destruction. > * tests/cpp-unit-tests/browser_mock.cc > (mock_createobject): New, mocks NPAPI 'createobject'. > * tests/cpp-unit-tests/MemoryLeakDetector.h: New, memory leak detection > utility class. > * tests/cpp-unit-tests/main.cc > (ReportTestFinish): Print which tests resulted in memory leaks. > > > Fix ChangeLog: > > 2013-XX-XX Adam Domurad > > * plugin/icedteanp/IcedTeaScriptablePluginObject.cc > > (IcedTeaScriptablePluginObject::get_scriptable_java_package_object): Fix > memory leak due to allocated NPClass. > (IcedTeaScriptableJavaPackageObject::get_scriptable_java_object): > Same. > > > Cheers, > -Adam > From bugzilla-daemon at icedtea.classpath.org Fri Jun 21 06:27:41 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 21 Jun 2013 13:27:41 +0000 Subject: [Bug 1026] Apps fail to run because of the nanoxml parser's strict XML validation In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1026 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED --- Comment #12 from JiriVanek --- http://icedtea.classpath.org/hg/icedtea-web/rev/a236aa5f729b But will appear in 1.5 release. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130621/670aa1e4/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Jun 21 06:28:48 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 21 Jun 2013 13:28:48 +0000 Subject: [Bug 1465] java.io.FileNotFoundException while trying to download a JAR file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1465 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130621/57e92140/attachment.html From ptisnovs at redhat.com Fri Jun 21 06:37:39 2013 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Fri, 21 Jun 2013 09:37:39 -0400 (EDT) Subject: [rfc][icedtea-web] Fix wrongly placed object construction helpers in IcedTeaScriptablePluginObject In-Reply-To: <51AF4C80.4050609@redhat.com> References: <51AF4C80.4050609@redhat.com> Message-ID: <1457877611.3093659.1371821859178.JavaMail.root@redhat.com> Hi Adam, ok for HEAD, thanks. I'll need to look at patches which will follow and use this refactored code ;) Cheers, Pavel ----- Adam Domurad wrote: > Whoever wrote these static helpers switched up which class they are > associated with -- it took me a while of being confused to notice it, > too. This patch places the object creation helper methods in the right > class. > I added some more type safety too to prevent future confusion. > > No changelog yet, I'll wait for an ack on the patch first. > > Cheers, > -Adam From gitne at excite.co.jp Fri Jun 21 07:16:57 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Fri, 21 Jun 2013 23:16:57 +0900 Subject: =?ISO-2022-JP?B?UmU6IEljZWRUZWEgMS4xMi41IHdpbmRvd3MgYnVpbGQgZXJyb3Jz?= Message-ID: <201306211416.r5LEGvEO008716@mail-web01.excite.co.jp> Hello there! > I'm interesting in maintaining windows builds for IcedTea, is it > possible to have windows-specific changes upstreamed into IcedTea? This is great! I have cought up on your progress building IcedTea for/on Windows. I am also very interested in having a supported "official" binary release of IcedTea for Windows. Should you need any help in adjusting or simplifying the build process on Windows, I would be glad to help. Just to avoid any confusion, I am not currently interested in maintaing an IcedTea release for Windows, mainly because I lack the experience and sometimes expertise to do that. I would like to have official binary releases that ordinary users or admins can grab, install and run productively. I would also like to make adjustments to the build process, so that IcedTea can be relatively easily build on Windows with open-source tools (as one of IcedTea project's main goals states), mainly native tools (no dependency on cygwin neither at build nor at run time). Furthermore, I would like to provide an MSI installer for an IcedTea binary release. > Yes, to make clear the whole current process: > 1) run "./configure" on debian wheezy amd64 > 2) run "make" (from the same icedtea dir), wait for all icedtea > patches applied, abort build > 3) copy "openjdk" dir to windows box > 4) apply windows-specific patches, run windows build as a normal > openjdk6 control build As I see it, this build process is far too complicated (still, thank you for doing this aweful work). :) That said, I asume those patches only apply to IcedTea's code, not the build process? Regarding the build procees, I would even propose to go as far as to convert the build process to an ant-driven project (or provide side-by-side), well-knowing this may sound as heresy to some people and being unsure whether this is possible at all. Well, the benefits of that should be pretty obvious, so will not elaborate on that. Anyway, it would be nice to work something out. Regards, Jacob From jvanek at redhat.com Fri Jun 21 07:18:56 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 21 Jun 2013 16:18:56 +0200 Subject: [rfc][icedtea-web] fix (And tests) for PR1473 In-Reply-To: <51B724F6.5000602@redhat.com> References: <51B5B02E.7020001@redhat.com> <51B5EFA8.1010601@redhat.com> <51B6329B.9010402@redhat.com> <51B70B80.4070809@redhat.com> <51B724F6.5000602@redhat.com> Message-ID: <51C460D0.1090309@redhat.com> On 06/11/2013 03:24 PM, Adam Domurad wrote: > On 06/11/2013 07:35 AM, Jiri Vanek wrote: >> On 06/10/2013 10:10 PM, Adam Domurad wrote: >>> On 06/10/2013 11:24 AM, Jiri Vanek wrote: >>>> >>>> >>>> This patch is removing the redownloading of jnlp file - both from local >>>> file and form network, and >>>> so fixing the http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1473 >>>> >>>> The unhappy redownloading was added during one of inital pushes - >>>> http://icedtea.classpath.org/hg/icedtea-web/rev/1d604ccd9b6b And I'm >>>> wondering why:) >>>> >>>> >>>> J. >>>> >>>> >>>> >>> >>> >>> OK this patch left me a bit confused, file.getSourceLocation() is the location of the href, we are >>> correctly redownloading >> >> Is it really correct? It is what is wanted? WYYY!?!?!!? [1] >> >>> from here to get the most up-to-date JNLP. However we can skip this check >> >> This is 100% wrong for generated jnlp, which have some session id (eg ellumintate). [1] >> >> After yesterdays conversation with Omair, I believe that this patch is correct. [1] >>> based on the update policy, and if we are already downloading from a network location (and we >>> should, too). >> >> Update policy is missuesd in case of forcible re downloaded jnlp [1] >>> >>> Your tests seem to fail because the JNLP from the href is attempting to be downloaded -- but this is >>> correct behaviour. Can you explain ? >> >> Yah. My intention was to simulate generated id,and I was to lazy to crate dynamic generation hook >> in our testing server;) >> >> So look into it as that user download GeneratedId.jnlp, where is some value - AnotherId and save >> it as GeneratedId_1_tmp.jnlp. Then launches this file, but we redownload the GeneratedId.jnlp >> where is "generated" SomeId, so the parameter id will be suddenly wrong. See the usecases [1] ;) >>> >>> Thanks, >>> -Adam >> >> >> [1] >> >> >> Typical (correct) usecases I can see: >> >> * ./javaws http:/some.remote.url/some.jnlp >> - best usecase, will have most recent jnlp, and we do not need to redownload (btw I'm sure we are >> redownloading even in this case and it is WRONG) >> >> >> * ./javaws somewhere/stored/some.jnlp >> - imho most common usecase. As user will probably click on the jnlp in browser, and then "open >> with javaws" (then browser will save it somewhere and lunch the command above). >> - then redownlaoding is wrong - user already have the most recent version. And if in this jnlp was >> generated id, session or whatever, it will be lost. >> >> * I do not believe user will later dig for this jnlp file and so lunch the outdated >> >> >> * The only wrong usecases I can see after this patch is our jnlp desktop icon. >> It /points/directy/to/cached/file.jnlp and so the risk of running outdated one is possible. >> >> But it is bug - this desktop file must point to http://original.url/file.jnlp and the offline run >> must be handled in better way (goal for 1.5 ;) (see [rfc] [icedtea-web] desktop icon is pointing >> to cache instead to real url and its thread from 1.2.5013 (where you yourself have participated) >> >> >> Thanx for disagreeing:) >> J. >> >> > > OK we discussed this more on IRC and I think we're agreed: > - Don't redownload if no href (already the case) > - Don't redownload if not local file (needs to be added) > > The case where you save the JNLP and immediately launch it unfortunately does redownload, we can > however do some timestamp check if you really do not like this. > Other than that ideally the caching system would be allow for a simple HEAD request to determine if > the JNLP needs to be updated, instead of a full redownload. ook, try this:) > > Cheers, > -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: correctRedownloadeing.patch Type: text/x-patch Size: 19500 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130621/669b2641/correctRedownloadeing.patch From adomurad at redhat.com Fri Jun 21 08:13:42 2013 From: adomurad at redhat.com (Adam Domurad) Date: Fri, 21 Jun 2013 11:13:42 -0400 Subject: [rfc][icedtea-web] fix (And tests) for PR1473 In-Reply-To: <51C460D0.1090309@redhat.com> References: <51B5B02E.7020001@redhat.com> <51B5EFA8.1010601@redhat.com> <51B6329B.9010402@redhat.com> <51B70B80.4070809@redhat.com> <51B724F6.5000602@redhat.com> <51C460D0.1090309@redhat.com> Message-ID: <51C46DA6.2020101@redhat.com> >> >> OK we discussed this more on IRC and I think we're agreed: >> - Don't redownload if no href (already the case) >> - Don't redownload if not local file (needs to be added) >> >> The case where you save the JNLP and immediately launch it >> unfortunately does redownload, we can >> however do some timestamp check if you really do not like this. >> Other than that ideally the caching system would be allow for a simple >> HEAD request to determine if >> the JNLP needs to be updated, instead of a full redownload. > > > ook, try this:) Thanks for the update! >> >> Cheers, >> -Adam > Patch: > diff -r a236aa5f729b netx/net/sourceforge/jnlp/Launcher.java > --- a/netx/net/sourceforge/jnlp/Launcher.java Fri Jun 21 12:15:03 2013 +0200 > +++ b/netx/net/sourceforge/jnlp/Launcher.java Fri Jun 21 16:13:37 2013 +0200 > @@ -260,30 +260,18 @@ > return tg.getApplication(); > } > > - /** > - * Launches a JNLP file by calling the launch method for the > - * appropriate file type. > - * > - * @param location the URL of the JNLP file to launch > - * @throws LaunchException if there was an exception > - * @return the application instance > - */ > - public ApplicationInstance launch(URL location) throws LaunchException { > - return launch(toFile(location)); > - } > > /** > * Launches a JNLP file by calling the launch method for the > * appropriate file type. > * > * @param location the URL of the JNLP file to launch > - * @param fromSource if true, the JNLP file will be re-read from the source > * location to get the pristine version > * @throws LaunchException if there was an exception > * @return the application instance > */ > - public ApplicationInstance launch(URL location, boolean fromSource) throws LaunchException { > - return launch(fromUrl(location, fromSource)); > + public ApplicationInstance launch(URL location) throws LaunchException { > + return launch(fromUrl(location)); > } > > /** > @@ -372,28 +360,7 @@ > } > } > > - /** > - * Launches a JNLP file by calling the launch method for the > - * appropriate file type in a different thread. > - * > - * @param file the JNLP file to launch > - */ > - public void launchBackground(JNLPFile file) { > - BgRunner runner = new BgRunner(file, null); > - new Thread(runner).start(); > - } > - > - /** > - * Launches the JNLP file at the specified location in the > - * background by calling the launch method for its file type. > - * > - * @param location the location of the JNLP file > - */ > - public void launchBackground(URL location) { > - BgRunner runner = new BgRunner(null, location); > - new Thread(runner).start(); > - } > - > + > /** > * Launches the JNLP file in a new JVM instance. The launched > * application's output is sent to the system out and it's > @@ -473,62 +440,36 @@ > /** > * Returns the JNLPFile for the URL, with error handling. > */ > - private JNLPFile fromUrl(URL location, boolean fromSource) throws LaunchException { > + private JNLPFile fromUrl(URL location) throws LaunchException { > try { > JNLPFile file = null; > > file = new JNLPFile(location, parserSettings); > + > + boolean isLocal = false; > + boolean haveHref = false; > + if ("file".equalsIgnoreCase(location.getProtocol()) && new File(location.getFile()).exists()) { Hm, why does it have to exist to be local (current logic == only redownload if it exists) ? Anyway, its probably harmless either way > + isLocal = true; > + } > + if (file.getSourceLocation() != null) { > + haveHref = true; > + } > > - if (fromSource) { > - // Launches the jnlp file where this file originated. > - if (file.getSourceLocation() != null) { > - file = new JNLPFile(file.getSourceLocation(), parserSettings); > - } > + if (isLocal && haveHref) { > + file = new JNLPFile(file.getSourceLocation(), parserSettings); > } > return file; > } catch (Exception ex) { > - if (ex instanceof LaunchException) > + if (ex instanceof LaunchException) { > throw (LaunchException) ex; // already sent to handler when first thrown > - else > + } else { > // IO and Parse > throw launchError(new LaunchException(null, ex, R("LSFatal"), R("LCReadError"), R("LCantRead"), R("LCantReadInfo"))); > + } > } > } > > - /** > - * Returns the JNLPFile for the URL, with error handling. > - */ > - @Deprecated > - private JNLPFile toFile(URL location) throws LaunchException { > - try { > - JNLPFile file = null; > - > - try { > - ParserSettings settings = new ParserSettings(true, true, false); > - file = new JNLPFile(location, (Version) null, settings, updatePolicy); // strict > - } catch (ParseException ex) { > - ParserSettings settings = new ParserSettings(false, true, true); > - file = new JNLPFile(location, (Version) null, settings, updatePolicy); > - > - // only here if strict failed but lax did not fail > - LaunchException lex = > - launchWarning(new LaunchException(file, ex, R("LSMinor"), R("LCFileFormat"), R("LNotToSpec"), R("LNotToSpecInfo"))); > - > - if (lex != null) > - throw lex; > - } > - > - return file; > - } catch (Exception ex) { > - if (ex instanceof LaunchException) > - throw (LaunchException) ex; // already sent to handler when first thrown > - else > - // IO and Parse > - throw launchError(new LaunchException(null, ex, R("LSFatal"), R("LCReadError"), R("LCantRead"), R("LCantReadInfo"))); > - } > - } > - > - /** > + /** > * Launches a JNLP application. This method should be called > * from a thread in the application's thread group. > */ > @@ -973,31 +914,6 @@ > > }; > > - /** > - * This runnable is used by the launchBackground > - * methods to launch a JNLP file from a separate thread. > - */ > - private class BgRunner implements Runnable { > - private JNLPFile file; > - private URL location; > - > - BgRunner(JNLPFile file, URL location) { > - this.file = file; > - this.location = location; > - } > - > - public void run() { > - try { > - if (file != null) > - launch(file); > - if (location != null) > - launch(location); > - } catch (LaunchException ex) { > - // launch method communicates error conditions to the > - // handler if it exists, otherwise we don't care because > - // there's nothing that can be done about the exception. > - } > - } > - }; > + I approve this sneak-in > > } > diff -r a236aa5f729b netx/net/sourceforge/jnlp/runtime/Boot.java > --- a/netx/net/sourceforge/jnlp/runtime/Boot.java Fri Jun 21 12:15:03 2013 +0200 > +++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Fri Jun 21 16:13:37 2013 +0200 > @@ -215,7 +215,7 @@ > Launcher launcher = new Launcher(false); > launcher.setParserSettings(settings); > launcher.setInformationToMerge(extra); > - launcher.launch(getFileLocation(), true); > + launcher.launch(getFileLocation()); > } catch (LaunchException ex) { > // default handler prints this > } catch (Exception ex) { > diff -r a236aa5f729b tests/reproducers/simple/GeneratedId/resources/GeneratedId.jnlp > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/reproducers/simple/GeneratedId/resources/GeneratedId.jnlp Fri Jun 21 16:13:37 2013 +0200 > @@ -0,0 +1,51 @@ > + > + > + > + > + > + > + Test Generated Id > + IcedTea > + > + > + > + > + > + SomeId > + > + > diff -r a236aa5f729b tests/reproducers/simple/GeneratedId/srcs/GeneratedId.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/reproducers/simple/GeneratedId/srcs/GeneratedId.java Fri Jun 21 16:13:37 2013 +0200 > @@ -0,0 +1,44 @@ > +/* 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 GeneratedId { > + static public void main(String[] args) { > + for(int x = 0; x + System.out.println(x+" - id: "+args[x]); > + } > + } > +} > diff -r a236aa5f729b tests/reproducers/simple/GeneratedId/testcases/GeneratedIdTest.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/reproducers/simple/GeneratedId/testcases/GeneratedIdTest.java Fri Jun 21 16:13:37 2013 +0200 > @@ -0,0 +1,183 @@ > +/* 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.io.File; > +import java.io.FileInputStream; > +import java.io.IOException; > +import java.util.ArrayList; > +import java.util.List; > +import junit.framework.Assert; > +import net.sourceforge.jnlp.ProcessResult; > +import net.sourceforge.jnlp.ServerAccess; > +import org.junit.Test; > + > +public class GeneratedIdTest { > + > + private static final ServerAccess server = new ServerAccess(); > + private static final String okBase = "0 - id: "; > + private static final String someId1 = "SomeId"; > + private static final String someId2 = "AnotherId"; > + private static final String okBase1 = okBase + someId1; > + private static final String okBase2 = okBase + someId2; > + private static final String baseName1 = "GeneratedId.jnlp"; > + private static final String baseName1_noHref = "GeneratedIdNoHref.jnlp"; > + private static final String baseName2 = "GeneratedId_1_tmp.jnlp"; > + private static final String baseName2_noHref = "GeneratedIdNoHref_1_tmp.jnlp"; > + > + public static File prepareChangedFileWithHref() throws IOException { > + File src = new File(server.getDir(), baseName1); > + File dest = new File(server.getDir(), baseName2); > + String srcJnlp = ServerAccess.getContentOfStream(new FileInputStream(src)); > + ServerAccess.saveFile(srcJnlp.replace(someId1, someId2), dest); > + return dest; > + } > + > + public static File prepareChangedFileNoHref() throws IOException { > + File src = new File(server.getDir(), baseName1); > + File dest = new File(server.getDir(), baseName2_noHref); > + String srcJnlp = ServerAccess.getContentOfStream(new FileInputStream(src)); > + ServerAccess.saveFile(srcJnlp.replace(someId1, someId2).replace("href=\"GeneratedId.jnlp\"", ""), dest); > + return dest; > + } > + > + public static File prepareCopiedFileNoHref() throws IOException { > + File src = new File(server.getDir(), baseName1); > + File dest = new File(server.getDir(), baseName1_noHref); > + String srcJnlp = ServerAccess.getContentOfStream(new FileInputStream(src)); > + ServerAccess.saveFile(srcJnlp.replace("href=\"GeneratedId.jnlp\"", ""), dest); > + return dest; > + } > + > + @Test > + //have href > + //is local > + //should be redownlaoded s/redownlaoded/redownloaded/ (for each comment) :-) > + //href points to different file > + public void launchLocalChangedFileWithHref() throws Exception { > + File dest = prepareChangedFileWithHref(); > + List l = new ArrayList(3); > + l.add(server.getJavawsLocation()); > + l.add(ServerAccess.HEADLES_OPTION); > + l.add(dest.getAbsolutePath()); > + ProcessResult pr = ServerAccess.executeProcess(l); > + Assert.assertTrue("Stdout should contain '" + okBase1 + "', but did not.", pr.stdout.contains(okBase1)); > + } > + > + @Test > + //do not have href > + //is local > + //should NOT be redownlaoded > + public void launchLocalChangedFileWithNoHref() throws Exception { > + File dest = prepareChangedFileNoHref(); > + List l = new ArrayList(3); > + l.add(server.getJavawsLocation()); > + l.add(ServerAccess.HEADLES_OPTION); > + l.add(dest.getAbsolutePath()); > + ProcessResult pr = ServerAccess.executeProcess(l); > + Assert.assertTrue("Stdout should contain '" + okBase2 + "', but did not.", pr.stdout.contains(okBase2)); > + } > + > + @Test > + //do have href [nit] space > + //is local > + //should be redownlaoded (how to verify!?!) > + public void launchLocalFileWithHref() throws Exception { > + File dest = new File(server.getDir(), baseName1); > + List l = new ArrayList(3); > + l.add(server.getJavawsLocation()); > + l.add(ServerAccess.HEADLES_OPTION); > + l.add(dest.getAbsolutePath()); > + ProcessResult pr = ServerAccess.executeProcess(l); > + Assert.assertTrue("Stdout should contain '" + okBase1 + "', but did not.", pr.stdout.contains(okBase1)); > + } > + > + @Test > + //do have href Do NOT here. :-) > + //is local > + //should NOT be redownlaoded (how to verify!?!) [nit] IMO unnecessary comment because there is no need to verify this. No href+local file -> no place to possibly redownload from. > + public void launchLocalFileNoHref() throws Exception { > + File dest = prepareCopiedFileNoHref(); > + List l = new ArrayList(3); > + l.add(server.getJavawsLocation()); > + l.add(ServerAccess.HEADLES_OPTION); > + l.add(dest.getAbsolutePath()); > + ProcessResult pr = ServerAccess.executeProcess(l); > + Assert.assertTrue("Stdout should contain '" + okBase1 + "', but did not.", pr.stdout.contains(okBase1)); > + } > + > + @Test > + //remote > + //have href > + //should not be redownlaoded (how to verify!?!) Although this one is trickier :-) > + //href is same file > + public void launchRemoteFileWithHref() throws Exception { > + ProcessResult pr = server.executeJavawsHeadless("/" + baseName1); > + Assert.assertTrue("Stdout should contain '" + okBase1 + "', but did not.", pr.stdout.contains(okBase1)); > + } > + > + //remote > + //have href > + //should NOT be redownlaoded > + //href is different file > + @Test > + public void launchRemoteChangedFileWithHref() throws Exception { > + File f = prepareChangedFileWithHref(); > + ProcessResult pr = server.executeJavawsHeadless("/" + f.getName()); > + Assert.assertTrue("Stdout should contain '" + okBase2 + "', but did not.", pr.stdout.contains(okBase2)); > + } > + > + @Test > + //remote > + //have not href > + //should not be redownlaoded (how to verify!?!) > + //href is same file It has no href but 'href is same file' ?? > + public void launchRemoteFileWithNoHref() throws Exception { > + File f = prepareCopiedFileNoHref(); > + ProcessResult pr = server.executeJavawsHeadless("/" + f.getName()); > + Assert.assertTrue("Stdout should contain '" + okBase1 + "', but did not.", pr.stdout.contains(okBase1)); > + } > + > + //remote > + //have not href > + //should NOT be redownlaoded > + //href is different file It has no href but 'href is different file' ?? > + @Test > + public void launchRemoteChangedFileWithNoHref() throws Exception { > + File f = prepareChangedFileNoHref(); > + ProcessResult pr = server.executeJavawsHeadless("/" + f.getName()); > + Assert.assertTrue("Stdout should contain '" + okBase2 + "', but did not.", pr.stdout.contains(okBase2)); > + } > +} Thank you, mostly nits (beyond the typo). Address nits however you choose and push. Happy hacking, -Adam From adomurad at icedtea.classpath.org Fri Jun 21 08:55:51 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Fri, 21 Jun 2013 15:55:51 +0000 Subject: /hg/icedtea-web: 2 new changesets Message-ID: changeset 8c77698ab575 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=8c77698ab575 author: Adam Domurad date: Fri Jun 21 11:39:00 2013 -0400 More unit tests for scriptable object creation, destruction changeset cfdb17c00603 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=cfdb17c00603 author: Adam Domurad date: Fri Jun 21 11:41:31 2013 -0400 Fix memory leak due to allocated NPClass diffstat: ChangeLog | 22 +++ plugin/icedteanp/IcedTeaPluginUtils.cc | 20 +++ plugin/icedteanp/IcedTeaPluginUtils.h | 10 +- plugin/icedteanp/IcedTeaScriptablePluginObject.cc | 96 +++++++------- tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc | 3 - tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc | 52 ++++++- tests/cpp-unit-tests/MemoryLeakDetector.h | 85 +++++++++++++ tests/cpp-unit-tests/browser_mock.cc | 15 ++- tests/cpp-unit-tests/main.cc | 10 +- 9 files changed, 247 insertions(+), 66 deletions(-) diffs (477 lines): diff -r a236aa5f729b -r cfdb17c00603 ChangeLog --- a/ChangeLog Fri Jun 21 12:15:03 2013 +0200 +++ b/ChangeLog Fri Jun 21 11:41:31 2013 -0400 @@ -1,3 +1,25 @@ +2013-06-21 Adam Domurad + + * plugin/icedteanp/IcedTeaScriptablePluginObject.cc + (IcedTeaScriptablePluginObject::get_scriptable_java_package_object): Fix + memory leak due to allocated NPClass. + (IcedTeaScriptableJavaPackageObject::get_scriptable_java_object): + Same. + +2013-06-21 Adam Domurad + + * plugin/icedteanp/IcedTeaPluginUtils.cc: Add global state clearing + utility functions. + * plugin/icedteanp/IcedTeaPluginUtils.h: Same. + * tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc: Test + scriptable object creation and destruction. + * tests/cpp-unit-tests/browser_mock.cc + (mock_createobject): New, mocks NPAPI 'createobject'. + * tests/cpp-unit-tests/MemoryLeakDetector.h: New, memory leak detection + utility class. + * tests/cpp-unit-tests/main.cc + (ReportTestFinish): Print which tests resulted in memory leaks. + 2013-06-21 Jiri Vanek Adam Domurad Omair Majid diff -r a236aa5f729b -r cfdb17c00603 plugin/icedteanp/IcedTeaPluginUtils.cc --- a/plugin/icedteanp/IcedTeaPluginUtils.cc Fri Jun 21 12:15:03 2013 +0200 +++ b/plugin/icedteanp/IcedTeaPluginUtils.cc Fri Jun 21 11:41:31 2013 -0400 @@ -498,6 +498,14 @@ instance_map->erase(member_ptr); } +/* Clear instance_map. Useful for tests. */ +void +IcedTeaPluginUtilities::clearInstanceIDs() +{ + delete instance_map; + instance_map = new std::map(); +} + /** * Removes all mappings to a given instance, and all associated objects */ @@ -603,6 +611,18 @@ object_map->erase(key); } +/* Clear object_map. Useful for tests. */ +void +IcedTeaPluginUtilities::clearObjectMapping() +{ + std::map::iterator iter = object_map->begin(); + for (; iter != object_map->end(); ++iter) { + browser_functions.releaseobject(iter->second); + } + delete object_map; + object_map = new std::map(); +} + /* * Similar to printStringVector, but takes a vector of string pointers instead * diff -r a236aa5f729b -r cfdb17c00603 plugin/icedteanp/IcedTeaPluginUtils.h --- a/plugin/icedteanp/IcedTeaPluginUtils.h Fri Jun 21 12:15:03 2013 +0200 +++ b/plugin/icedteanp/IcedTeaPluginUtils.h Fri Jun 21 11:41:31 2013 -0400 @@ -252,9 +252,12 @@ static void storeInstanceID(void* member_ptr, NPP instance); - static void removeInstanceID(void* member_ptr); + static void removeInstanceID(void* member_ptr); - static NPP getInstanceFromMemberPtr(void* member_ptr); + /* Clear object_map. Useful for tests. */ + static void clearInstanceIDs(); + + static NPP getInstanceFromMemberPtr(void* member_ptr); static NPObject* getNPObjectFromJavaKey(std::string key); @@ -262,6 +265,9 @@ static void removeObjectMapping(std::string key); + /* Clear object_map. Useful for tests. */ + static void clearObjectMapping(); + static void invalidateInstance(NPP instance); static bool isObjectJSArray(NPP instance, NPObject* object); diff -r a236aa5f729b -r cfdb17c00603 plugin/icedteanp/IcedTeaScriptablePluginObject.cc --- a/plugin/icedteanp/IcedTeaScriptablePluginObject.cc Fri Jun 21 12:15:03 2013 +0200 +++ b/plugin/icedteanp/IcedTeaScriptablePluginObject.cc Fri Jun 21 11:41:31 2013 -0400 @@ -139,35 +139,39 @@ return new IcedTeaScriptableJavaPackageObject(npp); } +static NPClass +scriptable_plugin_object_class() { + NPClass np_class; + np_class.structVersion = NP_CLASS_STRUCT_VERSION; + np_class.allocate = allocate_scriptable_jp_object; + np_class.deallocate = IcedTeaScriptableJavaPackageObject::deAllocate; + np_class.invalidate = IcedTeaScriptableJavaPackageObject::invalidate; + np_class.hasMethod = IcedTeaScriptableJavaPackageObject::hasMethod; + np_class.invoke = IcedTeaScriptableJavaPackageObject::invoke; + np_class.invokeDefault = IcedTeaScriptableJavaPackageObject::invokeDefault; + np_class.hasProperty = IcedTeaScriptableJavaPackageObject::hasProperty; + np_class.getProperty = IcedTeaScriptableJavaPackageObject::getProperty; + np_class.setProperty = IcedTeaScriptableJavaPackageObject::setProperty; + np_class.removeProperty = IcedTeaScriptableJavaPackageObject::removeProperty; + np_class.enumerate = IcedTeaScriptableJavaPackageObject::enumerate; + np_class.construct = IcedTeaScriptableJavaPackageObject::construct; + return np_class; +} + NPObject* IcedTeaScriptablePluginObject::get_scriptable_java_package_object(NPP instance, const NPUTF8* name) { + /* Shared NPClass instance for IcedTeaScriptablePluginObject */ + static NPClass np_class = scriptable_plugin_object_class(); - NPObject* scriptable_object; - - NPClass* np_class = new NPClass(); - np_class->structVersion = NP_CLASS_STRUCT_VERSION; - np_class->allocate = allocate_scriptable_jp_object; - np_class->deallocate = IcedTeaScriptableJavaPackageObject::deAllocate; - np_class->invalidate = IcedTeaScriptableJavaPackageObject::invalidate; - np_class->hasMethod = IcedTeaScriptableJavaPackageObject::hasMethod; - np_class->invoke = IcedTeaScriptableJavaPackageObject::invoke; - np_class->invokeDefault = IcedTeaScriptableJavaPackageObject::invokeDefault; - np_class->hasProperty = IcedTeaScriptableJavaPackageObject::hasProperty; - np_class->getProperty = IcedTeaScriptableJavaPackageObject::getProperty; - np_class->setProperty = IcedTeaScriptableJavaPackageObject::setProperty; - np_class->removeProperty = IcedTeaScriptableJavaPackageObject::removeProperty; - np_class->enumerate = IcedTeaScriptableJavaPackageObject::enumerate; - np_class->construct = IcedTeaScriptableJavaPackageObject::construct; - - scriptable_object = browser_functions.createobject(instance, np_class); - PLUGIN_DEBUG("Returning new scriptable package class: %p from instance %p with name %s\n", scriptable_object, instance, name); + NPObject* scriptable_object = browser_functions.createobject(instance, &np_class); + PLUGIN_DEBUG("Returning new scriptable package class: %p from instance %p with name %s\n", scriptable_object, instance, name); ((IcedTeaScriptableJavaPackageObject*) scriptable_object)->setPackageName(name); IcedTeaPluginUtilities::storeInstanceID(scriptable_object, instance); - return scriptable_object; + return scriptable_object; } IcedTeaScriptableJavaPackageObject::IcedTeaScriptableJavaPackageObject(NPP instance) @@ -357,21 +361,39 @@ return new IcedTeaScriptableJavaObject(npp); } + +static NPClass +scriptable_java_package_object_class() { + NPClass np_class; + np_class.structVersion = NP_CLASS_STRUCT_VERSION; + np_class.allocate = allocate_scriptable_java_object; + np_class.deallocate = IcedTeaScriptableJavaObject::deAllocate; + np_class.invalidate = IcedTeaScriptableJavaObject::invalidate; + np_class.hasMethod = IcedTeaScriptableJavaObject::hasMethod; + np_class.invoke = IcedTeaScriptableJavaObject::invoke; + np_class.invokeDefault = IcedTeaScriptableJavaObject::invokeDefault; + np_class.hasProperty = IcedTeaScriptableJavaObject::hasProperty; + np_class.getProperty = IcedTeaScriptableJavaObject::getProperty; + np_class.setProperty = IcedTeaScriptableJavaObject::setProperty; + np_class.removeProperty = IcedTeaScriptableJavaObject::removeProperty; + np_class.enumerate = IcedTeaScriptableJavaObject::enumerate; + np_class.construct = IcedTeaScriptableJavaObject::construct; + return np_class; +} + NPObject* IcedTeaScriptableJavaPackageObject::get_scriptable_java_object(NPP instance, std::string class_id, std::string instance_id, bool isArray) { - NPObject* scriptable_object; + /* Shared NPClass instance for IcedTeaScriptablePluginObject */ + static NPClass np_class = scriptable_java_package_object_class(); - std::string obj_key = std::string(); - obj_key += class_id; - obj_key += ":"; - obj_key += instance_id; + std::string obj_key = class_id + ":" + instance_id; PLUGIN_DEBUG("get_scriptable_java_object searching for %s...\n", obj_key.c_str()); - scriptable_object = IcedTeaPluginUtilities::getNPObjectFromJavaKey(obj_key); + NPObject* scriptable_object = IcedTeaPluginUtilities::getNPObjectFromJavaKey(obj_key); if (scriptable_object != NULL) { @@ -380,24 +402,8 @@ return scriptable_object; } - - NPClass* np_class = new NPClass(); - np_class->structVersion = NP_CLASS_STRUCT_VERSION; - np_class->allocate = allocate_scriptable_java_object; - np_class->deallocate = IcedTeaScriptableJavaObject::deAllocate; - np_class->invalidate = IcedTeaScriptableJavaObject::invalidate; - np_class->hasMethod = IcedTeaScriptableJavaObject::hasMethod; - np_class->invoke = IcedTeaScriptableJavaObject::invoke; - np_class->invokeDefault = IcedTeaScriptableJavaObject::invokeDefault; - np_class->hasProperty = IcedTeaScriptableJavaObject::hasProperty; - np_class->getProperty = IcedTeaScriptableJavaObject::getProperty; - np_class->setProperty = IcedTeaScriptableJavaObject::setProperty; - np_class->removeProperty = IcedTeaScriptableJavaObject::removeProperty; - np_class->enumerate = IcedTeaScriptableJavaObject::enumerate; - np_class->construct = IcedTeaScriptableJavaObject::construct; - - // try to create normally - scriptable_object = browser_functions.createobject(instance, np_class); + // try to create normally + scriptable_object = browser_functions.createobject(instance, &np_class); // didn't work? try creating asynch if (!scriptable_object) @@ -408,7 +414,7 @@ thread_data.result = std::string(); thread_data.parameters.push_back(instance); - thread_data.parameters.push_back(np_class); + thread_data.parameters.push_back(&np_class); thread_data.parameters.push_back(&scriptable_object); IcedTeaPluginUtilities::callAndWaitForResult(instance, &_createAndRetainJavaObject, &thread_data); diff -r a236aa5f729b -r cfdb17c00603 tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc --- a/tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc Fri Jun 21 12:15:03 2013 +0200 +++ b/tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc Fri Jun 21 11:41:31 2013 -0400 @@ -44,9 +44,6 @@ #include "IcedTeaNPPlugin.h" #include -extern void trim(std::string& str); -extern bool file_exists(std::string filename); - TEST(NPVariantAsString) { NPVariant var; STRINGZ_TO_NPVARIANT("test", var); diff -r a236aa5f729b -r cfdb17c00603 tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc --- a/tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc Fri Jun 21 12:15:03 2013 +0200 +++ b/tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc Fri Jun 21 11:41:31 2013 -0400 @@ -39,28 +39,60 @@ #include #include "browser_mock.h" -#include "checked_allocations.h" +#include "MemoryLeakDetector.h" #include "IcedTeaScriptablePluginObject.h" +#include "IcedTeaPluginUtils.h" + +static NPP_t dummy_npp = {0,0}; + +SUITE(IcedTeaScriptablePluginObject) { + TEST(destructor) { + MemoryLeakDetector leak_detector; + IcedTeaScriptablePluginObject* obj = new IcedTeaScriptablePluginObject(&dummy_npp); + delete obj; + CHECK(leak_detector.memory_leaks() == 0); + } + + TEST(get_scriptable_java_object) { + MemoryLeakDetector leak_detector; + NPObject* obj = IcedTeaScriptablePluginObject::get_scriptable_java_package_object(&dummy_npp, "DummyPackage"); + browser_functions.releaseobject(obj); + CHECK(leak_detector.memory_leaks() == 0); + } +} SUITE(IcedTeaScriptableJavaObject) { TEST(deallocate) { - int pre_allocations = cpp_unfreed_allocations(); - IcedTeaScriptableJavaObject* obj = new IcedTeaScriptableJavaObject(NULL); + MemoryLeakDetector leak_detector; + IcedTeaScriptableJavaObject* obj = new IcedTeaScriptableJavaObject(&dummy_npp); IcedTeaScriptableJavaObject::deAllocate(obj); - int post_allocations = cpp_unfreed_allocations(); - - CHECK(pre_allocations == post_allocations); + CHECK(leak_detector.memory_leaks() == 0); } } SUITE(IcedTeaScriptableJavaPackageObject) { TEST(deallocate) { - int pre_allocations = cpp_unfreed_allocations(); - IcedTeaScriptableJavaPackageObject* obj = new IcedTeaScriptableJavaPackageObject(NULL); + MemoryLeakDetector leak_detector; + IcedTeaScriptableJavaPackageObject* obj = new IcedTeaScriptableJavaPackageObject(&dummy_npp); IcedTeaScriptableJavaPackageObject::deAllocate(obj); - int post_allocations = cpp_unfreed_allocations(); + CHECK(leak_detector.memory_leaks() == 0); + } - CHECK(pre_allocations == post_allocations); + TEST(get_scriptable_java_object) { + MemoryLeakDetector leak_detector; + + NPObject* first_obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_object(&dummy_npp, "DummyClass", "DummyInstance", false); + browser_functions.releaseobject(first_obj); + + /* After the first call, the object should be cached in the object map */ + NPObject* second_obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_object(&dummy_npp, "DummyClass", "DummyInstance", false); + + /* Objects should be the same, because of caching */ + CHECK(first_obj == second_obj); + + browser_functions.releaseobject(second_obj); + + CHECK(leak_detector.memory_leaks() == 0); } } diff -r a236aa5f729b -r cfdb17c00603 tests/cpp-unit-tests/MemoryLeakDetector.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/cpp-unit-tests/MemoryLeakDetector.h Fri Jun 21 11:41:31 2013 -0400 @@ -0,0 +1,85 @@ +/* Copyright (C) 2013 Red Hat + + 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. */ + +// Memory leak detection helper class. +// This utilizes checked_allocations.h & browser_mock.h to query how many unfreed allocations exist. +// As well, it clears global state that is problematic for accurate measure of memory leaks. + +#ifndef MEMORYLEAKDETECTOR_H_ +#define MEMORYLEAKDETECTOR_H_ + +#include +#include "checked_allocations.h" +#include "IcedTeaPluginUtils.h" + +class MemoryLeakDetector { +public: + MemoryLeakDetector() { + reset(); + } + + /* Reset allocation counts and certain global state touched by the tests. + * This is necessary to ensure accurate leak reporting for some functions. */ + void reset() { + reset_global_state(); + initial_cpp_allocations = cpp_unfreed_allocations(); + initial_npapi_allocations = browsermock_unfreed_allocations(); + } + + /* Return allocation counts, after clearing global state that can conflict with the + * leak detection. */ + int memory_leaks() { + reset_global_state(); + int cpp_leaks = cpp_unfreed_allocations() - initial_cpp_allocations; + int npapi_leaks = browsermock_unfreed_allocations() - initial_npapi_allocations; + + return cpp_leaks + npapi_leaks; + } + +private: + static void reset_global_state() { + /* Clears allocations caused by storeInstanceID */ + IcedTeaPluginUtilities::clearInstanceIDs(); + /* Clears allocations caused by storeObjectMapping */ + IcedTeaPluginUtilities::clearObjectMapping(); + } + + int initial_cpp_allocations; + int initial_npapi_allocations; +}; + + +#endif /* MEMORYLEAKDETECTOR_H_ */ diff -r a236aa5f729b -r cfdb17c00603 tests/cpp-unit-tests/browser_mock.cc --- a/tests/cpp-unit-tests/browser_mock.cc Fri Jun 21 12:15:03 2013 +0200 +++ b/tests/cpp-unit-tests/browser_mock.cc Fri Jun 21 11:41:31 2013 -0400 @@ -73,17 +73,30 @@ if (obj->_class->deallocate) { obj->_class->deallocate(obj); } else { - free(obj); + mock_memfree(obj); } } } +static NPObject* mock_createobject(NPP instance, NPClass* np_class) { + NPObject* obj; + if (np_class->allocate) { + obj = np_class->allocate(instance, np_class); + } else { + obj = (NPObject*) mock_memalloc(sizeof(NPObject)); + } + obj->referenceCount = 1; + obj->_class = np_class; + return obj; +} + void browsermock_setup_functions() { memset(&browser_functions, 0, sizeof(NPNetscapeFuncs)); browser_functions.memalloc = &mock_memalloc; browser_functions.memfree = &mock_memfree; + browser_functions.createobject = &mock_createobject; browser_functions.retainobject = &mock_retainobject; browser_functions.releaseobject= &mock_releaseobject; } diff -r a236aa5f729b -r cfdb17c00603 tests/cpp-unit-tests/main.cc --- a/tests/cpp-unit-tests/main.cc Fri Jun 21 12:15:03 2013 +0200 +++ b/tests/cpp-unit-tests/main.cc Fri Jun 21 11:41:31 2013 -0400 @@ -85,18 +85,18 @@ float secondsElapsed) { int posttest_allocs = cpp_unfreed_allocations(); + std::string testname = full_testname(details); if (browsermock_unfreed_allocations() > 0) { - printf("*** WARNING: Memory leak! %d more NPAPI allocations than frees!\n", - browsermock_unfreed_allocations()); + printf("*** WARNING: %s has a memory leak! %d more NPAPI allocations than frees!\n", + testname.c_str(), browsermock_unfreed_allocations()); } if (posttest_allocs > pretest_allocs) { - printf("*** WARNING: Memory leak! %d more operator 'new' allocations than 'delete's!\n", - posttest_allocs - pretest_allocs); + printf("*** WARNING: %s has a memory leak! %d more operator 'new' allocations than 'delete's!\n", + testname.c_str(), posttest_allocs - pretest_allocs); } if (did_finish_correctly) { - std::string testname = full_testname(details); printf("Passed: %s\n", testname.c_str()); } } From adomurad at icedtea.classpath.org Fri Jun 21 11:13:18 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Fri, 21 Jun 2013 18:13:18 +0000 Subject: /hg/icedtea-web: 2 new changesets Message-ID: changeset 3216e845325e in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=3216e845325e author: Adam Domurad date: Fri Jun 21 12:47:45 2013 -0400 Move 'get_scriptable_java_package_object' and 'get_scriptable_java_object' into their correct respective classes. changeset ee92f55c69a3 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=ee92f55c69a3 author: Adam Domurad date: Fri Jun 21 13:55:10 2013 -0400 IcedTeaScriptableJavaObject simplifications diffstat: ChangeLog | 16 + plugin/icedteanp/IcedTeaNPPlugin.cc | 4 +- plugin/icedteanp/IcedTeaPluginUtils.cc | 4 +- plugin/icedteanp/IcedTeaScriptablePluginObject.cc | 164 +++---------- plugin/icedteanp/IcedTeaScriptablePluginObject.h | 115 ++++---- tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc | 38 +- 6 files changed, 141 insertions(+), 200 deletions(-) diffs (truncated from 630 to 500 lines): diff -r cfdb17c00603 -r ee92f55c69a3 ChangeLog --- a/ChangeLog Fri Jun 21 11:41:31 2013 -0400 +++ b/ChangeLog Fri Jun 21 13:55:10 2013 -0400 @@ -1,3 +1,19 @@ +2013-06-21 Adam Domurad + + * plugin/icedteanp/IcedTeaScriptablePluginObject.cc: Simplify + IcedTeaScriptableJavaObject + * plugin/icedteanp/IcedTeaScriptablePluginObject.h: Same + +2013-06-21 Adam Domurad + + * plugin/icedteanp/IcedTeaScriptablePluginObject.cc: + Move 'get_scriptable_java_package_object' and + 'get_scriptable_java_object' into their correct respective classes. + * plugin/icedteanp/IcedTeaScriptablePluginObject.h: Same. + * plugin/icedteanp/IcedTeaNPPlugin.cc: Update references. + * plugin/icedteanp/IcedTeaPluginUtils.cc: Same. + * tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc: Same. + 2013-06-21 Adam Domurad * plugin/icedteanp/IcedTeaScriptablePluginObject.cc diff -r cfdb17c00603 -r ee92f55c69a3 plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Fri Jun 21 11:41:31 2013 -0400 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Fri Jun 21 13:55:10 2013 -0400 @@ -2175,11 +2175,11 @@ applet_class_id.append(*(java_result->return_string)); - obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_object(instance, applet_class_id, instance_id, false); + obj = IcedTeaScriptableJavaObject::get_scriptable_java_object(instance, applet_class_id, instance_id, false); } else { - obj = IcedTeaScriptablePluginObject::get_scriptable_java_package_object(instance, ""); + obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object(instance, ""); } return obj; diff -r cfdb17c00603 -r ee92f55c69a3 plugin/icedteanp/IcedTeaPluginUtils.cc --- a/plugin/icedteanp/IcedTeaPluginUtils.cc Fri Jun 21 11:41:31 2013 -0400 +++ b/plugin/icedteanp/IcedTeaPluginUtils.cc Fri Jun 21 13:55:10 2013 -0400 @@ -822,11 +822,11 @@ NPObject* obj; if (jclass_id.at(0) == '[') // array { - obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_object(instance, jclass_id, + obj = IcedTeaScriptableJavaObject::get_scriptable_java_object(instance, jclass_id, jobject_id, true); } else { - obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_object(instance, jclass_id, + obj = IcedTeaScriptableJavaObject::get_scriptable_java_object(instance, jclass_id, jobject_id, false); } diff -r cfdb17c00603 -r ee92f55c69a3 plugin/icedteanp/IcedTeaScriptablePluginObject.cc --- a/plugin/icedteanp/IcedTeaScriptablePluginObject.cc Fri Jun 21 11:41:31 2013 -0400 +++ b/plugin/icedteanp/IcedTeaScriptablePluginObject.cc Fri Jun 21 13:55:10 2013 -0400 @@ -94,7 +94,7 @@ // Package request? if (!strcmp(browser_functions.utf8fromidentifier(name), "java")) { - //NPObject* obj = IcedTeaScriptablePluginObject::get_scriptable_java_package_object(getInstanceFromMemberPtr(npobj), name); + //NPObject* obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object(getInstanceFromMemberPtr(npobj), name); //OBJECT_TO_NPVARIANT(obj, *result); //printf ("Filling variant %p with object %p\n", result); @@ -159,7 +159,7 @@ } NPObject* -IcedTeaScriptablePluginObject::get_scriptable_java_package_object(NPP instance, const NPUTF8* name) +IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object(NPP instance, const NPUTF8* name) { /* Shared NPClass instance for IcedTeaScriptablePluginObject */ static NPClass np_class = scriptable_plugin_object_class(); @@ -308,14 +308,14 @@ if (isPropertyClass) { PLUGIN_DEBUG("Returning package object\n"); - obj = IcedTeaScriptablePluginObject::get_scriptable_java_package_object( + obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object( IcedTeaPluginUtilities::getInstanceFromMemberPtr(npobj), property_name.c_str()); } else { PLUGIN_DEBUG("Returning Java object\n"); - obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_object( + obj = IcedTeaScriptableJavaObject::get_scriptable_java_object( IcedTeaPluginUtilities::getInstanceFromMemberPtr(npobj), *(java_result->return_string), "0", false); } @@ -382,7 +382,7 @@ } NPObject* -IcedTeaScriptableJavaPackageObject::get_scriptable_java_object(NPP instance, +IcedTeaScriptableJavaObject::get_scriptable_java_object(NPP instance, std::string class_id, std::string instance_id, bool isArray) @@ -393,7 +393,7 @@ std::string obj_key = class_id + ":" + instance_id; PLUGIN_DEBUG("get_scriptable_java_object searching for %s...\n", obj_key.c_str()); - NPObject* scriptable_object = IcedTeaPluginUtilities::getNPObjectFromJavaKey(obj_key); + IcedTeaScriptableJavaObject* scriptable_object = (IcedTeaScriptableJavaObject*) IcedTeaPluginUtilities::getNPObjectFromJavaKey(obj_key); if (scriptable_object != NULL) { @@ -403,7 +403,7 @@ } // try to create normally - scriptable_object = browser_functions.createobject(instance, &np_class); + scriptable_object = (IcedTeaScriptableJavaObject*)browser_functions.createobject(instance, &np_class); // didn't work? try creating asynch if (!scriptable_object) @@ -426,11 +426,11 @@ PLUGIN_DEBUG("Constructed new Java Object with classid=%s, instanceid=%s, isArray=%d and scriptable_object=%p\n", class_id.c_str(), instance_id.c_str(), isArray, scriptable_object); - ((IcedTeaScriptableJavaObject*) scriptable_object)->setClassIdentifier(class_id); - ((IcedTeaScriptableJavaObject*) scriptable_object)->setIsArray(isArray); + scriptable_object->class_id = class_id; + scriptable_object->is_object_array = isArray; if (instance_id != "0") - ((IcedTeaScriptableJavaObject*) scriptable_object)->setInstanceIdentifier(instance_id); + scriptable_object->instance_id = instance_id; IcedTeaPluginUtilities::storeInstanceID(scriptable_object, instance); IcedTeaPluginUtilities::storeObjectMapping(obj_key, scriptable_object); @@ -461,64 +461,17 @@ return IcedTeaPluginUtilities::getInstanceFromMemberPtr(object_ptr) != NULL; } -IcedTeaScriptableJavaObject::IcedTeaScriptableJavaObject(NPP instance) -{ - this->instance = instance; - this->class_id = new std::string(); - this->instance_id = new std::string(); -} - -IcedTeaScriptableJavaObject::~IcedTeaScriptableJavaObject() -{ - delete this->class_id; - delete this->instance_id; -} - -void -IcedTeaScriptableJavaObject::setClassIdentifier(std::string class_id) -{ - this->class_id->append(class_id); -} - -void -IcedTeaScriptableJavaObject::setInstanceIdentifier(std::string instance_id) -{ - this->instance_id->append(instance_id); -} - -void -IcedTeaScriptableJavaObject::setIsArray(bool isArray) -{ - this->isObjectArray = isArray; -} - -void -IcedTeaScriptableJavaObject::deAllocate(NPObject *npobj) -{ - delete (IcedTeaScriptableJavaObject*)npobj; -} - -void -IcedTeaScriptableJavaObject::invalidate(NPObject *npobj) -{ - IcedTeaPluginUtilities::removeInstanceID(npobj); - - std::string obj_key = std::string(); - obj_key += ((IcedTeaScriptableJavaObject*) npobj)->getClassID(); - obj_key += ":"; - obj_key += ((IcedTeaScriptableJavaObject*) npobj)->getInstanceID(); - - IcedTeaPluginUtilities::removeObjectMapping(obj_key); -} - bool IcedTeaScriptableJavaObject::hasMethod(NPObject *npobj, NPIdentifier name) { + + IcedTeaScriptableJavaObject* scriptable_object = (IcedTeaScriptableJavaObject*) npobj; + PLUGIN_DEBUG("IcedTeaScriptableJavaObject::hasMethod %s (ival=%d)\n", browser_functions.utf8fromidentifier(name), browser_functions.intfromidentifier(name)); bool hasMethod = false; // If object is an array and requested "method" may be a number, check for it first - if ( !((IcedTeaScriptableJavaObject*) npobj)->isArray() || + if ( scriptable_object->is_object_array || (browser_functions.intfromidentifier(name) < 0)) { @@ -528,10 +481,9 @@ JavaResultData* java_result; JavaRequestProcessor java_request = JavaRequestProcessor(); - std::string classId = std::string(((IcedTeaScriptableJavaObject*) npobj)->getClassID()); std::string methodName = browser_functions.utf8fromidentifier(name); - java_result = java_request.hasMethod(classId, methodName); + java_result = java_request.hasMethod(scriptable_object->class_id, methodName); hasMethod = java_result->return_identifier != 0; } @@ -555,11 +507,10 @@ JavaResultData* java_result; JavaRequestProcessor java_request = JavaRequestProcessor(); - NPObject* obj; - std::string instance_id = ((IcedTeaScriptableJavaObject*) npobj)->getInstanceID(); - std::string class_id = ((IcedTeaScriptableJavaObject*) npobj)->getClassID(); - std::string callee; - std::string source; + IcedTeaScriptableJavaObject* scriptable_object = (IcedTeaScriptableJavaObject*)npobj; + + std::string instance_id = scriptable_object->instance_id; + std::string class_id = scriptable_object->class_id; NPP instance = IcedTeaPluginUtilities::getInstanceFromMemberPtr(npobj); @@ -582,17 +533,15 @@ if (instance_id.length() == 0) // Static { PLUGIN_DEBUG("Calling static method\n"); - callee = ((IcedTeaScriptableJavaObject*) npobj)->getClassID(); java_result = java_request.callStaticMethod( IcedTeaPluginUtilities::getSourceFromInstance(instance), - callee, browser_functions.utf8fromidentifier(name), arg_ids); + scriptable_object->class_id, browser_functions.utf8fromidentifier(name), arg_ids); } else { PLUGIN_DEBUG("Calling method normally\n"); - callee = ((IcedTeaScriptableJavaObject*) npobj)->getInstanceID(); java_result = java_request.callMethod( IcedTeaPluginUtilities::getSourceFromInstance(instance), - callee, browser_functions.utf8fromidentifier(name), arg_ids); + scriptable_object->instance_id, browser_functions.utf8fromidentifier(name), arg_ids); } if (java_result->error_occurred) @@ -609,21 +558,14 @@ } bool -IcedTeaScriptableJavaObject::invokeDefault(NPObject *npobj, const NPVariant *args, - uint32_t argCount, NPVariant *result) -{ - printf ("** Unimplemented: IcedTeaScriptableJavaObject::invokeDefault %p\n", npobj); - return false; -} - -bool IcedTeaScriptableJavaObject::hasProperty(NPObject *npobj, NPIdentifier name) { PLUGIN_DEBUG("IcedTeaScriptableJavaObject::hasProperty %s (ival=%d)\n", browser_functions.utf8fromidentifier(name), browser_functions.intfromidentifier(name)); bool hasProperty = false; + IcedTeaScriptableJavaObject* scriptable_object = (IcedTeaScriptableJavaObject*)npobj; // If it is an array, only length and indexes are valid - if (((IcedTeaScriptableJavaObject*) npobj)->isArray()) + if (scriptable_object->is_object_array) { if (browser_functions.intfromidentifier(name) >= 0 || !strcmp(browser_functions.utf8fromidentifier(name), "length")) @@ -643,10 +585,9 @@ JavaResultData* java_result; JavaRequestProcessor java_request = JavaRequestProcessor(); - std::string class_id = std::string(((IcedTeaScriptableJavaObject*) npobj)->getClassID()); std::string fieldName = browser_functions.utf8fromidentifier(name); - java_result = java_request.hasField(class_id, fieldName); + java_result = java_request.hasField(scriptable_object->class_id, fieldName); hasProperty = java_result->return_identifier != 0; } @@ -661,24 +602,24 @@ { PLUGIN_DEBUG("IcedTeaScriptableJavaObject::getProperty %s (ival=%d)\n", browser_functions.utf8fromidentifier(name), browser_functions.intfromidentifier(name)); - bool isPropertyClass = false; JavaResultData* java_result; JavaRequestProcessor java_request = JavaRequestProcessor(); - NPObject* obj; - std::string instance_id = ((IcedTeaScriptableJavaObject*) npobj)->getInstanceID(); - std::string class_id = ((IcedTeaScriptableJavaObject*) npobj)->getClassID(); - NPP instance = ((IcedTeaScriptableJavaObject*) npobj)->getInstance(); + IcedTeaScriptableJavaObject* scriptable_object = (IcedTeaScriptableJavaObject*)npobj; + + std::string instance_id = scriptable_object->getInstanceID(); + std::string class_id = scriptable_object->getClassID(); + NPP instance = scriptable_object->instance; if (instance_id.length() > 0) // Could be an array or a simple object { // If array and requesting length - if ( ((IcedTeaScriptableJavaObject*) npobj)->isArray() && + if ( scriptable_object->is_object_array && browser_functions.utf8fromidentifier(name) && !strcmp(browser_functions.utf8fromidentifier(name), "length")) { java_result = java_request.getArrayLength(instance_id); - } else if ( ((IcedTeaScriptableJavaObject*) npobj)->isArray() && + } else if ( scriptable_object->is_object_array && browser_functions.intfromidentifier(name) >= 0) // else if array and requesting index { @@ -709,7 +650,7 @@ if (!strcmp(browser_functions.utf8fromidentifier(name), "Packages")) { - NPObject* pkgObject = IcedTeaScriptablePluginObject::get_scriptable_java_package_object(instance, ""); + NPObject* pkgObject = IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object(instance, ""); OBJECT_TO_NPVARIANT(pkgObject, *result); return true; } @@ -744,30 +685,29 @@ PLUGIN_DEBUG("IcedTeaScriptableJavaObject::setProperty %s (ival=%d) to:\n", browser_functions.utf8fromidentifier(name), browser_functions.intfromidentifier(name)); IcedTeaPluginUtilities::printNPVariant(*value); - bool isPropertyClass = false; JavaResultData* java_result; JavaRequestProcessor java_request = JavaRequestProcessor(); + IcedTeaScriptableJavaObject* scriptable_object = (IcedTeaScriptableJavaObject*)npobj; - NPObject* obj; - std::string instance_id = ((IcedTeaScriptableJavaObject*) npobj)->getInstanceID(); - std::string class_id = ((IcedTeaScriptableJavaObject*) npobj)->getClassID(); + std::string instance_id = scriptable_object->getInstanceID(); + std::string class_id = scriptable_object->getClassID(); NPP instance = IcedTeaPluginUtilities::getInstanceFromMemberPtr(npobj); if (instance_id.length() > 0) // Could be an array or a simple object { // If array - if ( ((IcedTeaScriptableJavaObject*) npobj)->isArray() && + if ( scriptable_object->is_object_array && browser_functions.utf8fromidentifier(name) && !strcmp(browser_functions.utf8fromidentifier(name), "length")) { printf("ERROR: Array length is not a modifiable property\n"); return false; - } else if ( ((IcedTeaScriptableJavaObject*) npobj)->isArray() && + } else if ( scriptable_object->is_object_array && browser_functions.intfromidentifier(name) >= 0) // else if array and requesting index { - java_result = java_request.getArrayLength(instance_id); + JavaResultData* java_result = java_request.getArrayLength(instance_id); if (java_result->error_occurred) { printf("ERROR: Couldn't fetch array length\n"); @@ -820,25 +760,12 @@ } bool -IcedTeaScriptableJavaObject::removeProperty(NPObject *npobj, NPIdentifier name) -{ - printf ("** Unimplemented: IcedTeaScriptableJavaObject::removeProperty %p\n", npobj); - return false; -} - -bool -IcedTeaScriptableJavaObject::enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count) -{ - printf ("** Unimplemented: IcedTeaScriptableJavaObject::enumerate %p\n", npobj); - return false; -} - -bool IcedTeaScriptableJavaObject::construct(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result) { + IcedTeaScriptableJavaObject* scriptable_object = (IcedTeaScriptableJavaObject*)npobj; // Extract arg type array - PLUGIN_DEBUG("IcedTeaScriptableJavaObject::construct %s. Args follow.\n", ((IcedTeaScriptableJavaObject*) npobj)->getClassID().c_str()); + PLUGIN_DEBUG("IcedTeaScriptableJavaObject::construct %s. Args follow.\n", scriptable_object->getClassID().c_str()); for (int i=0; i < argCount; i++) { IcedTeaPluginUtilities::printNPVariant(args[i]); @@ -847,8 +774,6 @@ JavaResultData* java_result; JavaRequestProcessor java_request = JavaRequestProcessor(); - NPObject* obj; - std::string class_id = ((IcedTeaScriptableJavaObject*) npobj)->getClassID(); NPP instance = IcedTeaPluginUtilities::getInstanceFromMemberPtr(npobj); // First, load the arguments into the java-side table @@ -872,7 +797,7 @@ java_result = java_request.newObject( IcedTeaPluginUtilities::getSourceFromInstance(instance), - class_id, + scriptable_object->class_id, arg_ids); if (java_result->error_occurred) @@ -886,11 +811,10 @@ return false; } - std::string return_obj_instance_id = std::string(); - std::string return_obj_class_id = class_id; - return_obj_instance_id.append(*(java_result->return_string)); + std::string return_obj_instance_id = *java_result->return_string; + std::string return_obj_class_id = scriptable_object->class_id; - obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_object( + NPObject* obj = IcedTeaScriptableJavaObject::get_scriptable_java_object( IcedTeaPluginUtilities::getInstanceFromMemberPtr(npobj), return_obj_class_id, return_obj_instance_id, false); diff -r cfdb17c00603 -r ee92f55c69a3 plugin/icedteanp/IcedTeaScriptablePluginObject.h --- a/plugin/icedteanp/IcedTeaScriptablePluginObject.h Fri Jun 21 11:41:31 2013 -0400 +++ b/plugin/icedteanp/IcedTeaScriptablePluginObject.h Fri Jun 21 13:55:10 2013 -0400 @@ -87,7 +87,6 @@ static bool construct(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result); - static NPObject* get_scriptable_java_package_object(NPP instance, const NPUTF8* name); }; NPObject* allocate_scriptable_jp_object(NPP npp, NPClass *aClass); @@ -136,69 +135,71 @@ static bool construct(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result); - static NPObject* get_scriptable_java_object(NPP instance, - std::string class_id, - std::string instance_id, - bool isArray); + static NPObject* get_scriptable_java_package_object(NPP instance, const NPUTF8* name); static bool is_valid_java_object(NPObject* object_ptr); }; class IcedTeaScriptableJavaObject: public NPObject { +private: + NPP instance; + bool is_object_array; + /* These may be empty if 'is_applet_instance' is true + * and the object has not yet been used */ + std::string class_id, instance_id; +public: + IcedTeaScriptableJavaObject(NPP instance) { + this->instance = instance; + is_object_array = false; + } + static void deAllocate(NPObject *npobj) { + delete (IcedTeaScriptableJavaObject*)npobj; + } + std::string getInstanceID() { + return instance_id; + } + std::string getClassID() { + return class_id; + } + std::string objectKey() { + return getClassID() + ":" + getInstanceID(); + } + static void invalidate(NPObject *npobj) { + IcedTeaPluginUtilities::removeInstanceID(npobj); + IcedTeaScriptableJavaObject* scriptable_object = (IcedTeaScriptableJavaObject*) npobj; + IcedTeaPluginUtilities::removeObjectMapping(scriptable_object->objectKey()); + } + static bool hasMethod(NPObject *npobj, NPIdentifier name); + static bool invoke(NPObject *npobj, NPIdentifier name, + const NPVariant *args, uint32_t argCount, NPVariant *result); + static bool invokeDefault(NPObject *npobj, const NPVariant *args, + uint32_t argCount, NPVariant *result) { + printf ("** Unimplemented: IcedTeaScriptableJavaObject::invokeDefault %p\n", npobj); + return false; + } + static bool hasProperty(NPObject *npobj, NPIdentifier name); + static bool getProperty(NPObject *npobj, NPIdentifier name, + NPVariant *result); + static bool setProperty(NPObject *npobj, NPIdentifier name, + const NPVariant *value); - private: - NPP instance; - bool isObjectArray; From alex.kasko.lists at gmail.com Sat Jun 22 03:57:12 2013 From: alex.kasko.lists at gmail.com (Alex Kasko) Date: Sat, 22 Jun 2013 14:57:12 +0400 Subject: IcedTea 1.12.5 windows build errors In-Reply-To: <201306211416.r5LEGvEO008716@mail-web01.excite.co.jp> References: <201306211416.r5LEGvEO008716@mail-web01.excite.co.jp> Message-ID: <51C58308.1030604@gmail.com> On 06/21/2013 06:16 PM, Jacob Wisor wrote: > Hello there! > >> I'm interesting in maintaining windows builds for IcedTea, is it >> possible to have windows-specific changes upstreamed into IcedTea? > > This is great! I have cought up on your progress building IcedTea for/on Windows. I am also very interested in having a supported "official" binary release of IcedTea for Windows. Should you need any help in adjusting or simplifying the build process on Windows, I would be glad to help. Just to avoid any confusion, I am not currently interested in maintaing an IcedTea release for Windows, mainly because I lack the experience and sometimes expertise to do that. I would like to have official binary releases that ordinary users or admins can grab, install and run productively. I would also like to make adjustments to the build process, so that IcedTea can be relatively easily build on Windows with open-source tools (as one of IcedTea project's main goals states), mainly native tools (no dependency on cygwin neither at build nor at run time). Furthermore, I would like to provide an MSI installer for an IcedTea binary release. About GPL installers - maybe you'll be interested in crossplatform installers (non icedtea though - vanilla openjdk) from my github project [1]. I also experimented with registry and PATH adjustments in windows [2] and, while registry access is non reliable between windows versions, automatic PATH adjustment works fine (going to include it in next versions). Also, looking at github download statistics, plain JDK images are more popular than installers. About build process and tools - see my notes below. > >> Yes, to make clear the whole current process: >> 1) run "./configure" on debian wheezy amd64 >> 2) run "make" (from the same icedtea dir), wait for all icedtea >> patches applied, abort build >> 3) copy "openjdk" dir to windows box >> 4) apply windows-specific patches, run windows build as a normal >> openjdk6 control build > > As I see it, this build process is far too complicated (still, thank you for doing this aweful work). :) That said, I asume those patches only apply to IcedTea's code, not the build process? To clarify the build situation: 1) I'm not quite familiar with internals of icedtea 1.x build process. I see it as next big steps (not mentioning bootstrap/ecj and non-x86 platforms): 1. check environment (usual autotools configure step) 2. patch openjdk sources and makefiles 3. run usual openjdk build 4. install created binaries to /usr/local 2) I have almost working buildfarm for building openjdk using virtualbox virtual machines (with minimum build environments). The build process looks like: 1. put openjdk sources tarball next to clean virtualbox images 2. run build script that will run VMs one by one, copy there build environment and sources, run build inside each VM, copy built binaries back to host, delete used images This buildfarm is not finished yet but I want to finish it to 7u40 release. This should explain my intentions to use only step "2." (patch openjdk sources) from icedtea build process. If I get patched tarball from iced tea then I can build it as an usual openjdk tarball. And icedtea tarballs have obvious benefits in more frequent source releases and platform-specific patches on linux. 3) In theory proper cygwin environment may be prepared in windows to build icedtea properly using "./configure && make" directly in windows (with some changes to autotools config). But it will require huge amount of waste work (giving that cygwin is half-working on x64 windows) with non obvious gain. About patches - windows patches, I'm working on now, will be applied to openjdk code and makefiles, not icedtea part (though maybe some minor changes here also will be required). > Regarding the build procees, I would even propose to go as far as to convert the build process to an ant-driven project (or provide side-by-side), well-knowing this may sound as heresy to some people and being unsure whether this is possible at all. Well, the benefits of that should be pretty obvious, so will not elaborate on that. > Anyway, it would be nice to work something out. Talking about icedtea 1.x on x86 - to my understanding there are two big parts of the build: 1) icedtea part (points "1.", "2." and "4." from above), based on autotools, may be changed relatively freely giving that output files stay the same 2) openjdk part (point "3." from above), makefiles for actual crossplatform build, should not be touched without proper understanding of implications for all build platforms. Overall I think that any changes for windows builds should be minimized as possible to not create additional work for current icedtea downstream maintainers. About cygwin from above question - it is used on windows only as unix-like build environment. All native binaries are created using native microsoft tools (nmake, cl etc) and have no dependencies on cygwin. About open-source tools on windows - it's not possible for native MSVC builds. openjdk6 on x86_32 even cannot be built using any free (as in free beer) microsoft compiler (only MSVS2003 works). Also some microsoft shared and static libraries are mandatory for inclusion into openjdk distributive. I think this is inevitable for builds on (and for) closed platform. > > Regards, > Jacob > [1] https://github.com/alexkasko/openjdk-unofficial-builds [2] https://github.com/alexkasko/openjdk-unofficial-builds/issues/7 -- Regards, Alex Kasko From andrew at icedtea.classpath.org Sat Jun 22 09:28:50 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Sat, 22 Jun 2013 16:28:50 +0000 Subject: /hg/release/icedtea7-forest-2.3/jdk: 408 new changesets Message-ID: changeset e48835613fc3 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=e48835613fc3 author: katleman date: Fri Aug 17 11:58:16 2012 -0700 Added tag jdk7u6-b31 for changeset 8c2c5d63a17e changeset 9ffccd4240a8 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=9ffccd4240a8 author: asaha date: Thu Sep 13 18:29:28 2012 -0700 Merge changeset 3b1a395f1948 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=3b1a395f1948 author: asaha date: Fri Oct 12 12:38:25 2012 -0700 Merge changeset a474615061bf in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=a474615061bf author: katleman date: Fri Mar 01 11:55:30 2013 -0800 Added tag jdk7u17-b02 for changeset b130c8cfecfc changeset c1627d99c83b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=c1627d99c83b author: mullan date: Fri Dec 21 14:54:57 2012 -0500 8003445: Adjust JAX-WS to focus on API Reviewed-by: vinnie, ahgross, mgrebac changeset a177f85250d2 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=a177f85250d2 author: chegar date: Thu Dec 20 13:40:27 2012 +0000 8003335: Better handling of Finalizer thread Reviewed-by: alanb, ahgross changeset 76cbfffea7d2 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=76cbfffea7d2 author: vkarnauk date: Thu Jan 24 18:05:49 2013 +0400 7124347: [macosx] "java.lang.InternalError: not implemented yet" on call Graphics2D.drawRenderedImage Reviewed-by: bae changeset c68f28843814 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=c68f28843814 author: ewendeli date: Fri Jan 18 22:01:17 2013 +0100 Merge changeset 81cc809b7f78 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=81cc809b7f78 author: ewendeli date: Wed Jan 30 14:16:38 2013 +0100 Merge changeset 64f920894073 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=64f920894073 author: ewendeli date: Wed Jan 30 14:17:02 2013 +0100 Merge changeset 8261e56b7f91 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=8261e56b7f91 author: malenkov date: Tue Feb 05 20:18:16 2013 +0400 8006790: Improve checking for windows Reviewed-by: art, mschoene changeset 76eb3fb80740 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=76eb3fb80740 author: dmocek date: Tue Feb 05 16:38:25 2013 -0800 8001329: Augment RMI logging Reviewed-by: smarks, hawtin, alanb changeset 47114a90798b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=47114a90798b author: wetmore date: Thu Feb 07 11:48:13 2013 -0800 8006777: Improve TLS handling of invalid messages Reviewed-by: wetmore, ahgross changeset bf2faf293bae in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=bf2faf293bae author: prr date: Thu Feb 07 12:14:31 2013 -0800 8006795: Improve font warning messages Reviewed-by: bae, jgodinez, mschoene changeset 987fdb610c5b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=987fdb610c5b author: katleman date: Thu Feb 07 14:20:54 2013 -0800 Added tag jdk7u21-b01 for changeset 8261e56b7f91 changeset 74ff8f689293 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=74ff8f689293 author: katleman date: Thu Feb 07 14:25:31 2013 -0800 Merge changeset 2affe5a0e986 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=2affe5a0e986 author: valeriep date: Thu Feb 07 16:18:32 2013 -0800 8007688: Blacklist known bad certificate Summary: Added two known bad certs to the blacklist certs. Reviewed-by: mullan changeset 343ecd8dee6f in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=343ecd8dee6f author: malenkov date: Fri Feb 08 18:06:56 2013 +0400 7200507: Refactor Introspector internals Reviewed-by: ahgross, art changeset b6645161a51b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=b6645161a51b author: ewendeli date: Mon Feb 11 21:09:32 2013 +0100 Merge changeset 7ca8a40795d8 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=7ca8a40795d8 author: michaelm date: Wed Feb 13 10:47:15 2013 +0000 8000724: Improve networking serialization Summary: delegate InetAddress fields to a holder object Reviewed-by: alanb, chegar changeset d00ab6592b1e in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=d00ab6592b1e author: michaelm date: Wed Feb 13 10:50:09 2013 +0000 Merge changeset 3e2d47699a54 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=3e2d47699a54 author: bae date: Thu Feb 14 19:51:51 2013 +0400 8007014: Improve image handling Reviewed-by: prr, mschoene, jgodinez changeset 8a95f38503fe in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=8a95f38503fe author: prr date: Fri Feb 15 11:25:43 2013 -0800 8008249: Sync ICU into JDK : Reviewed-by: bae, jgodinez changeset f4718907cb4c in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=f4718907cb4c author: joehw date: Thu Feb 28 18:33:17 2013 +0000 6657673: Issues with JAXP Reviewed-by: alanb, lancea, ahgross, mullan changeset 2497a6814edf in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=2497a6814edf author: serb date: Tue Feb 19 20:40:48 2013 +0400 8004261: Improve input validation Reviewed-by: art, mschoene, amenkov changeset 54ea520a17d8 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=54ea520a17d8 author: mkos date: Wed Feb 20 22:26:11 2013 +0100 8005432: Update access to JAX-WS Summary: newly restricted the whole package com.sun.xml.internal; fix reviewed also by Alexander Fomin Reviewed-by: mullan, skoivu changeset ddd9e6df700f in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ddd9e6df700f author: bae date: Thu Feb 21 11:25:43 2013 +0400 8007675: Improve color conversion Reviewed-by: prr, jgodinez changeset cf93d3828aa8 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=cf93d3828aa8 author: bae date: Fri Feb 22 15:14:25 2013 +0400 8007617: Better validation of images Reviewed-by: prr, jgodinez changeset da1867780fc9 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=da1867780fc9 author: dsamersoff date: Mon Feb 25 20:06:22 2013 +0400 8006435: Improvements in JMX Summary: Improvements in JMX Reviewed-by: dfuchs, skoivu changeset 09c9880d963c in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=09c9880d963c author: weijun date: Tue Jul 17 11:57:37 2012 +0800 7102106: TEST_BUG: sun/security/util/Oid/S11N.sh should be modified Reviewed-by: mullan changeset 9b3a79d4de4e in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=9b3a79d4de4e author: alexsch date: Mon Aug 06 15:51:54 2012 +0400 7129800: [macosx] Regression test OverrideRedirectWindowActivationTest fails due to timing issue Reviewed-by: rupashka changeset 8e37b198a7f8 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=8e37b198a7f8 author: dsamersoff date: Thu Aug 09 17:42:55 2012 +0400 7183753: [TEST] Some colon in the diff for this test Summary: Reference output file contains extra colon Reviewed-by: sspitsyn, mgronlun changeset 13d620adfddf in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=13d620adfddf author: dmocek date: Sun Feb 24 13:42:45 2013 +0000 7142596: RMI JPRT tests are failing Summary: Changed RMI tests to use random port numbers for the RMI Registry and RMID so the tests can be run concurrently without test failures due to tests using the same port numbers. Reviewed-by: smarks, alanb Contributed-by: olivier.lagneau at oracle.com changeset 57a64968f048 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=57a64968f048 author: dmocek date: Wed Jul 18 10:04:45 2012 -0700 7184943: fix failing test com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java 7184946: fix failing test com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java Reviewed-by: smarks changeset cd318237595a in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=cd318237595a author: dmocek date: Fri Jul 27 16:53:15 2012 -0700 7186111: fix bugs in java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup Reviewed-by: smarks, jgish changeset 24338468fb0b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=24338468fb0b author: dmocek date: Sat Sep 08 00:03:36 2012 -0700 6948101: java/rmi/transport/pinLastArguments/PinLastArguments.java failing intermittently Reviewed-by: dholmes, smarks Contributed-by: Eric Wang changeset cee3fc28f672 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=cee3fc28f672 author: olagneau date: Mon Aug 27 11:44:45 2012 -0700 7144861: speed up RMI activation tests Reviewed-by: alanb, smarks, dholmes, dmocek changeset bc3fd86f0db5 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=bc3fd86f0db5 author: alanb date: Thu Aug 16 14:35:26 2012 +0100 7132247: java/rmi/registry/readTest/readTest.sh failing with Cygwin Reviewed-by: alanb, dmocek, smarks Contributed-by: Eric Wang changeset fe59b52c0e19 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=fe59b52c0e19 author: vkarnauk date: Thu Sep 20 21:08:33 2012 +0400 7076791: closed/javax/swing/JColorChooser/Test6827032.java failed on windows Reviewed-by: rupashka changeset 9b40f6929904 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=9b40f6929904 author: smarks date: Thu Sep 20 13:29:43 2012 -0700 7199637: TEST_BUG: add serialization tests to jdk7u problem list for macosx Reviewed-by: alanb, coffeys changeset 4afe5648fc4b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=4afe5648fc4b author: juh date: Fri Sep 28 11:20:31 2012 +0800 7054918: jdk_security1 test target cleanup Reviewed-by: xuelei, weijun changeset 4cf06c5f6ea3 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=4cf06c5f6ea3 author: juh date: Fri Sep 28 11:20:32 2012 +0800 7055362: jdk_security2 test target cleanup Reviewed-by: xuelei, weijun changeset ed711ff32c58 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ed711ff32c58 author: juh date: Sun Feb 24 14:20:46 2013 +0000 7055363: jdk_security3 test target cleanup Reviewed-by: xuelei, weijun changeset 2c037334c52c in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=2c037334c52c author: robm date: Thu Oct 11 18:24:38 2012 +0100 7152183: TEST_BUG: java/lang/ProcessBuilder/Basic.java failing intermittently [sol] Reviewed-by: alanb, martin, dholmes changeset fe6116018ae2 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=fe6116018ae2 author: robm date: Mon Oct 15 03:26:11 2012 +0100 8000817: Reinstate accidentally removed sleep() from ProcessBuilder/Basic.java Reviewed-by: alanb, martin changeset 1603a035b39f in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=1603a035b39f author: dxu date: Mon Jul 30 04:57:27 2012 +0100 7185340: TEST_BUG: java/nio/channels/AsynchronousSocketChannel/Leaky.java failing intermittently [win] Reviewed-by: alanb changeset 7961d6927864 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=7961d6927864 author: alanb date: Sat Sep 10 14:55:14 2011 +0100 7089131: test/java/lang/invoke/InvokeGenericTest.java does not compile Reviewed-by: darcy, jrose changeset 2a90f1b1f8ed in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=2a90f1b1f8ed author: weijun date: Sat Jul 21 19:56:55 2012 +0800 7178649: TEST BUG: BadKdc3.java needs improvement to ignore the unlikely but possible timeout Reviewed-by: xuelei changeset baafc82c0b2b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=baafc82c0b2b author: dfuchs date: Wed Nov 07 13:24:39 2012 +0100 6720349: (ch) Channels tests depending on hosts inside Sun Summary: This changeset make the nio tests start small TCP or UDP servers from within the tests, instead of relying on external services. Reviewed-by: alanb changeset 05bb8900c9fa in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=05bb8900c9fa author: alanb date: Fri Jun 24 19:30:39 2011 +0100 6965150: TEST_BUG: java/nio/channels/AsynchronousSocketChannel/Basic.java takes too long Reviewed-by: chegar changeset c681391a2856 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=c681391a2856 author: weijun date: Thu Oct 27 17:23:25 2011 +0800 7104161: test/sun/tools/jinfo/Basic.sh fails on Ubuntu Reviewed-by: alanb changeset 8565b03192c3 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=8565b03192c3 author: alanb date: Sun Jun 10 10:29:27 2012 +0100 7175775: Disable SA options in jinfo/Basic.java test until SA updated for new hash and String count/offset Reviewed-by: minqi changeset ff0406a6d9c5 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ff0406a6d9c5 author: robm date: Wed Nov 28 00:47:38 2012 +0000 8003597: TEST_BUG: Eliminate dependency on javaweb from closed net tests Reviewed-by: chegar changeset dd7dede81a3a in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=dd7dede81a3a author: kshefov date: Fri Nov 30 15:21:53 2012 +0000 7072120: No mac os x support in several regression tests Reviewed-by: anthony, serb changeset 208a102d75a6 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=208a102d75a6 author: kshefov date: Fri Nov 30 15:36:11 2012 +0000 7147408: [macosx] Add autodelay to fix a regression test Reviewed-by: anthony, alexsch changeset a9e04846fdbe in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=a9e04846fdbe author: smarks date: Wed Dec 12 09:53:01 2012 -0800 8004748: clean up @build tags in RMI tests Reviewed-by: alanb, darcy, mchung changeset 859b1a6a1986 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=859b1a6a1986 author: alexp date: Fri Dec 21 18:59:10 2012 +0400 8003982: new test javax/swing/AncestorNotifier/7193219/bug7193219.java failed on macosx Reviewed-by: anthony, alexsch changeset 7271cd8bc3ff in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=7271cd8bc3ff author: weijun date: Tue Jul 17 11:28:16 2012 +0800 7183203: ShortRSAKeynnn.sh tests intermittent failure Reviewed-by: xuelei changeset 7f2158d5b321 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=7f2158d5b321 author: kshefov date: Thu Jan 17 14:47:01 2013 +0000 7104594: [macosx] Test closed/javax/swing/JFrame/4962534/bug4962534 expects Metal L&F by default Reviewed-by: yan, alexsch changeset 1356610783e2 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=1356610783e2 author: robm date: Sun Feb 24 16:53:31 2013 +0000 7162111: TEST_BUG: change tests run in headless mode [macosx] Reviewed-by: uta changeset fa2600b22b9c in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=fa2600b22b9c author: alanb date: Mon Nov 21 12:51:30 2011 +0000 7084033: TEST_BUG: test/java/lang/ThreadGroup/Stop.java fails intermittently Reviewed-by: forax, chegar, dholmes Contributed-by: gary.adams at oracle.com changeset 347a2e8436a9 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=347a2e8436a9 author: juh date: Thu Jan 31 16:47:54 2013 -0500 8002313: TEST_BUG : jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.java should run in headless mode Reviewed-by: mullan changeset 24a31f177411 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=24a31f177411 author: weijun date: Fri Feb 01 07:39:41 2013 +0800 8006564: Test sun/security/util/Oid/S11N.sh fails with timeout on Linux 32-bit Reviewed-by: alanb changeset 83c4b326f1f9 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=83c4b326f1f9 author: chegar date: Tue Mar 13 09:33:50 2012 +0000 7152796: TEST_BUG: java/net/Socks/SocksV4Test.java does not terminate Reviewed-by: alanb changeset dd51e090cd49 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=dd51e090cd49 author: chegar date: Thu Dec 13 09:55:55 2012 +0000 8004925: java/net/Socks/SocksV4Test.java failing on all platforms Reviewed-by: alanb, dsamersoff changeset 8d2b3ba77836 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=8d2b3ba77836 author: chegar date: Sat Dec 29 11:00:15 2012 +0000 8005556: java/net/Socks/SocksV4Test.java is missing @run tag Reviewed-by: alanb changeset 30ce26df6899 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=30ce26df6899 author: chegar date: Sun Jan 20 09:37:51 2013 +0000 8006560: java/net/ipv6tests/B6521014.java fails intermittently Reviewed-by: khazra, wetmore changeset 1df65a451e1c in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=1df65a451e1c author: jgish date: Wed Dec 05 21:08:14 2012 -0800 8004317: TestLibrary.getUnusedRandomPort() fails intermittently, but exception not reported Reviewed-by: alanb, dmocek, smarks changeset 82d054cd500f in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=82d054cd500f author: jgish date: Thu Jan 17 15:09:46 2013 -0500 8006534: CLONE - TestLibrary.getUnusedRandomPort() fails intermittently-doesn't retry enough times Summary: Increase number of retries to twice the number of ports in the reserved range Reviewed-by: mduigou changeset be401df6dfdc in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=be401df6dfdc author: smarks date: Thu Dec 20 20:11:45 2012 -0800 8005290: remove -showversion from RMI test library subprocess mechanism Reviewed-by: jgish, chegar, dmocek changeset 67c480f11a5a in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=67c480f11a5a author: chegar date: Wed Jan 23 14:45:44 2013 +0000 8006669: sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh fails on mac Reviewed-by: alanb changeset 0f70a5ab2a58 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=0f70a5ab2a58 author: smarks date: Mon Jan 07 18:09:07 2013 -0800 7187882: TEST_BUG: java/rmi/activation/checkusage/CheckUsage.java fails intermittently Summary: Tighten up JavaVM test library API, and adjust tests to match. Reviewed-by: mchung, dmocek changeset f29796a18815 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=f29796a18815 author: smarks date: Tue Jan 22 18:30:49 2013 -0800 8005646: TEST_BUG: java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup leaves process running Reviewed-by: mchung changeset a87830a55788 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=a87830a55788 author: kshefov date: Mon Feb 11 14:37:57 2013 +0000 7077259: [TEST_BUG] [macosx] Test work correctly only when default L&F is Metal Reviewed-by: serb, alexsch changeset 91b635126bf9 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=91b635126bf9 author: chegar date: Fri Sep 07 14:00:31 2012 +0100 7032247: java/net/InetAddress/GetLocalHostWithSM.java fails if hostname resolves to loopback address Summary: TESTBUG Reviewed-by: chegar, alanb Contributed-by: Eric Wang changeset 77d4b570dee2 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=77d4b570dee2 author: chegar date: Wed Apr 04 15:14:00 2012 +0100 6963841: java/util/concurrent/Phaser/Basic.java fails intermittently Reviewed-by: dl, dholmes changeset ce745b7a002a in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ce745b7a002a author: chegar date: Wed Nov 23 12:30:19 2011 +0000 6776144: java/lang/ThreadGroup/NullThreadName.java fails with Thread group is not destroyed ,fastdebug LINUX Reviewed-by: chegar, dholmes Contributed-by: gary.adams at oracle.com changeset cbca8d8fd359 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=cbca8d8fd359 author: chegar date: Thu Aug 25 16:08:31 2011 +0100 7044870: java/nio/channels/DatagramChannel/SelectWhenRefused.java failed on SUSE Linux 10 Reviewed-by: alanb, chegar Contributed-by: kurchi.subhra.hazra at oracle.com changeset 9d4942c9f550 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=9d4942c9f550 author: chegar date: Tue Aug 09 16:39:04 2011 +0100 7073295: TEST_BUG: test/java/lang/instrument/ManifestTest.sh causing havoc (win) Reviewed-by: mchung changeset 1eb710f143c4 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=1eb710f143c4 author: chegar date: Tue Aug 09 16:59:44 2011 +0100 7076756: TEST_BUG: com/sun/jdi/BreakpointWithFullGC.sh fails to cleanup in Cygwin Reviewed-by: alanb, dcubed changeset e1df2988b6cb in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=e1df2988b6cb author: chegar date: Wed Feb 08 11:16:52 2012 +0000 7105929: java/util/concurrent/FutureTask/BlockingTaskExecutor.java fails on solaris sparc Reviewed-by: dholmes changeset 9c30829b6aa5 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=9c30829b6aa5 author: chegar date: Tue Nov 06 21:01:43 2012 +0000 8002297: sun/net/www/protocol/http/StackTraceTest.java fails intermittently Reviewed-by: alanb, dsamersoff changeset 2ba7716915ab in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=2ba7716915ab author: gadams date: Wed Feb 08 11:18:29 2012 +0000 6736316: Timeout value in java/util/concurrent/locks/Lock/FlakyMutex.java is insufficient Reviewed-by: chegar, dholmes, alanb changeset 9272222ac3a5 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=9272222ac3a5 author: gadams date: Wed Feb 08 11:19:25 2012 +0000 6957683: test/java/util/concurrent/ThreadPoolExecutor/Custom.java failing Reviewed-by: chegar, dholmes, alanb changeset 93c1f96deab9 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=93c1f96deab9 author: gadams date: Mon Jan 09 19:33:02 2012 +0000 7030573: test/java/io/FileInputStream/LargeFileAvailable.java fails when there is insufficient disk space Reviewed-by: alanb changeset d16245602a1d in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=d16245602a1d author: khazra date: Tue Apr 17 11:59:12 2012 -0700 7152856: TEST_BUG: sun/net/www/protocol/jar/B4957695.java failing on Windows Summary: Remove usage of HTTP Server at test/sun/net/www/httptest Reviewed-by: chegar, alanb changeset 03e65eaead5a in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=03e65eaead5a author: khazra date: Thu Apr 19 13:26:06 2012 -0700 7162385: TEST_BUG: sun/net/www/protocol/jar/B4957695.java failing again Summary: Enable finding "foo1.jar" Reviewed-by: chegar changeset e960a4ca5391 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=e960a4ca5391 author: alanb date: Sat Nov 19 19:55:19 2011 +0000 6818464: TEST_BUG: java/util/Timer/KillThread.java failing intermittently Reviewed-by: dholmes, alanb, forax Contributed-by: gary.adams at oracle.com changeset 2a8777f43574 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=2a8777f43574 author: alanb date: Sat Nov 19 20:03:00 2011 +0000 6860309: TEST_BUG: Insufficient sleep time in java/lang/Runtime/exec/StreamsSurviveDestroy.java Reviewed-by: alanb, dholmes, forax Contributed-by: gary.adams at oracle.com changeset 8e0c7268365b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=8e0c7268365b author: smarks date: Tue Feb 12 14:41:18 2013 -0800 8007515: TEST_BUG: update ProblemList.txt and TEST.ROOT in jdk7u-dev to match jdk8 Reviewed-by: alanb, mchung, dmocek changeset 4acbbe4842db in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=4acbbe4842db author: kshefov date: Thu Feb 14 14:14:19 2013 +0000 7161759: TEST_BUG: java/awt/Frame/WindowDragTest/WindowDragTest.java fails to compile, should be modified Summary: Added @build Util jtreg tag Reviewed-by: serb, alexsch Contributed-by: Vera Akulova changeset 519c770fd603 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=519c770fd603 author: kshefov date: Mon Feb 18 09:31:10 2013 +0000 8005920: After pressing combination Windows Key and M key, the frame, the instruction and the dialog can't be minimized. Reviewed-by: serb, denis Contributed-by: Vera Akulova changeset 85745d3e7570 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=85745d3e7570 author: chegar date: Fri Feb 15 11:06:52 2013 +0000 8008223: java/net/BindException/Test.java fails rarely Reviewed-by: khazra, alanb changeset e4ce81d2fde7 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=e4ce81d2fde7 author: fparain date: Wed Feb 15 09:29:05 2012 -0800 7144833: sun/tools/jcmd/jcmd-Defaults.sh failing intermittently Reviewed-by: alanb changeset b25f89903b7d in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=b25f89903b7d author: sla date: Tue Mar 20 12:48:48 2012 +0100 7154114: jstat tests failing on non-english locales 7154113: jcmd, jps and jstat tests failing when there are unknown Java processes on the system Reviewed-by: rbackman, kamg, dsamersoff changeset e50c0008c54f in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=e50c0008c54f author: sla date: Mon Oct 29 09:23:55 2012 +0100 8001621: Update awk scripts that check output from jps/jcmd Reviewed-by: alanb changeset 9ea6ed75c423 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=9ea6ed75c423 author: kshefov date: Wed Feb 20 17:07:30 2013 +0000 8008379: TEST_BUG: Fail automatically with java.lang.NullPointerException. Reviewed-by: serb, anthony changeset dcfe61818131 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=dcfe61818131 author: fparain date: Tue Feb 14 07:28:29 2012 -0800 7140868: TEST_BUG: jcmd tests need to use -XX:+UsePerfData Reviewed-by: fparain, dholmes changeset 2d6cd3a7fc4b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=2d6cd3a7fc4b author: sla date: Wed Sep 05 14:42:44 2012 +0200 6963102: Testcase failures sun/tools/jstatd/jstatdExternalRegistry.sh and sun/tools/jstatd/jstatdDefaults.sh Summary: Make tests more resilient by allowing for more error messages from jps Reviewed-by: alanb, rbackman, dsamersoff changeset c29d0c608f63 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=c29d0c608f63 author: jjg date: Tue Aug 28 10:29:30 2012 +0100 7194032: update tests for upcoming changes for jtreg Reviewed-by: alanb, iris, smarks changeset 4f23795e86a4 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=4f23795e86a4 author: jjg date: Tue Aug 28 10:31:27 2012 +0100 7194035: update tests for upcoming changes for jtreg Reviewed-by: alanb, sspitsyn changeset ba4a53110efe in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ba4a53110efe author: coffeys date: Mon Feb 25 16:17:37 2013 +0000 8008815: [TEST_BUG] Add back tests to the Problemlist files post the jdk7u -> 7u-cpu test sync up Reviewed-by: chegar, alanb changeset 6784c9903db7 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=6784c9903db7 author: prr date: Mon Feb 25 09:52:53 2013 -0800 8004986: Better handling of glyph table 8004987: Improve font layout 8004994: Improve checking of glyph table Reviewed-by: bae, mschoene, jgodinez Contributed-by: steven.loomis at oracle.com changeset d868fe7c7618 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=d868fe7c7618 author: bae date: Tue Feb 26 00:15:17 2013 +0400 8007667: Better image reading Reviewed-by: prr, jgodinez changeset 90c9f1577a0b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=90c9f1577a0b author: bae date: Tue Feb 26 01:27:17 2013 +0400 8007918: Better image writing Reviewed-by: prr, jgodinez changeset f9fda42383a2 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=f9fda42383a2 author: raginip date: Fri Mar 01 14:06:10 2013 +0000 8007406: Improve accessibility of AccessBridge Reviewed-by: skoivu, mullan, ptbrunet changeset 43470f123b3a in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=43470f123b3a author: uta date: Tue Feb 26 15:58:40 2013 +0400 8005943: (process) Improved Runtime.exec Reviewed-by: alanb, ahgross changeset f098e2297ff1 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=f098e2297ff1 author: smarks date: Wed Feb 27 13:58:55 2013 -0800 8001040: Rework RMI model Reviewed-by: alanb, ahgross, coffeys, dmocek changeset 20f287fec09f in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=20f287fec09f author: vlivanov date: Fri Mar 01 03:50:17 2013 +0400 8009049: Better method handle binding Reviewed-by: jrose, twisti, jdn changeset 9cc342866505 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=9cc342866505 author: vlivanov date: Fri Mar 01 03:50:33 2013 +0400 8008140: Better method handle resolution Reviewed-by: jrose, twisti, jdn changeset 4f7b8bc95616 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=4f7b8bc95616 author: dsamersoff date: Fri Mar 01 21:35:49 2013 +0400 8009165: Fix for 8008817 needs revision Summary: The fix for JDK-8008817 added a new ReflectUtil.ensureClassAccess method which is not an appropriate utility method in ReflectUtil. Reviewed-by: alanb, mchung, dfuchs changeset 245c2dce7225 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=245c2dce7225 author: srl date: Mon Mar 04 12:29:30 2013 -0800 8001031: Better font processing. Reviewed-by: vadim, prr, mschoene changeset 5cedcee76fc0 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=5cedcee76fc0 author: katleman date: Tue Oct 16 14:55:29 2012 -0700 Added tag jdk7u9-b31 for changeset 3b1a395f1948 changeset 77f7e5f13763 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=77f7e5f13763 author: alitvinov date: Mon Oct 29 14:05:59 2012 -0700 7193219: JComboBox serialization fails in JDK 1.7 Reviewed-by: rupashka, anthony changeset 1b8a18bbf499 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=1b8a18bbf499 author: katleman date: Wed Oct 31 10:12:15 2012 -0700 Added tag jdk7u9-b32 for changeset 77f7e5f13763 changeset 3e939c1535ce in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=3e939c1535ce author: asaha date: Tue Dec 04 11:46:43 2012 -0800 Merge changeset 3515fd583ede in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=3515fd583ede author: asaha date: Wed Dec 05 15:32:00 2012 -0800 Merge changeset 0c222d0e08a5 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=0c222d0e08a5 author: katleman date: Fri Dec 07 08:19:26 2012 -0800 Added tag jdk7u10-b31 for changeset 3515fd583ede changeset c7282a85c6bc in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=c7282a85c6bc author: ewendeli date: Tue Jan 15 08:23:44 2013 +0100 Merge changeset 9a709a8e6108 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=9a709a8e6108 author: katleman date: Wed Jan 16 13:57:37 2013 -0800 Added tag jdk7u11-b32 for changeset c7282a85c6bc changeset 01a966bf7e0d in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=01a966bf7e0d author: bae date: Wed Dec 05 16:55:05 2012 +0400 7124347: [macosx] java.lang.InternalError: not implemented yet on call Graphics2D.drawRenderedImage Reviewed-by: prr, flar changeset 8fd5e105c6a2 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=8fd5e105c6a2 author: alitvinov date: Fri Jan 18 18:42:26 2013 +0400 8006417: JComboBox.showPopup(), hidePopup() fails in JRE 1.7 on OS X Reviewed-by: art, serb changeset b080c575bd84 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=b080c575bd84 author: katleman date: Tue Jan 29 14:11:08 2013 -0800 Added tag jdk7u11-b33 for changeset 8fd5e105c6a2 changeset 4ce8abdfdcba in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=4ce8abdfdcba author: asaha date: Fri Feb 08 19:25:18 2013 -0800 Merge changeset 9f2046826507 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=9f2046826507 author: asaha date: Mon Feb 11 11:17:13 2013 -0800 Merge changeset 25d31e811ea0 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=25d31e811ea0 author: katleman date: Tue Feb 12 12:33:04 2013 -0800 Added tag jdk7u15-b31 for changeset 9f2046826507 changeset e52ec1a93974 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=e52ec1a93974 author: dcherepanov date: Sat Dec 29 17:43:32 2012 +0400 8001161: mac: EmbeddedFrame doesn't become active window Reviewed-by: ant changeset 23fcb7fce77c in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=23fcb7fce77c author: ksrini date: Fri Feb 01 07:25:51 2013 -0800 8006536: [launcher] removes trailing slashes on arguments Reviewed-by: ksrini, akhil Contributed-by: jviswana at linux.vnet.ibm.com changeset 41edc28b57f6 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=41edc28b57f6 author: asaha date: Tue Feb 12 15:05:36 2013 -0800 Merge changeset 3ef25219292f in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=3ef25219292f author: asaha date: Thu Feb 14 13:23:15 2013 -0800 Merge changeset d0f5d16f8307 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=d0f5d16f8307 author: katleman date: Tue Feb 19 12:03:12 2013 -0800 Added tag jdk7u15-b33 for changeset 3ef25219292f changeset 677b1c6b04ee in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=677b1c6b04ee author: asaha date: Fri Mar 01 16:12:33 2013 -0800 Merge changeset 1f831ccc12f5 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=1f831ccc12f5 author: cl date: Sat Mar 02 09:47:59 2013 -0800 Added tag jdk7u17-b30 for changeset a474615061bf changeset 1ad6f413e250 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=1ad6f413e250 author: asaha date: Sat Mar 02 14:39:07 2013 -0800 Merge changeset 6c6b9d7943e7 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=6c6b9d7943e7 author: cl date: Sat Mar 02 18:56:06 2013 -0800 Added tag jdk7u17-b31 for changeset 1ad6f413e250 changeset 62eee603f25a in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=62eee603f25a author: asaha date: Mon Mar 04 11:46:59 2013 -0800 Merge changeset 698d0997fef1 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=698d0997fef1 author: asaha date: Mon Mar 04 12:35:10 2013 -0800 Merge changeset af6be9d7aed7 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=af6be9d7aed7 author: coffeys date: Tue Mar 05 00:22:26 2013 +0000 Merge changeset 17ac71e7b720 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=17ac71e7b720 author: katleman date: Tue Mar 05 16:46:10 2013 -0800 Added tag jdk7u21-b05 for changeset af6be9d7aed7 changeset 98ad2f1e25d1 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=98ad2f1e25d1 author: chegar date: Sun Mar 03 10:11:45 2013 +0000 8009063: Improve reliability of ConcurrentHashMap Reviewed-by: alanb, ahgross changeset c2fff439d91a in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=c2fff439d91a author: srl date: Wed Mar 06 06:44:14 2013 -0800 8009530: ICU Kern table support broken Reviewed-by: prr, vadim changeset 79a75d22a087 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=79a75d22a087 author: coffeys date: Mon Mar 11 21:04:08 2013 +0000 8009750: javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java should run in other vm mode Reviewed-by: mullan changeset ffc1454e644a in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ffc1454e644a author: uta date: Fri Mar 08 13:47:02 2013 +0400 8009463: Regression test test\java\lang\Runtime\exec\ArgWithSpaceAndFinalBackslash.java failing. Reviewed-by: alanb, ahgross changeset 33b7b1230377 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=33b7b1230377 author: katleman date: Tue Mar 12 14:44:19 2013 -0700 Added tag jdk7u21-b06 for changeset ffc1454e644a changeset 0cf73f53c7e1 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=0cf73f53c7e1 author: valeriep date: Mon Mar 11 20:05:37 2013 -0700 8009610: Blacklist certificate used with malware. Summary: updated the black list and the reg test with the new cert. Reviewed-by: weijun changeset a19614a3dabb in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=a19614a3dabb author: lancea date: Sat Mar 16 10:08:14 2013 -0400 8009814: Better driver management Reviewed-by: alanb, skoivu changeset b453d9be6b3f in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=b453d9be6b3f author: kvn date: Thu Mar 14 08:55:04 2013 -0700 8009677: Better setting of setters Reviewed-by: ahgross, jrose, twisti changeset 2899c3dbf5e8 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=2899c3dbf5e8 author: smarks date: Mon Mar 18 18:05:31 2013 -0700 8009857: Problem with plugin Reviewed-by: jdn, mchung changeset 87bacc5ee8e4 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=87bacc5ee8e4 author: dfuchs date: Mon Mar 11 15:07:19 2013 +0100 8001322: Refactor deserialization Reviewed-by: mchung, skoivu, smarks changeset 31c782610044 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=31c782610044 author: dfuchs date: Thu Mar 14 17:27:32 2013 +0100 8009305: Improve AWT data transfer Reviewed-by: art, skoivu, smarks, ant changeset 74c9dbadcce8 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=74c9dbadcce8 author: robm date: Fri Mar 15 01:43:04 2013 +0000 8009634: TEST_BUG: sun/misc/Version/Version.java handle 2 digit minor in VM version Reviewed-by: alanb changeset a7dfa5fd2a89 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=a7dfa5fd2a89 author: robm date: Tue Mar 19 16:52:53 2013 +0000 8010166: TEST_BUG: fix for 8009634 overlooks possible version strings (sun/misc/Version/Version.java) Reviewed-by: kvn changeset d42b986caf14 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=d42b986caf14 author: katleman date: Tue Mar 19 14:33:59 2013 -0700 Added tag jdk7u21-b07 for changeset b453d9be6b3f changeset de4e41c5c549 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=de4e41c5c549 author: coffeys date: Wed Mar 20 00:12:59 2013 +0000 Merge changeset bd9df4e87810 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=bd9df4e87810 author: katleman date: Wed Mar 20 14:47:40 2013 -0700 Added tag jdk7u21-b08 for changeset de4e41c5c549 changeset 622aedcdda61 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=622aedcdda61 author: katleman date: Mon Mar 25 14:33:33 2013 -0700 8006120: Provide "Server JRE" for 7u train Reviewed-by: pbhat, cgruszka Contributed-by: amy.y.wang at oracle.com changeset f447c3bbf074 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=f447c3bbf074 author: katleman date: Tue Mar 26 15:00:38 2013 -0700 Added tag jdk7u21-b09 for changeset 622aedcdda61 changeset f9323b9d020c in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=f9323b9d020c author: katleman date: Sun Mar 31 03:46:56 2013 -0700 Added tag jdk7u21-b10 for changeset f447c3bbf074 changeset 08ed0bfc9668 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=08ed0bfc9668 author: katleman date: Thu Apr 04 15:48:33 2013 -0700 Added tag jdk7u21-b11 for changeset f9323b9d020c changeset f3cf02a53684 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=f3cf02a53684 author: katleman date: Fri Apr 05 12:49:05 2013 -0700 Added tag jdk7u21-b30 for changeset 08ed0bfc9668 changeset 3f06e091a238 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=3f06e091a238 author: katleman date: Sun Apr 07 16:34:59 2013 -0700 Added tag jdk7u21-b12 for changeset f3cf02a53684 changeset 0e80792291c0 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=0e80792291c0 author: mullan date: Wed Feb 13 15:43:16 2013 -0500 6741606: Integrate Apache Santuario Reviewed-by: vinnie, hawtin changeset e9e8c27a8e3e in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=e9e8c27a8e3e author: mullan date: Wed Feb 13 15:47:26 2013 -0500 Merge changeset a5e712ea6944 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=a5e712ea6944 author: bae date: Thu Feb 14 19:51:51 2013 +0400 8007014: Improve image handling Reviewed-by: prr, mschoene, jgodinez changeset a36dc31f8aff in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=a36dc31f8aff author: katleman date: Thu Feb 14 14:11:40 2013 -0800 Added tag jdk7u21-b02 for changeset a5e712ea6944 changeset 737fff584cd5 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=737fff584cd5 author: prr date: Fri Feb 15 11:25:43 2013 -0800 8008249: Sync ICU into JDK : Reviewed-by: bae, jgodinez changeset ae8a62c99239 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ae8a62c99239 author: joehw date: Sat Feb 16 18:04:30 2013 -0800 6657673: Issues with JAXP Reviewed-by: alanb, lancea, ahgross, mullan changeset 9d87f5f84afe in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=9d87f5f84afe author: serb date: Tue Feb 19 20:40:48 2013 +0400 8004261: Improve input validation Reviewed-by: art, mschoene, amenkov changeset 6a37e5210ac3 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=6a37e5210ac3 author: katleman date: Tue Feb 19 17:14:01 2013 -0800 Added tag jdk7u21-b03 for changeset 9d87f5f84afe changeset aff8dc7564f4 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=aff8dc7564f4 author: mkos date: Wed Feb 20 22:26:11 2013 +0100 8005432: Update access to JAX-WS Summary: newly restricted the whole package com.sun.xml.internal; fix reviewed also by Alexander Fomin Reviewed-by: mullan, skoivu changeset d8b20e180cc9 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=d8b20e180cc9 author: bae date: Thu Feb 21 11:25:43 2013 +0400 8007675: Improve color conversion Reviewed-by: prr, jgodinez changeset e0523b05372c in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=e0523b05372c author: raginip date: Thu Feb 21 12:34:51 2013 -0800 8007406: Improve accessibility of AccessBridge Reviewed-by: skoivu, mullan, ptbrunet changeset 939a9fe61252 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=939a9fe61252 author: bae date: Fri Feb 22 15:14:25 2013 +0400 8007617: Better validation of images Reviewed-by: prr, jgodinez changeset 4910d7a21607 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=4910d7a21607 author: dsamersoff date: Mon Feb 25 20:06:22 2013 +0400 8006435: Improvements in JMX Summary: Improvements in JMX Reviewed-by: dfuchs, skoivu changeset 1e530d26e57b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=1e530d26e57b author: weijun date: Tue Jul 17 11:57:37 2012 +0800 7102106: TEST_BUG: sun/security/util/Oid/S11N.sh should be modified Reviewed-by: mullan changeset 5c76f6947024 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=5c76f6947024 author: alexsch date: Mon Aug 06 15:51:54 2012 +0400 7129800: [macosx] Regression test OverrideRedirectWindowActivationTest fails due to timing issue Reviewed-by: rupashka changeset 9204789bb4b7 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=9204789bb4b7 author: dsamersoff date: Thu Aug 09 17:42:55 2012 +0400 7183753: [TEST] Some colon in the diff for this test Summary: Reference output file contains extra colon Reviewed-by: sspitsyn, mgronlun changeset ba57e4d85891 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ba57e4d85891 author: dmocek date: Sun Feb 24 13:42:45 2013 +0000 7142596: RMI JPRT tests are failing Summary: Changed RMI tests to use random port numbers for the RMI Registry and RMID so the tests can be run concurrently without test failures due to tests using the same port numbers. Reviewed-by: smarks, alanb Contributed-by: olivier.lagneau at oracle.com changeset 84a8e601020c in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=84a8e601020c author: dmocek date: Wed Jul 18 10:04:45 2012 -0700 7184943: fix failing test com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java 7184946: fix failing test com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java Reviewed-by: smarks changeset c9c183914982 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=c9c183914982 author: dmocek date: Fri Jul 27 16:53:15 2012 -0700 7186111: fix bugs in java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup Reviewed-by: smarks, jgish changeset f49ee844919f in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=f49ee844919f author: dmocek date: Sat Sep 08 00:03:36 2012 -0700 6948101: java/rmi/transport/pinLastArguments/PinLastArguments.java failing intermittently Reviewed-by: dholmes, smarks Contributed-by: Eric Wang changeset 06bf002467f4 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=06bf002467f4 author: olagneau date: Mon Aug 27 11:44:45 2012 -0700 7144861: speed up RMI activation tests Reviewed-by: alanb, smarks, dholmes, dmocek changeset 351f20a53068 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=351f20a53068 author: alanb date: Thu Aug 16 14:35:26 2012 +0100 7132247: java/rmi/registry/readTest/readTest.sh failing with Cygwin Reviewed-by: alanb, dmocek, smarks Contributed-by: Eric Wang changeset 78379e1f39fa in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=78379e1f39fa author: vkarnauk date: Thu Sep 20 21:08:33 2012 +0400 7076791: closed/javax/swing/JColorChooser/Test6827032.java failed on windows Reviewed-by: rupashka changeset 1d88263c987f in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=1d88263c987f author: smarks date: Thu Sep 20 13:29:43 2012 -0700 7199637: TEST_BUG: add serialization tests to jdk7u problem list for macosx Reviewed-by: alanb, coffeys changeset 49f4edf487ad in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=49f4edf487ad author: juh date: Fri Sep 28 11:20:31 2012 +0800 7054918: jdk_security1 test target cleanup Reviewed-by: xuelei, weijun changeset 09001da05bc3 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=09001da05bc3 author: juh date: Fri Sep 28 11:20:32 2012 +0800 7055362: jdk_security2 test target cleanup Reviewed-by: xuelei, weijun changeset 92ab21fc0225 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=92ab21fc0225 author: juh date: Sun Feb 24 14:20:46 2013 +0000 7055363: jdk_security3 test target cleanup Reviewed-by: xuelei, weijun changeset e5332527caa1 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=e5332527caa1 author: robm date: Thu Oct 11 18:24:38 2012 +0100 7152183: TEST_BUG: java/lang/ProcessBuilder/Basic.java failing intermittently [sol] Reviewed-by: alanb, martin, dholmes changeset 201ecfb75ff1 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=201ecfb75ff1 author: robm date: Mon Oct 15 03:26:11 2012 +0100 8000817: Reinstate accidentally removed sleep() from ProcessBuilder/Basic.java Reviewed-by: alanb, martin changeset 4d52c56c969d in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=4d52c56c969d author: dxu date: Mon Jul 30 04:57:27 2012 +0100 7185340: TEST_BUG: java/nio/channels/AsynchronousSocketChannel/Leaky.java failing intermittently [win] Reviewed-by: alanb changeset d27b051605b6 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=d27b051605b6 author: alanb date: Sat Sep 10 14:55:14 2011 +0100 7089131: test/java/lang/invoke/InvokeGenericTest.java does not compile Reviewed-by: darcy, jrose changeset ac8c4bc4034f in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ac8c4bc4034f author: weijun date: Sat Jul 21 19:56:55 2012 +0800 7178649: TEST BUG: BadKdc3.java needs improvement to ignore the unlikely but possible timeout Reviewed-by: xuelei changeset 08b6968e01b3 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=08b6968e01b3 author: dfuchs date: Wed Nov 07 13:24:39 2012 +0100 6720349: (ch) Channels tests depending on hosts inside Sun Summary: This changeset make the nio tests start small TCP or UDP servers from within the tests, instead of relying on external services. Reviewed-by: alanb changeset b136c427bd0e in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=b136c427bd0e author: alanb date: Fri Jun 24 19:30:39 2011 +0100 6965150: TEST_BUG: java/nio/channels/AsynchronousSocketChannel/Basic.java takes too long Reviewed-by: chegar changeset dddebb6016bd in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=dddebb6016bd author: weijun date: Thu Oct 27 17:23:25 2011 +0800 7104161: test/sun/tools/jinfo/Basic.sh fails on Ubuntu Reviewed-by: alanb changeset 68427d98767e in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=68427d98767e author: alanb date: Sun Jun 10 10:29:27 2012 +0100 7175775: Disable SA options in jinfo/Basic.java test until SA updated for new hash and String count/offset Reviewed-by: minqi changeset e7addf490f64 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=e7addf490f64 author: robm date: Wed Nov 28 00:47:38 2012 +0000 8003597: TEST_BUG: Eliminate dependency on javaweb from closed net tests Reviewed-by: chegar changeset 81f11fc4e289 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=81f11fc4e289 author: kshefov date: Fri Nov 30 15:21:53 2012 +0000 7072120: No mac os x support in several regression tests Reviewed-by: anthony, serb changeset e61255f12eb9 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=e61255f12eb9 author: kshefov date: Fri Nov 30 15:36:11 2012 +0000 7147408: [macosx] Add autodelay to fix a regression test Reviewed-by: anthony, alexsch changeset 0079a2150886 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=0079a2150886 author: smarks date: Wed Dec 12 09:53:01 2012 -0800 8004748: clean up @build tags in RMI tests Reviewed-by: alanb, darcy, mchung changeset c99213bc620f in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=c99213bc620f author: alexp date: Fri Dec 21 18:59:10 2012 +0400 8003982: new test javax/swing/AncestorNotifier/7193219/bug7193219.java failed on macosx Reviewed-by: anthony, alexsch changeset 1f0e52931b0f in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=1f0e52931b0f author: weijun date: Tue Jul 17 11:28:16 2012 +0800 7183203: ShortRSAKeynnn.sh tests intermittent failure Reviewed-by: xuelei changeset b63606fafce3 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=b63606fafce3 author: kshefov date: Thu Jan 17 14:47:01 2013 +0000 7104594: [macosx] Test closed/javax/swing/JFrame/4962534/bug4962534 expects Metal L&F by default Reviewed-by: yan, alexsch changeset a83eb49fa0a1 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=a83eb49fa0a1 author: robm date: Sun Feb 24 16:53:31 2013 +0000 7162111: TEST_BUG: change tests run in headless mode [macosx] Reviewed-by: uta changeset aa88f22e90ab in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=aa88f22e90ab author: alanb date: Mon Nov 21 12:51:30 2011 +0000 7084033: TEST_BUG: test/java/lang/ThreadGroup/Stop.java fails intermittently Reviewed-by: forax, chegar, dholmes Contributed-by: gary.adams at oracle.com changeset 09860239dce3 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=09860239dce3 author: juh date: Thu Jan 31 16:47:54 2013 -0500 8002313: TEST_BUG : jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.java should run in headless mode Reviewed-by: mullan changeset 23e4490b1461 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=23e4490b1461 author: weijun date: Fri Feb 01 07:39:41 2013 +0800 8006564: Test sun/security/util/Oid/S11N.sh fails with timeout on Linux 32-bit Reviewed-by: alanb changeset 61dc35e261d5 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=61dc35e261d5 author: chegar date: Tue Mar 13 09:33:50 2012 +0000 7152796: TEST_BUG: java/net/Socks/SocksV4Test.java does not terminate Reviewed-by: alanb changeset aafeffc6996d in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=aafeffc6996d author: chegar date: Thu Dec 13 09:55:55 2012 +0000 8004925: java/net/Socks/SocksV4Test.java failing on all platforms Reviewed-by: alanb, dsamersoff changeset e0099d8fe88c in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=e0099d8fe88c author: chegar date: Sat Dec 29 11:00:15 2012 +0000 8005556: java/net/Socks/SocksV4Test.java is missing @run tag Reviewed-by: alanb changeset 98fd6a425355 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=98fd6a425355 author: chegar date: Sun Jan 20 09:37:51 2013 +0000 8006560: java/net/ipv6tests/B6521014.java fails intermittently Reviewed-by: khazra, wetmore changeset fedc35c8b46b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=fedc35c8b46b author: jgish date: Wed Dec 05 21:08:14 2012 -0800 8004317: TestLibrary.getUnusedRandomPort() fails intermittently, but exception not reported Reviewed-by: alanb, dmocek, smarks changeset e2fb111a4be0 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=e2fb111a4be0 author: jgish date: Thu Jan 17 15:09:46 2013 -0500 8006534: CLONE - TestLibrary.getUnusedRandomPort() fails intermittently-doesn't retry enough times Summary: Increase number of retries to twice the number of ports in the reserved range Reviewed-by: mduigou changeset 4c0d2f6dd20c in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=4c0d2f6dd20c author: smarks date: Thu Dec 20 20:11:45 2012 -0800 8005290: remove -showversion from RMI test library subprocess mechanism Reviewed-by: jgish, chegar, dmocek changeset ab13edf4532c in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ab13edf4532c author: chegar date: Wed Jan 23 14:45:44 2013 +0000 8006669: sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh fails on mac Reviewed-by: alanb changeset 9968e92494e2 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=9968e92494e2 author: smarks date: Mon Jan 07 18:09:07 2013 -0800 7187882: TEST_BUG: java/rmi/activation/checkusage/CheckUsage.java fails intermittently Summary: Tighten up JavaVM test library API, and adjust tests to match. Reviewed-by: mchung, dmocek changeset b3cd489501f4 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=b3cd489501f4 author: smarks date: Tue Jan 22 18:30:49 2013 -0800 8005646: TEST_BUG: java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup leaves process running Reviewed-by: mchung changeset 51877c178a00 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=51877c178a00 author: kshefov date: Mon Feb 11 14:37:57 2013 +0000 7077259: [TEST_BUG] [macosx] Test work correctly only when default L&F is Metal Reviewed-by: serb, alexsch changeset 8dbc6c8923e7 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=8dbc6c8923e7 author: chegar date: Fri Sep 07 14:00:31 2012 +0100 7032247: java/net/InetAddress/GetLocalHostWithSM.java fails if hostname resolves to loopback address Summary: TESTBUG Reviewed-by: chegar, alanb Contributed-by: Eric Wang changeset 666a4b5ed3b6 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=666a4b5ed3b6 author: chegar date: Wed Apr 04 15:14:00 2012 +0100 6963841: java/util/concurrent/Phaser/Basic.java fails intermittently Reviewed-by: dl, dholmes changeset 6304301913e2 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=6304301913e2 author: chegar date: Wed Nov 23 12:30:19 2011 +0000 6776144: java/lang/ThreadGroup/NullThreadName.java fails with Thread group is not destroyed ,fastdebug LINUX Reviewed-by: chegar, dholmes Contributed-by: gary.adams at oracle.com changeset 156fa7032946 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=156fa7032946 author: chegar date: Thu Aug 25 16:08:31 2011 +0100 7044870: java/nio/channels/DatagramChannel/SelectWhenRefused.java failed on SUSE Linux 10 Reviewed-by: alanb, chegar Contributed-by: kurchi.subhra.hazra at oracle.com changeset 099da739d51a in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=099da739d51a author: chegar date: Tue Aug 09 16:39:04 2011 +0100 7073295: TEST_BUG: test/java/lang/instrument/ManifestTest.sh causing havoc (win) Reviewed-by: mchung changeset 3092790deb93 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=3092790deb93 author: chegar date: Tue Aug 09 16:59:44 2011 +0100 7076756: TEST_BUG: com/sun/jdi/BreakpointWithFullGC.sh fails to cleanup in Cygwin Reviewed-by: alanb, dcubed changeset 1ce6a6a06398 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=1ce6a6a06398 author: chegar date: Wed Feb 08 11:16:52 2012 +0000 7105929: java/util/concurrent/FutureTask/BlockingTaskExecutor.java fails on solaris sparc Reviewed-by: dholmes changeset f6598a50f748 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=f6598a50f748 author: chegar date: Tue Nov 06 21:01:43 2012 +0000 8002297: sun/net/www/protocol/http/StackTraceTest.java fails intermittently Reviewed-by: alanb, dsamersoff changeset 2f2396e06665 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=2f2396e06665 author: gadams date: Wed Feb 08 11:18:29 2012 +0000 6736316: Timeout value in java/util/concurrent/locks/Lock/FlakyMutex.java is insufficient Reviewed-by: chegar, dholmes, alanb changeset 8e528f3b7c55 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=8e528f3b7c55 author: gadams date: Wed Feb 08 11:19:25 2012 +0000 6957683: test/java/util/concurrent/ThreadPoolExecutor/Custom.java failing Reviewed-by: chegar, dholmes, alanb changeset d1e8b3418f9e in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=d1e8b3418f9e author: gadams date: Mon Jan 09 19:33:02 2012 +0000 7030573: test/java/io/FileInputStream/LargeFileAvailable.java fails when there is insufficient disk space Reviewed-by: alanb changeset 009f33e56cdf in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=009f33e56cdf author: khazra date: Tue Apr 17 11:59:12 2012 -0700 7152856: TEST_BUG: sun/net/www/protocol/jar/B4957695.java failing on Windows Summary: Remove usage of HTTP Server at test/sun/net/www/httptest Reviewed-by: chegar, alanb changeset 4f5897ab2603 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=4f5897ab2603 author: khazra date: Thu Apr 19 13:26:06 2012 -0700 7162385: TEST_BUG: sun/net/www/protocol/jar/B4957695.java failing again Summary: Enable finding "foo1.jar" Reviewed-by: chegar changeset c1917562bcd5 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=c1917562bcd5 author: alanb date: Sat Nov 19 19:55:19 2011 +0000 6818464: TEST_BUG: java/util/Timer/KillThread.java failing intermittently Reviewed-by: dholmes, alanb, forax Contributed-by: gary.adams at oracle.com changeset 35961dabc4ec in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=35961dabc4ec author: alanb date: Sat Nov 19 20:03:00 2011 +0000 6860309: TEST_BUG: Insufficient sleep time in java/lang/Runtime/exec/StreamsSurviveDestroy.java Reviewed-by: alanb, dholmes, forax Contributed-by: gary.adams at oracle.com changeset 459b649cb1ea in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=459b649cb1ea author: smarks date: Tue Feb 12 14:41:18 2013 -0800 8007515: TEST_BUG: update ProblemList.txt and TEST.ROOT in jdk7u-dev to match jdk8 Reviewed-by: alanb, mchung, dmocek changeset fda293be88c3 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=fda293be88c3 author: kshefov date: Thu Feb 14 14:14:19 2013 +0000 7161759: TEST_BUG: java/awt/Frame/WindowDragTest/WindowDragTest.java fails to compile, should be modified Summary: Added @build Util jtreg tag Reviewed-by: serb, alexsch Contributed-by: Vera Akulova changeset f42ad70d2a23 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=f42ad70d2a23 author: kshefov date: Mon Feb 18 09:31:10 2013 +0000 8005920: After pressing combination Windows Key and M key, the frame, the instruction and the dialog can't be minimized. Reviewed-by: serb, denis Contributed-by: Vera Akulova changeset 624afe258567 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=624afe258567 author: chegar date: Fri Feb 15 11:06:52 2013 +0000 8008223: java/net/BindException/Test.java fails rarely Reviewed-by: khazra, alanb changeset 945206693c9c in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=945206693c9c author: fparain date: Wed Feb 15 09:29:05 2012 -0800 7144833: sun/tools/jcmd/jcmd-Defaults.sh failing intermittently Reviewed-by: alanb changeset 162d99fca364 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=162d99fca364 author: sla date: Tue Mar 20 12:48:48 2012 +0100 7154114: jstat tests failing on non-english locales 7154113: jcmd, jps and jstat tests failing when there are unknown Java processes on the system Reviewed-by: rbackman, kamg, dsamersoff changeset 5dd979f0ef06 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=5dd979f0ef06 author: sla date: Mon Oct 29 09:23:55 2012 +0100 8001621: Update awk scripts that check output from jps/jcmd Reviewed-by: alanb changeset f2ce22226ca2 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=f2ce22226ca2 author: kshefov date: Wed Feb 20 17:07:30 2013 +0000 8008379: TEST_BUG: Fail automatically with java.lang.NullPointerException. Reviewed-by: serb, anthony changeset 0cda40f881f6 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=0cda40f881f6 author: fparain date: Tue Feb 14 07:28:29 2012 -0800 7140868: TEST_BUG: jcmd tests need to use -XX:+UsePerfData Reviewed-by: fparain, dholmes changeset dd05955627f9 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=dd05955627f9 author: sla date: Wed Sep 05 14:42:44 2012 +0200 6963102: Testcase failures sun/tools/jstatd/jstatdExternalRegistry.sh and sun/tools/jstatd/jstatdDefaults.sh Summary: Make tests more resilient by allowing for more error messages from jps Reviewed-by: alanb, rbackman, dsamersoff changeset 2506caa34870 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=2506caa34870 author: jjg date: Tue Aug 28 10:29:30 2012 +0100 7194032: update tests for upcoming changes for jtreg Reviewed-by: alanb, iris, smarks changeset 46126bc51bb8 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=46126bc51bb8 author: jjg date: Tue Aug 28 10:31:27 2012 +0100 7194035: update tests for upcoming changes for jtreg Reviewed-by: alanb, sspitsyn changeset a0853a216bd3 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=a0853a216bd3 author: coffeys date: Mon Feb 25 16:17:37 2013 +0000 8008815: [TEST_BUG] Add back tests to the Problemlist files post the jdk7u -> 7u-cpu test sync up Reviewed-by: chegar, alanb changeset 093a1890be06 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=093a1890be06 author: coffeys date: Mon Feb 25 16:24:49 2013 +0000 Merge changeset 05c784caa6d9 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=05c784caa6d9 author: prr date: Mon Feb 25 09:52:53 2013 -0800 8004986: Better handling of glyph table 8004987: Improve font layout 8004994: Improve checking of glyph table Reviewed-by: bae, mschoene, jgodinez Contributed-by: steven.loomis at oracle.com changeset 278325d15b3d in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=278325d15b3d author: bae date: Tue Feb 26 00:15:17 2013 +0400 8007667: Better image reading Reviewed-by: prr, jgodinez changeset 292cce668342 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=292cce668342 author: bae date: Tue Feb 26 01:27:17 2013 +0400 8007918: Better image writing Reviewed-by: prr, jgodinez changeset 139d3e3b62d4 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=139d3e3b62d4 author: uta date: Tue Feb 26 15:58:40 2013 +0400 8005943: (process) Improved Runtime.exec Reviewed-by: alanb, ahgross changeset 52c41d308415 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=52c41d308415 author: katleman date: Tue Feb 26 12:45:21 2013 -0800 Added tag jdk7u21-b04 for changeset 139d3e3b62d4 changeset 1111f9acb96b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=1111f9acb96b author: bae date: Wed Feb 27 11:53:10 2013 +0400 8001034: Memory management improvements Reviewed-by: prr, jgodinez changeset b1a2b9ac9714 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=b1a2b9ac9714 author: alanb date: Wed Feb 27 11:50:30 2013 +0000 8004288: (fs) Files.probeContentType problems Reviewed-by: ahgross, sherman changeset bdbb9f5a2ee7 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=bdbb9f5a2ee7 author: smarks date: Wed Feb 27 13:58:55 2013 -0800 8001040: Rework RMI model Reviewed-by: alanb, ahgross, coffeys, dmocek changeset c450b20e8030 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=c450b20e8030 author: smarks date: Wed Feb 27 15:04:56 2013 -0800 Merge changeset 294da2a34164 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=294da2a34164 author: vlivanov date: Fri Mar 01 03:50:17 2013 +0400 8009049: Better method handle binding Reviewed-by: jrose, twisti, jdn changeset 69fecef67912 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=69fecef67912 author: vlivanov date: Fri Mar 01 03:50:33 2013 +0400 8008140: Better method handle resolution Reviewed-by: jrose, twisti, jdn changeset ff402baefe38 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ff402baefe38 author: dsamersoff date: Fri Mar 01 21:35:49 2013 +0400 8009165: Fix for 8008817 needs revision Summary: The fix for JDK-8008817 added a new ReflectUtil.ensureClassAccess method which is not an appropriate utility method in ReflectUtil. Reviewed-by: alanb, mchung, dfuchs changeset 9b80592b0113 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=9b80592b0113 author: chegar date: Sun Mar 03 10:11:45 2013 +0000 8009063: Improve reliability of ConcurrentHashMap Reviewed-by: alanb, ahgross changeset a46991f99fc3 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=a46991f99fc3 author: srl date: Mon Mar 04 12:29:30 2013 -0800 8001031: Better font processing. Reviewed-by: vadim, prr, mschoene changeset 285765be3123 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=285765be3123 author: dmocek date: Mon Mar 04 14:34:15 2013 -0800 8000638: Improve deserialization Reviewed-by: smarks, hawtin, mchung changeset be15531f9b71 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=be15531f9b71 author: srl date: Wed Mar 06 06:44:14 2013 -0800 8009530: ICU Kern table support broken Reviewed-by: prr, vadim changeset 2e06b7765cb7 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=2e06b7765cb7 author: jbachorik date: Thu Mar 07 14:05:05 2013 +0100 8008603: Improve provision of JMX providers Reviewed-by: alanb, dfuchs, jfdenise, skoivu changeset d972b493d2f4 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=d972b493d2f4 author: uta date: Fri Mar 08 13:47:02 2013 +0400 8009463: Regression test test\java\lang\Runtime\exec\ArgWithSpaceAndFinalBackslash.java failing. Reviewed-by: alanb, ahgross changeset 449039ad3109 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=449039ad3109 author: valeriep date: Mon Mar 11 20:05:37 2013 -0700 8009610: Blacklist certificate used with malware. Summary: updated the black list and the reg test with the new cert. Reviewed-by: weijun changeset ee66b912f65b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ee66b912f65b author: jbachorik date: Tue Mar 12 09:34:26 2013 +0100 8009038: Improve JMX notification support Summary: Disallowing access to mutable shared arrays Reviewed-by: dfuchs, mchung, skoivu changeset 7fd0922d6ed2 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=7fd0922d6ed2 author: jbachorik date: Tue Mar 12 11:09:37 2013 +0100 8009034: Improve resulting notifications in JMX Summary: Disallowing access to mutable shared arrays Reviewed-by: dfuchs, mchung, skoivu changeset b2bd9d9b28f5 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=b2bd9d9b28f5 author: katleman date: Tue Mar 12 14:45:23 2013 -0700 Added tag jdk7u25-b01 for changeset 7fd0922d6ed2 changeset b8fa2ba65c47 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=b8fa2ba65c47 author: jbachorik date: Thu Mar 14 14:42:12 2013 +0100 8008585: Better JMX data handling Reviewed-by: alanb, dfuchs, jfdenise, skoivu, sjiang changeset 34dd146e8438 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=34dd146e8438 author: jbachorik date: Thu Mar 14 14:45:55 2013 +0100 8008607: Better input checking in JMX Reviewed-by: dfuchs, mchung, skoivu, sjiang changeset d3fc37cd366f in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=d3fc37cd366f author: kvn date: Thu Mar 14 08:55:04 2013 -0700 8009677: Better setting of setters Reviewed-by: ahgross, jrose, twisti changeset 6e0721fb94e1 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=6e0721fb94e1 author: bae date: Thu Mar 14 20:11:45 2013 +0400 7053526: Upgrade JDK 8 to use Little CMS 2.4 Reviewed-by: prr, jgodinez changeset 8dd8266a2f4b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=8dd8266a2f4b author: khazra date: Thu Mar 14 13:54:32 2013 -0700 7170730: Improve Windows network stack support. Summary: Enable exclusive binding of ports on Windows Reviewed-by: alanb, chegar, ahgross changeset 4c690b73a79f in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=4c690b73a79f author: dfuchs date: Thu Mar 14 17:27:32 2013 +0100 8009305: Improve AWT data transfer Reviewed-by: art, skoivu, smarks, ant changeset 1d14cb00aa71 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=1d14cb00aa71 author: dfuchs date: Mon Mar 11 15:07:19 2013 +0100 8001322: Refactor deserialization Reviewed-by: mchung, skoivu, smarks changeset 6c99bbdc35ff in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=6c99bbdc35ff author: dfuchs date: Thu Mar 14 21:17:42 2013 +0000 Merge changeset 25ebac17c3cb in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=25ebac17c3cb author: dmocek date: Wed Mar 13 17:24:34 2013 -0700 8001033: Refactor network address handling in virtual machine identifiers Reviewed-by: smarks, hawtin, mchung changeset 4d07143f514c in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=4d07143f514c author: robm date: Fri Mar 15 01:43:04 2013 +0000 8009634: TEST_BUG: sun/misc/Version/Version.java handle 2 digit minor in VM version Reviewed-by: alanb changeset 49a3711e4c99 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=49a3711e4c99 author: dfuchs date: Fri Mar 15 17:59:10 2013 +0100 8001043: Clarify definition restrictions Reviewed-by: alanb, skoivu, smarks changeset 9452e451224a in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=9452e451224a author: lancea date: Sat Mar 16 10:08:14 2013 -0400 8009814: Better driver management Reviewed-by: alanb, skoivu changeset 48aff3ba41eb in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=48aff3ba41eb author: jbachorik date: Mon Mar 18 11:17:06 2013 +0100 8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail Reviewed-by: dfuchs, dholmes changeset ae0dfa5bb05b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ae0dfa5bb05b author: jfdenise date: Mon Mar 18 13:50:19 2013 +0100 8009004: Better implementation of RMI connections Summary: Better class handling. Reviewed-by: alanb, dfuchs, skoivu, jbachorik Contributed-by: jean-francois.denise at oracle.com changeset 3927a18bbcbf in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=3927a18bbcbf author: sla date: Mon Mar 18 15:22:51 2013 +0100 8003703: Update RMI connection dialog box Reviewed-by: skoivu, ahgross, mchung, jbachorik changeset 5da72f23bfa9 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=5da72f23bfa9 author: smarks date: Mon Mar 18 18:05:31 2013 -0700 8009857: Problem with plugin Reviewed-by: jdn, mchung changeset 7293ed355706 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=7293ed355706 author: robm date: Tue Mar 19 16:52:53 2013 +0000 8010166: TEST_BUG: fix for 8009634 overlooks possible version strings (sun/misc/Version/Version.java) Reviewed-by: kvn changeset 846304f476f1 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=846304f476f1 author: leonidr date: Tue Mar 19 21:13:09 2013 +0400 8004584: Augment applet contextualization Summary: Do not create the main AppContext for applets Reviewed-by: art, ahgross changeset ca1cdb0ca372 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ca1cdb0ca372 author: katleman date: Tue Mar 19 14:31:47 2013 -0700 Added tag jdk7u25-b02 for changeset 846304f476f1 changeset be8500a31d10 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=be8500a31d10 author: sjiang date: Tue Mar 19 18:45:19 2013 +0100 8007467: Improve robustness of JMX internal APIs Reviewed-by: dfuchs, mchung, skoivu changeset b4c36757fe45 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=b4c36757fe45 author: sjiang date: Tue Mar 19 11:18:45 2013 -0700 Merge changeset 3079d056c9bd in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=3079d056c9bd author: sjiang date: Tue Mar 19 17:01:40 2013 -0700 Merge changeset a7299af2af32 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=a7299af2af32 author: khazra date: Wed Mar 20 13:39:56 2013 -0700 8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build Summary: Eliminate fall-through while setting socket options on Windows Reviewed-by: alanb, chegar changeset 4047e9efcbd0 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=4047e9efcbd0 author: bae date: Thu Mar 21 11:52:10 2013 +0400 8007927: Improve cmsAllocProfileSequenceDescription Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset 2c71b4f2104b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=2c71b4f2104b author: bae date: Thu Mar 21 12:02:04 2013 +0400 8007929: Improve CurvesAlloc Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset 0a3f502b1026 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=0a3f502b1026 author: jbachorik date: Thu Mar 21 09:26:55 2013 +0100 8008623: Better handling of MBeanServers Reviewed-by: dfuchs, dholmes, skoivu changeset 8ebdc80ffbc7 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=8ebdc80ffbc7 author: vinnie date: Thu Mar 21 10:42:36 2013 +0000 8009067: Improve storing keys in KeyStore Reviewed-by: mullan, skoivu changeset c98afec1bf86 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=c98afec1bf86 author: anthony date: Thu Mar 21 17:04:01 2013 +0400 8009071: Improve shape handling Reviewed-by: art, mschoene changeset 753eea1a0e03 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=753eea1a0e03 author: egahlin date: Thu Mar 21 13:56:28 2013 +0100 8008611: Better handling of annotations in JMX Reviewed-by: skoivu, dholmes, jfdenise changeset 6d4d0b939099 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=6d4d0b939099 author: dsamersoff date: Thu Mar 21 22:32:42 2013 +0400 8007471: Improve MBean notifications Summary: Improve MBean notifications Reviewed-by: dfuchs, mchung, alanb, skoivu changeset df597b1ebb4b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=df597b1ebb4b author: sjiang date: Thu Mar 21 18:27:25 2013 +0100 8008616: Improve robustness of JMX internal APIs Reviewed-by: dfuchs, skoivu, dholmes changeset 975d1f8c48dc in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=975d1f8c48dc author: sjiang date: Thu Mar 21 10:49:14 2013 -0700 Merge changeset 88c913e066d8 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=88c913e066d8 author: sjiang date: Thu Mar 21 23:07:09 2013 -0700 Merge changeset c2fb1948c39f in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=c2fb1948c39f author: jfdenise date: Fri Mar 22 10:02:24 2013 +0100 8008128: Better API coherence for JMX Summary: Permission for getting classloader Reviewed-by: alanb, dfuchs, skoivu Contributed-by: jean-francois.denise at oracle.com changeset ee10aa75d397 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ee10aa75d397 author: coffeys date: Thu Mar 21 22:38:46 2013 +0000 Merge changeset a424696cf0e4 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=a424696cf0e4 author: coffeys date: Fri Mar 22 09:35:50 2013 +0000 Merge changeset ec931d812faa in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ec931d812faa author: lancea date: Fri Mar 22 15:40:16 2013 -0400 8009554: Improve SerialJavaObject.getFields Reviewed-by: alanb, skoivu changeset 0ca6cbe3f350 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=0ca6cbe3f350 author: dmeetry date: Mon Mar 25 12:41:55 2013 +0400 8001309: Better handling of annotation interfaces Reviewed-by: darcy changeset 141facdacbf0 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=141facdacbf0 author: smarks date: Mon Mar 25 17:05:30 2013 +0000 8008132: Better serialization support Reviewed-by: alanb, hawtin changeset 5d5ca338574f in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=5d5ca338574f author: jfranck date: Mon Mar 25 20:18:21 2013 +0100 8007812: (reflect) Class.getEnclosingMethod problematic for some classes Summary: Better checking in getEnclosing(Method|Constructor|Class) Reviewed-by: darcy, ahgross, mchung changeset a0f09271d2c5 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=a0f09271d2c5 author: bae date: Tue Mar 26 11:56:00 2013 +0400 8009013: Better handling of T2K glyphs Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset 2a444d8e36eb in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=2a444d8e36eb author: dsamersoff date: Tue Mar 26 22:45:55 2013 +0400 8009999: Test sun/tools/jcmd/jcmd-f.sh failing after JDK-8008820 Summary: Test was fixed to reflect changes in jcmd output, but reference jcmd output was not changed. Reviewed-by: dholmes changeset 2a30592312af in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=2a30592312af author: katleman date: Tue Mar 26 14:17:58 2013 -0700 Added tag jdk7u25-b03 for changeset 2a444d8e36eb changeset ffef9e05564e in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ffef9e05564e author: dsamersoff date: Wed Mar 27 14:32:58 2013 +0400 8008120: Improve JMX class checking Summary: Improve JMX class checking Reviewed-by: mchung, dfuchs, alanb, skoivu changeset 160cde99bb1a in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=160cde99bb1a author: jbachorik date: Wed Mar 27 13:29:22 2013 +0100 8010209: Better provision of factories Reviewed-by: dcubed, ahgross changeset 76517dad144d in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=76517dad144d author: peytoia date: Fri Mar 15 20:35:51 2013 +0900 8009987: (tz) Support tzdata2013b Reviewed-by: okutsu changeset b1cf36f3435c in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=b1cf36f3435c author: asaha date: Wed Mar 27 13:06:08 2013 -0700 Merge changeset c78694100fa2 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=c78694100fa2 author: jbachorik date: Thu Mar 28 09:39:26 2013 +0100 8008982: Adjust JMX for underlying interface changes Reviewed-by: mchung, dholmes, dfuchs, skoivu changeset 09c14ca57ff0 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=09c14ca57ff0 author: bae date: Thu Mar 28 22:17:04 2013 +0400 8001038: Resourcefully handle resources Reviewed-by: mschoene, prr, bae Contributed-by: jia-hong.chen at oracle.com changeset 56f01b89d8b8 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=56f01b89d8b8 author: bae date: Thu Mar 28 23:01:08 2013 +0400 8007925: Improve cmsStageAllocLabV2ToV4curves 8007926: Improve cmsPipelineDup Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset c14aa930b032 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=c14aa930b032 author: dsamersoff date: Thu Mar 28 23:39:28 2013 +0400 8008124: Better compliance testing Summary: Better compliance testing Reviewed-by: dfuchs, jfdenise, skoivu, alanb changeset cc656d61e713 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=cc656d61e713 author: khazra date: Thu Mar 28 14:59:22 2013 -0700 8001318: Socket.getLocalAddress not consistent with InetAddress.getLocalHost Reviewed-by: alanb, chegar, hawtin changeset 8718da8c36f3 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=8718da8c36f3 author: bae date: Fri Mar 29 10:30:31 2013 +0400 8009654: Improve stability of cmsnamed Reviewed-by: bae, prr Contributed-by: jia-hong.chen at oracle.com changeset 91ce9432f88d in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=91ce9432f88d author: serb date: Sat Mar 30 22:45:54 2013 +0400 8006328: Improve robustness of sound classes 8009057: Improve MIDI event handling Reviewed-by: amenkov, art, skoivu changeset f38991767794 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=f38991767794 author: prr date: Sun Mar 31 09:05:58 2013 -0700 8005007: Better glyph processing Reviewed-by: srl, mschoene, bae changeset 7fc6c331082c in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=7fc6c331082c author: leonidr date: Tue Apr 02 02:01:04 2013 +0400 8001308: Update display of applet windows Summary: Implemented security warning for OS X port Reviewed-by: art, anthony, serb, skoivu changeset 4181f947e8b0 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=4181f947e8b0 author: katleman date: Tue Apr 02 12:12:22 2013 -0700 Added tag jdk7u25-b04 for changeset 7fc6c331082c changeset c80531786682 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=c80531786682 author: sundar date: Fri Apr 05 15:39:25 2013 +0530 8006611: Improve scripting Reviewed-by: mchung, jdn changeset 05a8336b1eab in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=05a8336b1eab author: mullan date: Fri Apr 05 08:33:25 2013 -0400 8001330: Improve on checking order Reviewed-by: acorn, hawtin changeset 845c9121b16d in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=845c9121b16d author: mullan date: Fri Apr 05 08:49:33 2013 -0400 Merge changeset 6c00e5d483b9 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=6c00e5d483b9 author: mchung date: Fri Apr 05 08:43:00 2013 -0700 8011557: Improve reflection utility classes Reviewed-by: ahgross, alanb changeset 41529646ab84 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=41529646ab84 author: chegar date: Fri Apr 05 18:12:11 2013 +0100 8008593: Better URLClassLoader resource management Reviewed-by: alanb, sherman, hawtin changeset b3ccc94f79fa in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=b3ccc94f79fa author: jgish date: Wed Mar 13 11:24:48 2013 -0400 8002070: Remove the stack search for a resource bundle for Logger to use Summary: The fragile, vulnerable, stack crawling has been eliminated from findResourceBundle(String) Reviewed-by: mchung changeset 31c487a93b19 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=31c487a93b19 author: jgish date: Fri Apr 05 14:28:42 2013 -0400 Merge changeset 8ab8387ae741 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=8ab8387ae741 author: coffeys date: Fri Apr 05 21:34:42 2013 +0100 Merge changeset 4c3d38927a26 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=4c3d38927a26 author: prr date: Mon Apr 08 12:41:09 2013 -0700 8011248: Better Component Rasters Reviewed-by: bae, vadim, mschoene changeset 3cd4bec64e31 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=3cd4bec64e31 author: prr date: Mon Apr 08 12:46:20 2013 -0700 8011253: Better Short Component Rasters Reviewed-by: bae, vadim, mschoene changeset 259d4998ce2f in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=259d4998ce2f author: prr date: Mon Apr 08 12:48:19 2013 -0700 8011253: Better Byte Component Rasters Reviewed-by: bae, vadim, mschoene changeset 84acc064cadd in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=84acc064cadd author: vinnie date: Mon Apr 08 21:17:57 2013 +0100 8009235: Improve handling of TSA data Reviewed-by: ahgross, mullan changeset 600fc9cb4696 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=600fc9cb4696 author: coffeys date: Mon Apr 08 23:15:22 2013 +0100 8001032: Restrict object access Summary: Restrict object access; fix reviewed also by Alexander Fomin Reviewed-by: alanb, ahgross changeset d0e8dd6dd7a5 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=d0e8dd6dd7a5 author: mchung date: Mon Apr 08 18:49:18 2013 -0700 8010118: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive Reviewed-by: alanb, twisti, jrose, kvn changeset 41e4ab96d0ed in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=41e4ab96d0ed author: katleman date: Mon Mar 04 14:17:26 2013 -0800 Added tag jdk7u17-b32 for changeset 6c6b9d7943e7 changeset 322261dcbd18 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=322261dcbd18 author: asaha date: Mon Apr 08 15:58:22 2013 -0700 Merge changeset e612d69c3978 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=e612d69c3978 author: asaha date: Mon Apr 08 16:32:35 2013 -0700 Merge changeset afdba2ff7ddc in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=afdba2ff7ddc author: asaha date: Mon Apr 08 21:43:18 2013 -0700 Merge changeset 97b9792d98c7 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=97b9792d98c7 author: anthony date: Tue Apr 09 12:08:53 2013 +0400 8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows Reviewed-by: art, yan changeset 89d9ec9e80c1 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=89d9ec9e80c1 author: bae date: Tue Apr 09 15:03:29 2013 +0400 8011243: Improve ImagingLib Reviewed-by: mschoene, prr, vadim changeset 9efb5fb77027 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=9efb5fb77027 author: vlivanov date: Tue Apr 09 17:38:32 2013 +0400 8009424: Adapt Nashorn to JSR-292 implementation change Reviewed-by: jrose, twisti, jdn, mchung changeset 153a6abe4a4c in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=153a6abe4a4c author: asaha date: Tue Apr 09 12:39:40 2013 -0700 8011806: 7u25-b05 hotspot fastdebug build failure Summary: Backed out changeset 05a8336b1eab Reviewed-by: mullan changeset 5d4d557f374f in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=5d4d557f374f author: asaha date: Tue Apr 09 12:40:19 2013 -0700 Merge changeset f2d4da9ba0f0 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=f2d4da9ba0f0 author: asaha date: Tue Apr 09 13:25:25 2013 -0700 Merge changeset 7f4156b0b8d7 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=7f4156b0b8d7 author: pchelko date: Wed Apr 10 14:28:10 2013 +0400 8010009: [macosx] Unable type into online word games on MacOSX Reviewed-by: anthony, dcherepanov, yan changeset 80d5cd2519bf in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=80d5cd2519bf author: katleman date: Wed Apr 10 12:43:06 2013 -0700 Added tag jdk7u25-b05 for changeset f2d4da9ba0f0 changeset 5748526c96f0 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=5748526c96f0 author: katleman date: Wed Apr 10 12:51:58 2013 -0700 Merge changeset f602974a14c3 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=f602974a14c3 author: bae date: Fri Apr 12 14:15:17 2013 +0400 8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05 Reviewed-by: prr, vadim changeset d59dc08047fd in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=d59dc08047fd author: bae date: Mon Apr 15 14:15:21 2013 +0400 8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris Reviewed-by: prr, vadim changeset 54f27df0e410 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=54f27df0e410 author: katleman date: Tue Apr 16 11:28:12 2013 -0700 Added tag jdk7u25-b06 for changeset 5748526c96f0 changeset cb27c7d6e1fb in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=cb27c7d6e1fb author: asaha date: Tue Apr 16 12:14:40 2013 -0700 Merge changeset 898c92b7ab12 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=898c92b7ab12 author: leonidr date: Tue Apr 16 18:52:44 2013 +0400 8011695: [tck-red] Application can not be run, the Security Warning dialog is gray. Summary: EventQueue shoudn't use AppContext.getAppContext() to obtain its AppContext. Reviewed-by: art, serb changeset fe514475bc17 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=fe514475bc17 author: asaha date: Tue Apr 16 12:20:53 2013 -0700 Merge changeset db57f06c2c8d in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=db57f06c2c8d author: jgish date: Tue Apr 16 16:34:14 2013 -0400 8011990: TEST_BUG: java/util/logging/bundlesearch/ResourceBundleSearchTest.java fails on Windows Summary: Fix URL to reliably work on all platforms Reviewed-by: duke changeset 97138fb79291 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=97138fb79291 author: katleman date: Thu Apr 18 11:44:29 2013 -0700 Added tag jdk7u25-b07 for changeset fe514475bc17 changeset 5fc00e7f7f5b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=5fc00e7f7f5b author: asaha date: Thu Apr 18 14:00:28 2013 -0700 Merge changeset f6dce3552285 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=f6dce3552285 author: mullan date: Thu Apr 18 17:53:27 2013 -0400 8001330: Improve on checking order 8011896: Add check for invalid offset for new AccessControlContext isAuthorized field Reviewed-by: acorn, hawtin changeset e6b6c254fab2 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=e6b6c254fab2 author: mullan date: Thu Apr 18 17:57:54 2013 -0400 Merge changeset 8f7c3ea16f4a in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=8f7c3ea16f4a author: jfranck date: Thu Apr 18 13:18:28 2013 +0200 8011139: (reflect) Revise checking in getEnclosingClass Reviewed-by: darcy, mchung, ahgross changeset a84ce8e20d28 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=a84ce8e20d28 author: asaha date: Thu Apr 18 14:22:14 2013 -0700 Merge changeset f8373784a79e in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=f8373784a79e author: asaha date: Thu Apr 18 15:23:08 2013 -0700 Merge changeset a7635c74a2c8 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=a7635c74a2c8 author: katleman date: Tue Apr 23 16:22:26 2013 -0700 Added tag jdk7u25-b08 for changeset f8373784a79e changeset b79d56eee18e in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=b79d56eee18e author: bae date: Wed Apr 24 15:23:44 2013 +0400 8012438: Better image validation Reviewed-by: mschoene, prr, vadim changeset 971a1b285312 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=971a1b285312 author: prr date: Fri Apr 19 15:40:03 2013 -0700 8012421: Better positioning of PairPositioning Reviewed-by: srl, mschoene, vadim changeset 266962f7c114 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=266962f7c114 author: asaha date: Fri Apr 26 10:03:43 2013 -0700 Merge changeset d2c1fec2f7be in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=d2c1fec2f7be author: mullan date: Mon Apr 29 10:20:55 2013 -0400 8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03 Reviewed-by: xuelei changeset f209450f970b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=f209450f970b author: prr date: Thu Apr 25 21:37:41 2013 -0700 8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer Reviewed-by: bae, srl changeset 64055b403176 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=64055b403176 author: bae date: Fri Apr 26 09:30:54 2013 +0400 8012601: Better validation of image layouts Reviewed-by: mschoene, prr, vadim changeset 2c3fae51b7d6 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=2c3fae51b7d6 author: alexsch date: Mon Apr 29 16:46:18 2013 +0400 8012330: [macosx] Sometimes the applet showing the modal dialog itself loses the ability to gain focus Reviewed-by: serb, ant changeset 9f59600aea52 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=9f59600aea52 author: mullan date: Mon Dec 03 11:07:20 2012 -0500 7199143: RFE: OCSP revocation checker should provide possibility to specify connection timeout Summary: Added com.sun.security.ocsp.timeout system property to control timeout Reviewed-by: mullan, vinnie Contributed-by: jason.uh at oracle.com changeset 51d6934d1d7d in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=51d6934d1d7d author: mullan date: Thu Apr 25 14:45:16 2013 -0700 8011313: OCSP timeout set to wrong value if com.sun.security.ocsp.timeout not defined Reviewed-by: vinnie changeset 023297d5b047 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=023297d5b047 author: mullan date: Fri Apr 26 10:41:35 2013 -0700 8013228: Create new system properties to control allowable OCSP clock skew and CRL connection timeout Reviewed-by: vinnie changeset 11616f222415 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=11616f222415 author: katleman date: Tue Apr 30 12:25:32 2013 -0700 Added tag jdk7u25-b09 for changeset 023297d5b047 changeset 2a9c79db0040 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=2a9c79db0040 author: bae date: Tue Apr 30 04:20:46 2013 +0400 8012597: Better image channel verification Reviewed-by: ahgross, vadim, prr changeset 2dc2b6b34b00 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=2dc2b6b34b00 author: mcherkas date: Tue Feb 12 16:11:40 2013 +0400 8005932: Java 7 on mac os x only provides text clipboard formats Reviewed-by: alexp, denis changeset 431c2b754123 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=431c2b754123 author: dfuchs date: Wed May 01 00:49:21 2013 +0200 8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21 Reviewed-by: alanb, skoivu, smarks, mchung changeset c448f31eb138 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=c448f31eb138 author: coffeys date: Wed May 01 21:02:04 2013 +0100 8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext() Reviewed-by: mchung, okutsu changeset c82ed89b21bc in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=c82ed89b21bc author: mullan date: Wed May 01 17:19:04 2013 -0400 8008744: Rework part of fix for JDK-6741606 Reviewed-by: xuelei, ahgross changeset 55f69873b5b1 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=55f69873b5b1 author: katleman date: Tue May 07 12:56:42 2013 -0700 Added tag jdk7u25-b10 for changeset c82ed89b21bc changeset 627060e4a373 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=627060e4a373 author: leonidr date: Mon May 06 16:30:42 2013 +0400 8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07 Summary: Do not mark context as disposed until we've posted all the events Reviewed-by: art changeset d6d7ba76d746 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=d6d7ba76d746 author: mullan date: Fri May 10 16:28:51 2013 -0400 8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod Reviewed-by: xuelei, hawtin changeset 15ebd1eab1d0 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=15ebd1eab1d0 author: jgish date: Fri Apr 19 16:50:10 2013 -0700 8010939: Deadlock in LogManager Summary: re-order locks to avoid deadlock Reviewed-by: mchung, alanb changeset abe9ea5a50d2 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=abe9ea5a50d2 author: xuelei date: Mon May 13 18:30:45 2013 -0700 8014281: Better checking of XML signature Summary: also reviewed by Andrew Gross and Christophe Ravel Reviewed-by: mullan changeset 2091127583a3 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=2091127583a3 author: mchung date: Tue May 14 08:07:08 2013 -0700 8010727: WLS fails to add a logger with "" in its own LogManager subclass instance Reviewed-by: alanb, jgish changeset 70d0a0adb21f in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=70d0a0adb21f author: serb date: Tue May 14 20:22:55 2013 +0400 8014423: [macosx] The scrollbar's block increment performs incorrectly Reviewed-by: anthony, art changeset 789f4a57496d in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=789f4a57496d author: bae date: Tue May 14 21:05:20 2013 +0400 8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09 Reviewed-by: prr, vadim changeset 6788dc17bc5f in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=6788dc17bc5f author: uta date: Mon May 13 20:09:20 2013 +0400 8012453: (process) Runtime.exec(String) fails if command contains spaces [win] Reviewed-by: alanb changeset ef5d29607cce in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ef5d29607cce author: asaha date: Tue May 14 15:01:18 2013 -0700 8007699: Move some tests from test/sun/security/provider/certpath/X509CertPath to closed repo Reviewed-by: mullan Contributed-by: jason.uh at oracle.com changeset 02fe0c1285f5 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=02fe0c1285f5 author: katleman date: Wed May 15 13:31:16 2013 -0700 Added tag jdk7u25-b11 for changeset ef5d29607cce changeset 1dd4fe0ac19b in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=1dd4fe0ac19b author: jgish date: Tue May 14 15:42:14 2013 -0400 8013380: Removal of stack walk to find resource bundle breaks Glassfish startup Summary: Use caller's classloader to load resource as an alternative to thread context classloader and system classloader Reviewed-by: mchung, alanb changeset 0eceab95bf4d in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=0eceab95bf4d author: bae date: Fri May 17 16:07:14 2013 +0400 8014205: Most of the Swing dialogs are blank on one win7 MUI Reviewed-by: prr, vadim changeset c3c21a702e20 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=c3c21a702e20 author: dmeetry date: Fri May 17 19:59:49 2013 +0400 8014676: Java debugger may fail to run Summary: The problem is observed when the binaries for windows are placed under a path which contains a space Reviewed-by: alanb Contributed-by: ivan.gerasimov at oracle.com changeset 9603e9d828c4 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=9603e9d828c4 author: mchung date: Fri May 17 14:29:51 2013 -0700 8014745: Provide a switch to allow stack walk search of resource bundle Reviewed-by: alanb, jgish changeset cf82127fbb70 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=cf82127fbb70 author: leonidr date: Mon May 20 18:51:34 2013 +0400 8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10 Summary: Removed logging from SunToolkit Reviewed-by: art changeset 415182744480 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=415182744480 author: ngthomas date: Tue May 21 10:25:40 2013 -0700 8014968: OCSP and CRL connection timeout is set to four hours by default Reviewed-by: mullan changeset 39282f162343 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=39282f162343 author: ngthomas date: Tue May 21 11:41:23 2013 -0700 Merge changeset ba6c3d64b94d in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ba6c3d64b94d author: katleman date: Wed May 22 15:45:02 2013 -0700 Added tag jdk7u25-b12 for changeset 39282f162343 changeset a71103b8cbb1 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=a71103b8cbb1 author: katleman date: Fri May 24 16:20:39 2013 -0700 Added tag jdk7u25-b13 for changeset ba6c3d64b94d changeset e1768e2070c9 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=e1768e2070c9 author: katleman date: Tue Jun 04 10:47:50 2013 -0700 Added tag jdk7u25-b14 for changeset a71103b8cbb1 changeset 0d68732acbd4 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=0d68732acbd4 author: katleman date: Thu Jun 06 11:41:46 2013 -0700 Added tag jdk7u25-b15 for changeset e1768e2070c9 changeset bd392c168d5c in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=bd392c168d5c author: andrew date: Fri Jun 21 15:46:14 2013 -0500 Merge diffstat: .hgtags | 117 + .jcheck/conf | 2 - make/com/oracle/security/ucrypto/Makefile | 4 +- make/com/sun/java/pack/Makefile | 22 +- make/com/sun/nio/sctp/Makefile | 2 + make/common/Defs-linux.gmk | 23 +- make/common/Defs.gmk | 1 + make/common/Library.gmk | 40 +- make/common/Program.gmk | 85 +- make/common/Release-macosx.gmk | 11 +- make/common/Release.gmk | 87 +- make/common/shared/Compiler-gcc.gmk | 76 +- make/common/shared/Defs-java.gmk | 20 +- make/common/shared/Defs-versions.gmk | 2 +- make/common/shared/Defs.gmk | 2 +- make/common/shared/Platform.gmk | 9 + make/common/shared/Sanity.gmk | 8 + make/docs/Makefile | 6 +- make/java/java/FILES_c.gmk | 2 - make/java/java/FILES_java.gmk | 3 +- make/java/java/mapfile-vers | 4 +- make/java/java/reorder-i586 | 1 - make/java/java/reorder-sparc | 1 - make/java/java/reorder-sparcv9 | 1 - make/java/jli/Makefile | 47 +- make/java/jli/mapfile-vers | 7 +- make/java/net/FILES_c.gmk | 7 + make/java/net/Makefile | 27 +- make/java/nio/Makefile | 220 +- make/java/nio/mapfile-bsd | 1 + make/java/nio/mapfile-linux | 2 + make/java/nio/mapfile-solaris | 2 + make/java/sun_nio/Makefile | 2 +- make/java/version/Makefile | 5 + make/java/zip/FILES_c.gmk | 2 +- make/java/zip/Makefile | 6 +- make/java/zip/mapfile-vers | 1 + make/java/zip/reorder-i586 | 1 + make/java/zip/reorder-sparc | 1 + make/java/zip/reorder-sparcv9 | 1 + make/javax/crypto/Defs-jce.gmk | 4 +- make/javax/crypto/Makefile | 3 +- make/javax/sound/SoundDefs.gmk | 48 + make/jdk_generic_profile.sh | 81 +- make/sun/awt/FILES_c_unix.gmk | 10 + make/sun/awt/Makefile | 83 +- make/sun/awt/ToBin.java | 59 + make/sun/awt/mawt.gmk | 39 +- make/sun/cmm/lcms/FILES_c_unix.gmk | 8 +- make/sun/cmm/lcms/FILES_c_windows.gmk | 1 + make/sun/cmm/lcms/Makefile | 8 +- make/sun/font/FILES_c.gmk | 16 +- make/sun/font/Makefile | 6 +- make/sun/javazic/tzdata/VERSION | 2 +- make/sun/javazic/tzdata/africa | 150 +- make/sun/javazic/tzdata/antarctica | 7 +- make/sun/javazic/tzdata/asia | 231 +- make/sun/javazic/tzdata/australasia | 105 +- make/sun/javazic/tzdata/backward | 1 - make/sun/javazic/tzdata/etcetera | 1 - make/sun/javazic/tzdata/europe | 144 +- make/sun/javazic/tzdata/factory | 1 - make/sun/javazic/tzdata/iso3166.tab | 1 - make/sun/javazic/tzdata/leapseconds | 7 +- make/sun/javazic/tzdata/northamerica | 92 +- make/sun/javazic/tzdata/pacificnew | 1 - make/sun/javazic/tzdata/solar87 | 1 - make/sun/javazic/tzdata/solar88 | 1 - make/sun/javazic/tzdata/solar89 | 1 - make/sun/javazic/tzdata/southamerica | 100 +- make/sun/javazic/tzdata/systemv | 1 - make/sun/javazic/tzdata/zone.tab | 6 +- make/sun/jawt/Makefile | 7 + make/sun/jpeg/FILES_c.gmk | 6 +- make/sun/jpeg/Makefile | 11 +- make/sun/native2ascii/Makefile | 2 +- make/sun/net/FILES_java.gmk | 1 + make/sun/nio/cs/Makefile | 2 +- make/sun/security/ec/Makefile | 4 +- make/sun/security/mscapi/Makefile | 4 +- make/sun/security/pkcs11/Makefile | 4 +- make/sun/security/pkcs11/mapfile-vers | 6 +- make/sun/splashscreen/FILES_c.gmk | 78 +- make/sun/splashscreen/Makefile | 42 +- make/sun/xawt/FILES_c_unix.gmk | 20 + make/sun/xawt/Makefile | 129 +- make/sun/xawt/ToBin.java | 59 - make/tools/Makefile | 9 + make/tools/freetypecheck/Makefile | 2 +- make/tools/generate_nimbus/Makefile | 1 + make/tools/src/build/tools/buildmetaindex/BuildMetaIndex.java | 22 +- make/tools/src/build/tools/compileproperties/CompileProperties.java | 9 +- make/tools/src/build/tools/dirdiff/DirDiff.java | 4 +- make/tools/src/build/tools/dtdbuilder/DTDBuilder.java | 34 +- make/tools/src/build/tools/dtdbuilder/DTDInputStream.java | 6 +- make/tools/src/build/tools/dtdbuilder/DTDParser.java | 44 +- make/tools/src/build/tools/dtdbuilder/PublicMapping.java | 6 +- make/tools/src/build/tools/generatebreakiteratordata/CharSet.java | 16 +- make/tools/src/build/tools/generatebreakiteratordata/DictionaryBasedBreakIteratorBuilder.java | 8 +- make/tools/src/build/tools/generatebreakiteratordata/GenerateBreakIteratorData.java | 6 +- make/tools/src/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java | 201 +- make/tools/src/build/tools/generatebreakiteratordata/SupplementaryCharacterData.java | 6 +- make/tools/src/build/tools/generatecharacter/GenerateCharacter.java | 4 +- make/tools/src/build/tools/generatecharacter/SpecialCaseMap.java | 147 +- make/tools/src/build/tools/generatecharacter/UnicodeSpec.java | 22 +- make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java | 4 +- make/tools/src/build/tools/hasher/Hasher.java | 38 +- make/tools/src/build/tools/jarsplit/JarSplit.java | 5 +- make/tools/src/build/tools/javazic/Gen.java | 14 +- make/tools/src/build/tools/javazic/GenDoc.java | 16 +- make/tools/src/build/tools/javazic/Main.java | 3 +- make/tools/src/build/tools/javazic/Simple.java | 23 +- make/tools/src/build/tools/javazic/Time.java | 10 +- make/tools/src/build/tools/javazic/Zoneinfo.java | 18 +- make/tools/src/build/tools/jdwpgen/AbstractCommandNode.java | 7 +- make/tools/src/build/tools/jdwpgen/AbstractGroupNode.java | 7 +- make/tools/src/build/tools/jdwpgen/AbstractNamedNode.java | 14 +- make/tools/src/build/tools/jdwpgen/AbstractTypeListNode.java | 26 +- make/tools/src/build/tools/jdwpgen/AltNode.java | 4 +- make/tools/src/build/tools/jdwpgen/CommandSetNode.java | 11 +- make/tools/src/build/tools/jdwpgen/ConstantSetNode.java | 9 +- make/tools/src/build/tools/jdwpgen/ErrorSetNode.java | 9 +- make/tools/src/build/tools/jdwpgen/Node.java | 25 +- make/tools/src/build/tools/jdwpgen/OutNode.java | 14 +- make/tools/src/build/tools/jdwpgen/RootNode.java | 10 +- make/tools/src/build/tools/jdwpgen/SelectNode.java | 10 +- make/tools/src/build/tools/makeclasslist/MakeClasslist.java | 15 +- make/tools/src/build/tools/stripproperties/StripProperties.java | 4 +- src/macosx/classes/com/apple/laf/ScreenMenuItem.java | 35 +- src/macosx/classes/com/apple/laf/ScreenMenuItemCheckbox.java | 24 +- src/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java | 65 +- src/macosx/classes/sun/java2d/opengl/CGLLayer.java | 8 +- src/macosx/classes/sun/lwawt/LWKeyboardFocusManagerPeer.java | 19 +- src/macosx/classes/sun/lwawt/LWScrollBarPeer.java | 4 +- src/macosx/classes/sun/lwawt/LWToolkit.java | 6 +- src/macosx/classes/sun/lwawt/LWWindowPeer.java | 215 +- src/macosx/classes/sun/lwawt/PlatformEventNotifier.java | 65 + src/macosx/classes/sun/lwawt/PlatformWindow.java | 11 +- src/macosx/classes/sun/lwawt/SecurityWarningWindow.java | 35 + src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java | 2 +- src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java | 41 +- src/macosx/classes/sun/lwawt/macosx/CFileDialog.java | 4 +- src/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java | 14 +- src/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java | 75 +- src/macosx/classes/sun/lwawt/macosx/CPlatformView.java | 31 +- src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java | 93 +- src/macosx/classes/sun/lwawt/macosx/CPrinterDialogPeer.java | 4 +- src/macosx/classes/sun/lwawt/macosx/CWarningWindow.java | 455 ++ src/macosx/classes/sun/lwawt/macosx/CWrapper.java | 4 +- src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java | 20 +- src/macosx/lib/flavormap.properties | 6 +- src/macosx/native/jobjc/src/core/native/SEL.m | 4 +- src/macosx/native/sun/awt/AWTEvent.h | 2 + src/macosx/native/sun/awt/AWTEvent.m | 51 +- src/macosx/native/sun/awt/AWTView.m | 28 +- src/macosx/native/sun/awt/AWTWindow.m | 3 +- src/macosx/native/sun/awt/CDragSource.m | 4 +- src/macosx/native/sun/awt/CMenuItem.m | 25 +- src/macosx/native/sun/awt/CRobot.m | 3 +- src/macosx/native/sun/awt/CWrapper.m | 23 +- src/macosx/native/sun/awt/DnDUtilities.h | 4 - src/macosx/native/sun/awt/DnDUtilities.m | 48 - src/macosx/native/sun/awt/ImageSurfaceData.h | 10 +- src/macosx/native/sun/awt/ImageSurfaceData.m | 9 +- src/macosx/native/sun/awt/LWCToolkit.m | 7 +- src/macosx/native/sun/awt/QuartzRenderer.m | 7 +- src/macosx/native/sun/awt/QuartzSurfaceData.m | 9 +- src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m | 6 +- src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.m | 17 + src/share/bin/java.c | 48 +- src/share/bin/java.h | 4 + src/share/bin/jli_util.c | 6 +- src/share/bin/jli_util.h | 17 +- src/share/bin/main.c | 35 +- src/share/bin/parse_manifest.c | 15 +- src/share/bin/wildcard.c | 9 +- src/share/classes/com/sun/beans/decoder/DocumentHandler.java | 55 +- src/share/classes/com/sun/beans/decoder/MethodElementHandler.java | 6 +- src/share/classes/com/sun/beans/decoder/PropertyElementHandler.java | 12 +- src/share/classes/com/sun/beans/editors/BooleanEditor.java | 76 + src/share/classes/com/sun/beans/editors/ByteEditor.java | 48 + src/share/classes/com/sun/beans/editors/ColorEditor.java | 214 + src/share/classes/com/sun/beans/editors/DoubleEditor.java | 41 + src/share/classes/com/sun/beans/editors/EnumEditor.java | 143 + src/share/classes/com/sun/beans/editors/FloatEditor.java | 48 + src/share/classes/com/sun/beans/editors/FontEditor.java | 219 + src/share/classes/com/sun/beans/editors/IntegerEditor.java | 42 + src/share/classes/com/sun/beans/editors/LongEditor.java | 48 + src/share/classes/com/sun/beans/editors/NumberEditor.java | 44 + src/share/classes/com/sun/beans/editors/ShortEditor.java | 49 + src/share/classes/com/sun/beans/editors/StringEditor.java | 74 + src/share/classes/com/sun/beans/finder/BeanInfoFinder.java | 8 +- src/share/classes/com/sun/beans/finder/ClassFinder.java | 6 +- src/share/classes/com/sun/beans/finder/ConstructorFinder.java | 6 +- src/share/classes/com/sun/beans/finder/FieldFinder.java | 7 +- src/share/classes/com/sun/beans/finder/MethodFinder.java | 13 +- src/share/classes/com/sun/beans/finder/PropertyEditorFinder.java | 28 +- src/share/classes/com/sun/beans/infos/ComponentBeanInfo.java | 62 + src/share/classes/com/sun/crypto/provider/AESCrypt.java | 94 +- src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java | 12 +- src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java | 295 +- src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java | 149 +- src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java | 5 +- src/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java | 16 +- src/share/classes/com/sun/java/util/jar/pack/Attribute.java | 14 +- src/share/classes/com/sun/java/util/jar/pack/BandStructure.java | 9 +- src/share/classes/com/sun/java/util/jar/pack/ClassReader.java | 12 +- src/share/classes/com/sun/java/util/jar/pack/ClassWriter.java | 8 +- src/share/classes/com/sun/java/util/jar/pack/Code.java | 4 +- src/share/classes/com/sun/java/util/jar/pack/Coding.java | 7 +- src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java | 36 +- src/share/classes/com/sun/java/util/jar/pack/Constants.java | 12 +- src/share/classes/com/sun/java/util/jar/pack/Fixups.java | 41 +- src/share/classes/com/sun/java/util/jar/pack/Instruction.java | 4 +- src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java | 8 +- src/share/classes/com/sun/java/util/jar/pack/Package.java | 58 +- src/share/classes/com/sun/java/util/jar/pack/PackageReader.java | 29 +- src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java | 38 +- src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java | 15 +- src/share/classes/com/sun/java/util/jar/pack/PropMap.java | 61 +- src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java | 4 +- src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java | 9 +- src/share/classes/com/sun/java/util/jar/pack/Utils.java | 4 +- src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java | 15 +- src/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java | 18 +- src/share/classes/com/sun/jmx/mbeanserver/ConvertingMethod.java | 3 +- src/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java | 15 +- src/share/classes/com/sun/jmx/mbeanserver/Introspector.java | 22 +- src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java | 31 +- src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java | 92 +- src/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java | 4 +- src/share/classes/com/sun/jmx/mbeanserver/MBeanSupport.java | 2 + src/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java | 3 +- src/share/classes/com/sun/jmx/mbeanserver/StandardMBeanIntrospector.java | 3 +- src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java | 16 +- src/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java | 24 +- src/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java | 2 + src/share/classes/com/sun/jmx/remote/util/EnvHelp.java | 76 +- src/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java | 7 +- src/share/classes/com/sun/jndi/dns/DnsContextFactory.java | 2 +- src/share/classes/com/sun/media/sound/AbstractDataLine.java | 45 +- src/share/classes/com/sun/media/sound/AbstractLine.java | 69 +- src/share/classes/com/sun/media/sound/AbstractMidiDevice.java | 69 +- src/share/classes/com/sun/media/sound/AbstractMidiDeviceProvider.java | 16 +- src/share/classes/com/sun/media/sound/AbstractMixer.java | 54 +- src/share/classes/com/sun/media/sound/AiffFileFormat.java | 10 +- src/share/classes/com/sun/media/sound/AiffFileReader.java | 34 +- src/share/classes/com/sun/media/sound/AiffFileWriter.java | 14 +- src/share/classes/com/sun/media/sound/AlawCodec.java | 14 +- src/share/classes/com/sun/media/sound/AuFileFormat.java | 6 +- src/share/classes/com/sun/media/sound/AuFileReader.java | 34 +- src/share/classes/com/sun/media/sound/AuFileWriter.java | 16 +- src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java | 4 +- src/share/classes/com/sun/media/sound/AudioFloatConverter.java | 39 +- src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java | 51 +- src/share/classes/com/sun/media/sound/AudioFloatInputStream.java | 26 +- src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java | 4 +- src/share/classes/com/sun/media/sound/DLSInfo.java | 4 +- src/share/classes/com/sun/media/sound/DLSInstrument.java | 18 +- src/share/classes/com/sun/media/sound/DLSModulator.java | 16 +- src/share/classes/com/sun/media/sound/DLSRegion.java | 28 +- src/share/classes/com/sun/media/sound/DLSSample.java | 14 +- src/share/classes/com/sun/media/sound/DLSSampleLoop.java | 10 +- src/share/classes/com/sun/media/sound/DLSSampleOptions.java | 14 +- src/share/classes/com/sun/media/sound/DLSSoundbank.java | 12 +- src/share/classes/com/sun/media/sound/DLSSoundbankReader.java | 4 +- src/share/classes/com/sun/media/sound/DataPusher.java | 8 +- src/share/classes/com/sun/media/sound/DirectAudioDevice.java | 44 +- src/share/classes/com/sun/media/sound/DirectAudioDeviceProvider.java | 68 +- src/share/classes/com/sun/media/sound/EmergencySoundbank.java | 4 +- src/share/classes/com/sun/media/sound/EventDispatcher.java | 34 +- src/share/classes/com/sun/media/sound/FFT.java | 12 +- src/share/classes/com/sun/media/sound/FastShortMessage.java | 8 +- src/share/classes/com/sun/media/sound/FastSysexMessage.java | 2 +- src/share/classes/com/sun/media/sound/JARSoundbankReader.java | 22 +- src/share/classes/com/sun/media/sound/JDK13Services.java | 16 +- src/share/classes/com/sun/media/sound/JSSecurityManager.java | 103 +- src/share/classes/com/sun/media/sound/JavaSoundAudioClip.java | 12 +- src/share/classes/com/sun/media/sound/MidiDeviceReceiverEnvelope.java | 4 +- src/share/classes/com/sun/media/sound/MidiDeviceTransmitterEnvelope.java | 4 +- src/share/classes/com/sun/media/sound/MidiInDevice.java | 9 +- src/share/classes/com/sun/media/sound/MidiInDeviceProvider.java | 15 +- src/share/classes/com/sun/media/sound/MidiOutDevice.java | 22 +- src/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java | 15 +- src/share/classes/com/sun/media/sound/MidiUtils.java | 11 +- src/share/classes/com/sun/media/sound/ModelByteBuffer.java | 8 +- src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java | 12 +- src/share/classes/com/sun/media/sound/ModelConnectionBlock.java | 4 +- src/share/classes/com/sun/media/sound/ModelDestination.java | 4 +- src/share/classes/com/sun/media/sound/ModelIdentifier.java | 4 +- src/share/classes/com/sun/media/sound/ModelInstrument.java | 8 +- src/share/classes/com/sun/media/sound/ModelInstrumentComparator.java | 4 +- src/share/classes/com/sun/media/sound/ModelMappedInstrument.java | 6 +- src/share/classes/com/sun/media/sound/ModelPatch.java | 4 +- src/share/classes/com/sun/media/sound/ModelPerformer.java | 6 +- src/share/classes/com/sun/media/sound/ModelSource.java | 4 +- src/share/classes/com/sun/media/sound/ModelStandardDirector.java | 4 +- src/share/classes/com/sun/media/sound/ModelStandardIndexedDirector.java | 4 +- src/share/classes/com/sun/media/sound/ModelStandardTransform.java | 4 +- src/share/classes/com/sun/media/sound/PCMtoPCMCodec.java | 10 +- src/share/classes/com/sun/media/sound/Platform.java | 25 +- src/share/classes/com/sun/media/sound/PortMixer.java | 28 +- src/share/classes/com/sun/media/sound/PortMixerProvider.java | 46 +- src/share/classes/com/sun/media/sound/Printer.java | 10 +- src/share/classes/com/sun/media/sound/RIFFInvalidDataException.java | 4 +- src/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java | 4 +- src/share/classes/com/sun/media/sound/RIFFReader.java | 8 +- src/share/classes/com/sun/media/sound/RIFFWriter.java | 16 +- src/share/classes/com/sun/media/sound/RealTimeSequencer.java | 80 +- src/share/classes/com/sun/media/sound/RealTimeSequencerProvider.java | 4 +- src/share/classes/com/sun/media/sound/SF2GlobalRegion.java | 4 +- src/share/classes/com/sun/media/sound/SF2Instrument.java | 22 +- src/share/classes/com/sun/media/sound/SF2InstrumentRegion.java | 6 +- src/share/classes/com/sun/media/sound/SF2Layer.java | 10 +- src/share/classes/com/sun/media/sound/SF2LayerRegion.java | 6 +- src/share/classes/com/sun/media/sound/SF2Modulator.java | 14 +- src/share/classes/com/sun/media/sound/SF2Sample.java | 24 +- src/share/classes/com/sun/media/sound/SF2Soundbank.java | 36 +- src/share/classes/com/sun/media/sound/SF2SoundbankReader.java | 4 +- src/share/classes/com/sun/media/sound/SoftAbstractResampler.java | 6 +- src/share/classes/com/sun/media/sound/SoftAudioBuffer.java | 4 +- src/share/classes/com/sun/media/sound/SoftAudioPusher.java | 8 +- src/share/classes/com/sun/media/sound/SoftChannel.java | 44 +- src/share/classes/com/sun/media/sound/SoftChannelProxy.java | 4 +- src/share/classes/com/sun/media/sound/SoftChorus.java | 14 +- src/share/classes/com/sun/media/sound/SoftCubicResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java | 38 +- src/share/classes/com/sun/media/sound/SoftFilter.java | 6 +- src/share/classes/com/sun/media/sound/SoftInstrument.java | 8 +- src/share/classes/com/sun/media/sound/SoftJitterCorrector.java | 8 +- src/share/classes/com/sun/media/sound/SoftLanczosResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftLimiter.java | 4 +- src/share/classes/com/sun/media/sound/SoftLinearResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftLinearResampler2.java | 4 +- src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java | 24 +- src/share/classes/com/sun/media/sound/SoftMainMixer.java | 26 +- src/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java | 4 +- src/share/classes/com/sun/media/sound/SoftMixingClip.java | 8 +- src/share/classes/com/sun/media/sound/SoftMixingDataLine.java | 88 +- src/share/classes/com/sun/media/sound/SoftMixingMainMixer.java | 34 +- src/share/classes/com/sun/media/sound/SoftMixingMixer.java | 34 +- src/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java | 6 +- src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java | 10 +- src/share/classes/com/sun/media/sound/SoftPerformer.java | 4 +- src/share/classes/com/sun/media/sound/SoftPointResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftProvider.java | 8 +- src/share/classes/com/sun/media/sound/SoftReceiver.java | 14 +- src/share/classes/com/sun/media/sound/SoftReverb.java | 10 +- src/share/classes/com/sun/media/sound/SoftShortMessage.java | 4 +- src/share/classes/com/sun/media/sound/SoftSincResampler.java | 4 +- src/share/classes/com/sun/media/sound/SoftSynthesizer.java | 60 +- src/share/classes/com/sun/media/sound/SoftTuning.java | 6 +- src/share/classes/com/sun/media/sound/SoftVoice.java | 134 +- src/share/classes/com/sun/media/sound/StandardMidiFileReader.java | 29 +- src/share/classes/com/sun/media/sound/StandardMidiFileWriter.java | 10 +- src/share/classes/com/sun/media/sound/SunCodec.java | 18 +- src/share/classes/com/sun/media/sound/SunFileReader.java | 33 +- src/share/classes/com/sun/media/sound/SunFileWriter.java | 17 +- src/share/classes/com/sun/media/sound/Toolkit.java | 9 +- src/share/classes/com/sun/media/sound/UlawCodec.java | 9 +- src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java | 14 +- src/share/classes/com/sun/media/sound/WaveFileFormat.java | 22 +- src/share/classes/com/sun/media/sound/WaveFileReader.java | 34 +- src/share/classes/com/sun/media/sound/WaveFileWriter.java | 14 +- src/share/classes/com/sun/media/sound/WaveFloatFileReader.java | 4 +- src/share/classes/com/sun/media/sound/WaveFloatFileWriter.java | 8 +- src/share/classes/com/sun/org/apache/xml/internal/security/Init.java | 643 +- src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/ClassLoaderUtils.java | 280 + src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java | 403 +- src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java | 812 ++-- src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java | 237 +- src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java | 7 +- src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java | 22 +- src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java | 34 +- src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java | 251 +- src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java | 622 +- src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java | 10 +- src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties | 249 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java | 14 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/ObjectContainer.java | 5 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java | 3 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperties.java | 21 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java | 5 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java | 5 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java | 49 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java | 9 +- src/share/classes/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderUtils.java | 280 + src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java | 420 +- src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java | 9 +- src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java | 23 +- src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java | 32 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java | 848 ++-- src/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java | 338 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java | 2 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java | 395 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java | 534 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java | 12 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverFragment.java | 98 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverXPointer.java | 66 +- src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java | 8 +- src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java | 8 +- src/share/classes/com/sun/script/javascript/RhinoTopLevel.java | 3 +- src/share/classes/com/sun/tools/jdi/AbstractLauncher.java | 2 +- src/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java | 2 +- src/share/classes/java/awt/AWTEvent.java | 13 +- src/share/classes/java/awt/CheckboxMenuItem.java | 8 + src/share/classes/java/awt/Cursor.java | 20 +- src/share/classes/java/awt/DefaultKeyboardFocusManager.java | 10 + src/share/classes/java/awt/Dialog.java | 54 +- src/share/classes/java/awt/EventDispatchThread.java | 24 +- src/share/classes/java/awt/EventQueue.java | 50 +- src/share/classes/java/awt/Font.java | 40 +- src/share/classes/java/awt/KeyboardFocusManager.java | 4 +- src/share/classes/java/awt/Menu.java | 8 + src/share/classes/java/awt/MenuBar.java | 11 + src/share/classes/java/awt/MenuComponent.java | 4 +- src/share/classes/java/awt/MenuItem.java | 25 +- src/share/classes/java/awt/ScrollPaneAdjustable.java | 9 + src/share/classes/java/awt/SequencedEvent.java | 12 + src/share/classes/java/awt/SystemTray.java | 13 + src/share/classes/java/awt/TextComponent.java | 25 +- src/share/classes/java/awt/Toolkit.java | 10 +- src/share/classes/java/awt/TrayIcon.java | 20 +- src/share/classes/java/awt/Window.java | 6 +- src/share/classes/java/awt/color/ICC_Profile.java | 4 +- src/share/classes/java/awt/event/KeyEvent.java | 19 +- src/share/classes/java/awt/image/BufferedImage.java | 52 +- src/share/classes/java/awt/image/ComponentSampleModel.java | 16 +- src/share/classes/java/awt/image/PixelInterleavedSampleModel.java | 10 +- src/share/classes/java/awt/image/Raster.java | 15 +- src/share/classes/java/awt/peer/WindowPeer.java | 13 +- src/share/classes/java/beans/IndexedPropertyDescriptor.java | 10 + src/share/classes/java/beans/Introspector.java | 60 +- src/share/classes/java/beans/PropertyDescriptor.java | 10 + src/share/classes/java/beans/ThreadGroupContext.java | 7 +- src/share/classes/java/beans/WeakIdentityMap.java | 181 + src/share/classes/java/beans/XMLDecoder.java | 16 +- src/share/classes/java/beans/XMLEncoder.java | 19 +- src/share/classes/java/io/FilePermission.java | 2 +- src/share/classes/java/io/InputStream.java | 2 +- src/share/classes/java/io/ObjectInputStream.java | 25 + src/share/classes/java/io/ObjectOutputStream.java | 13 + src/share/classes/java/io/ObjectStreamClass.java | 20 + src/share/classes/java/io/ObjectStreamField.java | 10 + src/share/classes/java/lang/Class.java | 161 +- src/share/classes/java/lang/ClassLoader.java | 60 +- src/share/classes/java/lang/Package.java | 11 +- src/share/classes/java/lang/ProcessBuilder.java | 22 +- src/share/classes/java/lang/Runtime.java | 8 +- src/share/classes/java/lang/System.java | 13 +- src/share/classes/java/lang/Thread.java | 11 +- src/share/classes/java/lang/invoke/DirectMethodHandle.java | 9 + src/share/classes/java/lang/invoke/MemberName.java | 13 +- src/share/classes/java/lang/invoke/MethodHandleImpl.java | 155 +- src/share/classes/java/lang/invoke/MethodHandleNatives.java | 152 +- src/share/classes/java/lang/invoke/MethodHandleProxies.java | 92 +- src/share/classes/java/lang/invoke/MethodHandleStatics.java | 4 +- src/share/classes/java/lang/invoke/MethodHandles.java | 232 +- src/share/classes/java/lang/management/ManagementFactory.java | 18 +- src/share/classes/java/lang/ref/Finalizer.java | 18 +- src/share/classes/java/lang/reflect/Constructor.java | 5 +- src/share/classes/java/lang/reflect/Field.java | 129 +- src/share/classes/java/lang/reflect/Method.java | 19 +- src/share/classes/java/lang/reflect/Proxy.java | 159 +- src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java | 2 +- src/share/classes/java/net/Inet4Address.java | 39 +- src/share/classes/java/net/Inet4AddressImpl.java | 2 +- src/share/classes/java/net/Inet6Address.java | 19 +- src/share/classes/java/net/Inet6AddressImpl.java | 2 +- src/share/classes/java/net/InetAddress.java | 120 +- src/share/classes/java/net/InetSocketAddress.java | 272 +- src/share/classes/java/net/NetUtil.java | 74 + src/share/classes/java/net/ServerSocket.java | 25 +- src/share/classes/java/net/Socket.java | 8 + src/share/classes/java/net/SocksSocketImpl.java | 13 +- src/share/classes/java/net/URL.java | 28 +- src/share/classes/java/nio/file/Files.java | 11 +- src/share/classes/java/rmi/dgc/VMID.java | 69 +- src/share/classes/java/rmi/server/LogStream.java | 9 +- src/share/classes/java/security/AccessControlContext.java | 13 +- src/share/classes/java/security/AccessController.java | 44 +- src/share/classes/java/security/KeyStore.java | 2 +- src/share/classes/java/security/Policy.java | 1 - src/share/classes/java/security/ProtectionDomain.java | 7 +- src/share/classes/java/sql/DriverManager.java | 72 +- src/share/classes/java/util/ResourceBundle.java | 29 +- src/share/classes/java/util/ServiceLoader.java | 15 +- src/share/classes/java/util/TimeZone.java | 59 +- src/share/classes/java/util/concurrent/ConcurrentHashMap.java | 28 +- src/share/classes/java/util/concurrent/Executors.java | 19 +- src/share/classes/java/util/concurrent/ThreadPoolExecutor.java | 172 +- src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java | 11 +- src/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java | 18 +- src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java | 13 +- src/share/classes/java/util/jar/JarFile.java | 21 +- src/share/classes/java/util/logging/FileHandler.java | 12 +- src/share/classes/java/util/logging/Handler.java | 18 +- src/share/classes/java/util/logging/Level.java | 255 +- src/share/classes/java/util/logging/LogManager.java | 560 ++- src/share/classes/java/util/logging/Logger.java | 278 +- src/share/classes/java/util/logging/Logging.java | 14 +- src/share/classes/java/util/logging/LoggingProxyImpl.java | 11 +- src/share/classes/java/util/logging/MemoryHandler.java | 2 +- src/share/classes/java/util/logging/SimpleFormatter.java | 2 +- src/share/classes/java/util/logging/StreamHandler.java | 2 +- src/share/classes/java/util/zip/ZipFile.java | 26 +- src/share/classes/javax/crypto/Cipher.java | 172 +- src/share/classes/javax/crypto/CryptoPermissions.java | 73 +- src/share/classes/javax/crypto/JarVerifier.java | 157 - src/share/classes/javax/crypto/JceSecurity.java | 251 +- src/share/classes/javax/crypto/JceSecurityManager.java | 252 - src/share/classes/javax/management/JMX.java | 90 +- src/share/classes/javax/management/MBeanServerFactory.java | 3 +- src/share/classes/javax/management/MBeanServerInvocationHandler.java | 15 +- src/share/classes/javax/management/StandardEmitterMBean.java | 40 +- src/share/classes/javax/management/modelmbean/DescriptorSupport.java | 5 +- src/share/classes/javax/management/modelmbean/RequiredModelMBean.java | 227 +- src/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java | 2 + src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java | 10 +- src/share/classes/javax/management/relation/RelationNotification.java | 255 +- src/share/classes/javax/management/remote/JMXConnectorFactory.java | 39 +- src/share/classes/javax/management/remote/NotificationResult.java | 4 +- src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java | 95 +- src/share/classes/javax/management/remote/rmi/RMIConnector.java | 11 +- src/share/classes/javax/management/remote/rmi/RMIConnectorServer.java | 5 +- src/share/classes/javax/script/ScriptEngineManager.java | 48 +- src/share/classes/javax/sound/midi/MetaMessage.java | 18 +- src/share/classes/javax/sound/sampled/Mixer.java | 8 +- src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java | 19 +- src/share/classes/javax/swing/AncestorNotifier.java | 4 +- src/share/classes/javax/swing/ClientPropertyKey.java | 11 + src/share/classes/javax/swing/JComponent.java | 13 +- src/share/classes/javax/swing/JDialog.java | 3 +- src/share/classes/javax/swing/JEditorPane.java | 11 +- src/share/classes/javax/swing/JFrame.java | 10 +- src/share/classes/javax/swing/JInternalFrame.java | 6 +- src/share/classes/javax/swing/JPopupMenu.java | 10 +- src/share/classes/javax/swing/JTable.java | 14 +- src/share/classes/javax/swing/MenuSelectionManager.java | 5 +- src/share/classes/javax/swing/PopupFactory.java | 14 +- src/share/classes/javax/swing/RepaintManager.java | 164 +- src/share/classes/javax/swing/SwingUtilities.java | 6 +- src/share/classes/javax/swing/SwingWorker.java | 2 +- src/share/classes/javax/swing/UIDefaults.java | 2 + src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java | 6 +- src/share/classes/javax/swing/plaf/basic/BasicListUI.java | 5 +- src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java | 16 +- src/share/classes/javax/swing/plaf/basic/BasicTableUI.java | 10 +- src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java | 3 +- src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java | 7 +- src/share/classes/javax/swing/plaf/synth/ImagePainter.java | 5 +- src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java | 3 +- src/share/classes/javax/swing/text/DefaultFormatter.java | 4 +- src/share/classes/javax/swing/text/JTextComponent.java | 6 +- src/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java | 19 +- src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java | 2 +- src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java | 2 +- src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheTransform.java | 12 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java | 18 + src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java | 2 - src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java | 9 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMManifest.java | 21 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java | 36 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java | 33 + src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java | 9 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java | 9 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java | 35 + src/share/classes/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java | 42 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMUtils.java | 4 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLObject.java | 10 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java | 9 +- src/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java | 13 + src/share/classes/sun/applet/AppletPanel.java | 70 +- src/share/classes/sun/applet/AppletSecurity.java | 4 +- src/share/classes/sun/applet/AppletViewerPanel.java | 18 +- src/share/classes/sun/audio/AudioData.java | 4 +- src/share/classes/sun/audio/AudioDataStream.java | 10 +- src/share/classes/sun/audio/AudioDevice.java | 16 +- src/share/classes/sun/audio/AudioPlayer.java | 15 +- src/share/classes/sun/audio/AudioStream.java | 14 +- src/share/classes/sun/audio/AudioStreamSequence.java | 7 +- src/share/classes/sun/audio/AudioTranslatorStream.java | 9 +- src/share/classes/sun/audio/ContinuousAudioDataStream.java | 7 +- src/share/classes/sun/audio/InvalidAudioFormatException.java | 8 +- src/share/classes/sun/awt/AWTAccessor.java | 457 ++- src/share/classes/sun/awt/AppContext.java | 191 +- src/share/classes/sun/awt/EmbeddedFrame.java | 75 +- src/share/classes/sun/awt/IconInfo.java | 237 + src/share/classes/sun/awt/SunToolkit.java | 249 +- src/share/classes/sun/awt/TextureSizeConstraining.java | 45 + src/share/classes/sun/awt/TimedWindowEvent.java | 51 + src/share/classes/sun/awt/datatransfer/TransferableProxy.java | 20 +- src/share/classes/sun/awt/image/ByteBandedRaster.java | 73 +- src/share/classes/sun/awt/image/ByteComponentRaster.java | 91 +- src/share/classes/sun/awt/image/ByteInterleavedRaster.java | 29 +- src/share/classes/sun/awt/image/BytePackedRaster.java | 27 +- src/share/classes/sun/awt/image/ImageRepresentation.java | 19 +- src/share/classes/sun/awt/image/IntegerComponentRaster.java | 82 +- src/share/classes/sun/awt/image/IntegerInterleavedRaster.java | 27 +- src/share/classes/sun/awt/image/JPEGImageDecoder.java | 2 +- src/share/classes/sun/awt/image/ShortBandedRaster.java | 66 +- src/share/classes/sun/awt/image/ShortComponentRaster.java | 90 +- src/share/classes/sun/awt/image/ShortInterleavedRaster.java | 29 +- src/share/classes/sun/awt/resources/security-icon-bw16.png | Bin src/share/classes/sun/awt/resources/security-icon-bw24.png | Bin src/share/classes/sun/awt/resources/security-icon-bw32.png | Bin src/share/classes/sun/awt/resources/security-icon-bw48.png | Bin src/share/classes/sun/awt/resources/security-icon-interim16.png | Bin src/share/classes/sun/awt/resources/security-icon-interim24.png | Bin src/share/classes/sun/awt/resources/security-icon-interim32.png | Bin src/share/classes/sun/awt/resources/security-icon-interim48.png | Bin src/share/classes/sun/awt/resources/security-icon-yellow16.png | Bin src/share/classes/sun/awt/resources/security-icon-yellow24.png | Bin src/share/classes/sun/awt/resources/security-icon-yellow32.png | Bin src/share/classes/sun/awt/resources/security-icon-yellow48.png | Bin src/share/classes/sun/beans/editors/BooleanEditor.java | 50 +- src/share/classes/sun/beans/editors/ByteEditor.java | 22 +- src/share/classes/sun/beans/editors/ColorEditor.java | 192 +- src/share/classes/sun/beans/editors/DoubleEditor.java | 15 +- src/share/classes/sun/beans/editors/EnumEditor.java | 120 +- src/share/classes/sun/beans/editors/FloatEditor.java | 22 +- src/share/classes/sun/beans/editors/FontEditor.java | 197 +- src/share/classes/sun/beans/editors/IntegerEditor.java | 16 +- src/share/classes/sun/beans/editors/LongEditor.java | 22 +- src/share/classes/sun/beans/editors/NumberEditor.java | 18 +- src/share/classes/sun/beans/editors/ShortEditor.java | 23 +- src/share/classes/sun/beans/editors/StringEditor.java | 52 +- src/share/classes/sun/beans/infos/ComponentBeanInfo.java | 62 - src/share/classes/sun/font/CMap.java | 3 - src/share/classes/sun/font/CreatedFontTracker.java | 119 +- src/share/classes/sun/font/ExtendedTextSourceLabel.java | 54 +- src/share/classes/sun/font/GlyphLayout.java | 21 +- src/share/classes/sun/invoke/anon/AnonymousClassLoader.java | 76 +- src/share/classes/sun/invoke/util/Wrapper.java | 3 + src/share/classes/sun/java2d/cmm/lcms/LCMS.java | 2 +- src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java | 138 +- src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java | 160 +- src/share/classes/sun/java2d/opengl/OGLBlitLoops.java | 54 +- src/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java | 5 +- src/share/classes/sun/launcher/LauncherHelper.java | 88 +- src/share/classes/sun/launcher/resources/launcher.properties | 3 +- src/share/classes/sun/management/LockDataConverter.java | 24 +- src/share/classes/sun/management/ThreadInfoCompositeData.java | 6 +- src/share/classes/sun/misc/JavaAWTAccess.java | 42 + src/share/classes/sun/misc/JavaUtilZipFileAccess.java | 32 + src/share/classes/sun/misc/Service.java | 12 +- src/share/classes/sun/misc/SharedSecrets.java | 34 +- src/share/classes/sun/misc/URLClassPath.java | 21 +- src/share/classes/sun/misc/Unsafe.java | 12 +- src/share/classes/sun/misc/Version.java.template | 58 +- src/share/classes/sun/net/NetworkClient.java | 8 +- src/share/classes/sun/net/ftp/impl/FtpClient.java | 21 +- src/share/classes/sun/net/httpserver/ChunkedInputStream.java | 14 +- src/share/classes/sun/net/httpserver/ServerImpl.java | 11 +- src/share/classes/sun/net/www/MessageHeader.java | 37 + src/share/classes/sun/net/www/http/ChunkedInputStream.java | 9 + src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java | 17 + src/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java | 23 +- src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java | 27 +- src/share/classes/sun/nio/ch/DatagramChannelImpl.java | 47 +- src/share/classes/sun/nio/ch/IOUtil.java | 16 +- src/share/classes/sun/nio/ch/Net.java | 107 +- src/share/classes/sun/nio/ch/ServerSocketAdaptor.java | 3 +- src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java | 40 +- src/share/classes/sun/nio/ch/SocketAdaptor.java | 4 +- src/share/classes/sun/nio/ch/SocketChannelImpl.java | 30 +- src/share/classes/sun/nio/ch/Util.java | 2 +- src/share/classes/sun/reflect/CallerSensitive.java | 41 + src/share/classes/sun/reflect/Reflection.java | 53 +- src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java | 9 +- src/share/classes/sun/reflect/misc/MethodUtil.java | 34 +- src/share/classes/sun/reflect/misc/ReflectUtil.java | 117 +- src/share/classes/sun/rmi/registry/RegistryImpl.java | 17 +- src/share/classes/sun/rmi/server/Activation.java | 16 +- src/share/classes/sun/rmi/server/LoaderHandler.java | 35 +- src/share/classes/sun/rmi/server/MarshalInputStream.java | 14 +- src/share/classes/sun/rmi/server/UnicastServerRef.java | 2 +- src/share/classes/sun/rmi/transport/proxy/CGIHandler.java | 19 +- src/share/classes/sun/rmi/transport/proxy/HttpInputStream.java | 15 +- src/share/classes/sun/rmi/transport/proxy/WrappedSocket.java | 11 +- src/share/classes/sun/security/krb5/Config.java | 19 +- src/share/classes/sun/security/pkcs11/P11Digest.java | 185 +- src/share/classes/sun/security/pkcs11/P11KeyAgreement.java | 13 +- src/share/classes/sun/security/pkcs11/P11Signature.java | 7 +- src/share/classes/sun/security/pkcs11/P11Util.java | 16 +- src/share/classes/sun/security/pkcs11/wrapper/PKCS11.java | 377 +- src/share/classes/sun/security/provider/SecureRandom.java | 37 +- src/share/classes/sun/security/provider/certpath/CertPathHelper.java | 2 +- src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java | 14 +- src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java | 40 +- src/share/classes/sun/security/provider/certpath/OCSP.java | 46 +- src/share/classes/sun/security/provider/certpath/OCSPChecker.java | 23 +- src/share/classes/sun/security/provider/certpath/OCSPResponse.java | 72 +- src/share/classes/sun/security/provider/certpath/URICertStore.java | 31 +- src/share/classes/sun/security/ssl/CipherBox.java | 202 +- src/share/classes/sun/security/ssl/CipherSuite.java | 23 +- src/share/classes/sun/security/ssl/ClientHandshaker.java | 13 +- src/share/classes/sun/security/ssl/DHClientKeyExchange.java | 19 +- src/share/classes/sun/security/ssl/DHCrypt.java | 87 +- src/share/classes/sun/security/ssl/EngineInputRecord.java | 220 +- src/share/classes/sun/security/ssl/EngineOutputRecord.java | 4 +- src/share/classes/sun/security/ssl/HandshakeInStream.java | 13 +- src/share/classes/sun/security/ssl/HandshakeMessage.java | 16 +- src/share/classes/sun/security/ssl/Handshaker.java | 4 +- src/share/classes/sun/security/ssl/InputRecord.java | 178 +- src/share/classes/sun/security/ssl/MAC.java | 46 +- src/share/classes/sun/security/ssl/OutputRecord.java | 4 +- src/share/classes/sun/security/ssl/RSAClientKeyExchange.java | 56 +- src/share/classes/sun/security/ssl/SSLEngineImpl.java | 37 +- src/share/classes/sun/security/ssl/SSLSocketImpl.java | 22 +- src/share/classes/sun/security/ssl/ServerHandshaker.java | 18 +- src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java | 4 +- src/share/classes/sun/security/timestamp/TimestampToken.java | 6 +- src/share/classes/sun/security/util/DerIndefLenConverter.java | 4 + src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java | 2 +- src/share/classes/sun/security/util/KeyLength.java | 91 - src/share/classes/sun/security/util/KeyUtil.java | 223 + src/share/classes/sun/security/util/ObjectIdentifier.java | 2 +- src/share/classes/sun/security/util/SignatureFileVerifier.java | 29 +- src/share/classes/sun/security/util/UntrustedCertificates.java | 155 +- src/share/classes/sun/swing/DefaultLookup.java | 3 +- src/share/classes/sun/swing/SwingUtilities2.java | 17 +- src/share/classes/sun/tools/jar/Main.java | 2 +- src/share/classes/sun/tools/jconsole/ProxyClient.java | 15 +- src/share/classes/sun/tools/jconsole/VMPanel.java | 11 +- src/share/classes/sun/tools/jconsole/resources/JConsoleResources.java | 5 + src/share/classes/sun/tools/native2ascii/Main.java | 9 +- src/share/classes/sun/tracing/ProviderSkeleton.java | 31 +- src/share/classes/sun/tracing/dtrace/DTraceProvider.java | 15 +- src/share/classes/sun/util/calendar/ZoneInfoFile.java | 41 +- src/share/classes/sun/util/resources/TimeZoneNames.java | 37 +- src/share/classes/sun/util/resources/TimeZoneNames_de.java | 37 +- src/share/classes/sun/util/resources/TimeZoneNames_es.java | 37 +- src/share/classes/sun/util/resources/TimeZoneNames_fr.java | 127 +- src/share/classes/sun/util/resources/TimeZoneNames_it.java | 37 +- src/share/classes/sun/util/resources/TimeZoneNames_ja.java | 37 +- src/share/classes/sun/util/resources/TimeZoneNames_ko.java | 37 +- src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java | 41 +- src/share/classes/sun/util/resources/TimeZoneNames_sv.java | 37 +- src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java | 37 +- src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java | 39 +- src/share/demo/jvmti/gctest/sample.makefile.txt | 6 +- src/share/demo/jvmti/heapTracker/sample.makefile.txt | 19 +- src/share/demo/jvmti/heapViewer/sample.makefile.txt | 5 +- src/share/demo/jvmti/hprof/sample.makefile.txt | 6 +- src/share/demo/jvmti/minst/sample.makefile.txt | 19 +- src/share/demo/jvmti/mtrace/sample.makefile.txt | 20 +- src/share/demo/jvmti/versionCheck/sample.makefile.txt | 6 +- src/share/demo/jvmti/waiters/sample.makefile.txt | 8 +- src/share/lib/security/java.security | 68 +- src/share/lib/security/java.security-macosx | 56 +- src/share/lib/security/java.security-solaris | 54 +- src/share/lib/security/java.security-windows | 56 +- src/share/lib/security/sunpkcs11-solaris.cfg | 14 +- src/share/native/com/sun/java/util/jar/pack/bands.cpp | 4 + src/share/native/com/sun/java/util/jar/pack/bands.h | 4 +- src/share/native/com/sun/java/util/jar/pack/defines.h | 14 +- src/share/native/com/sun/java/util/jar/pack/jni.cpp | 53 +- src/share/native/com/sun/java/util/jar/pack/unpack.cpp | 34 +- src/share/native/com/sun/media/sound/SoundDefs.h | 8 + src/share/native/common/sizecalc.h | 118 + src/share/native/java/lang/ClassLoader.c | 17 - src/share/native/java/lang/SecurityManager.c | 1 - src/share/native/java/net/InetAddress.c | 23 +- src/share/native/java/net/net_util.c | 70 +- src/share/native/java/net/net_util.h | 12 +- src/share/native/java/util/zip/Adler32.c | 2 +- src/share/native/java/util/zip/CRC32.c | 2 +- src/share/native/java/util/zip/Deflater.c | 48 +- src/share/native/java/util/zip/Inflater.c | 8 +- src/share/native/java/util/zip/ZipFile.c | 8 + src/share/native/java/util/zip/zip_util.c | 10 +- src/share/native/java/util/zip/zip_util.h | 1 + src/share/native/sun/awt/image/awt_ImageRep.c | 175 +- src/share/native/sun/awt/image/awt_parseImage.c | 278 +- src/share/native/sun/awt/image/awt_parseImage.h | 1 + src/share/native/sun/awt/image/jpeg/README | 385 -- src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 47 +- src/share/native/sun/awt/image/jpeg/jcapimin.c | 284 - src/share/native/sun/awt/image/jpeg/jcapistd.c | 165 - src/share/native/sun/awt/image/jpeg/jccoefct.c | 453 -- src/share/native/sun/awt/image/jpeg/jccolor.c | 462 -- src/share/native/sun/awt/image/jpeg/jcdctmgr.c | 391 -- src/share/native/sun/awt/image/jpeg/jchuff.c | 913 ----- src/share/native/sun/awt/image/jpeg/jchuff.h | 51 - src/share/native/sun/awt/image/jpeg/jcinit.c | 76 - src/share/native/sun/awt/image/jpeg/jcmainct.c | 297 - src/share/native/sun/awt/image/jpeg/jcmarker.c | 682 --- src/share/native/sun/awt/image/jpeg/jcmaster.c | 594 --- src/share/native/sun/awt/image/jpeg/jcomapi.c | 110 - src/share/native/sun/awt/image/jpeg/jconfig.h | 43 - src/share/native/sun/awt/image/jpeg/jcparam.c | 614 --- src/share/native/sun/awt/image/jpeg/jcphuff.c | 837 ---- src/share/native/sun/awt/image/jpeg/jcprepct.c | 358 -- src/share/native/sun/awt/image/jpeg/jcsample.c | 523 --- src/share/native/sun/awt/image/jpeg/jctrans.c | 392 -- src/share/native/sun/awt/image/jpeg/jdapimin.c | 399 -- src/share/native/sun/awt/image/jpeg/jdapistd.c | 279 - src/share/native/sun/awt/image/jpeg/jdcoefct.c | 740 ---- src/share/native/sun/awt/image/jpeg/jdcolor.c | 398 -- src/share/native/sun/awt/image/jpeg/jdct.h | 180 - src/share/native/sun/awt/image/jpeg/jddctmgr.c | 273 - src/share/native/sun/awt/image/jpeg/jdhuff.c | 655 --- src/share/native/sun/awt/image/jpeg/jdhuff.h | 205 - src/share/native/sun/awt/image/jpeg/jdinput.c | 385 -- src/share/native/sun/awt/image/jpeg/jdmainct.c | 516 -- src/share/native/sun/awt/image/jpeg/jdmarker.c | 1384 -------- src/share/native/sun/awt/image/jpeg/jdmaster.c | 561 --- src/share/native/sun/awt/image/jpeg/jdmerge.c | 404 -- src/share/native/sun/awt/image/jpeg/jdphuff.c | 672 --- src/share/native/sun/awt/image/jpeg/jdpostct.c | 294 - src/share/native/sun/awt/image/jpeg/jdsample.c | 482 -- src/share/native/sun/awt/image/jpeg/jdtrans.c | 147 - src/share/native/sun/awt/image/jpeg/jerror.c | 272 - src/share/native/sun/awt/image/jpeg/jerror.h | 295 - src/share/native/sun/awt/image/jpeg/jfdctflt.c | 172 - src/share/native/sun/awt/image/jpeg/jfdctfst.c | 228 - src/share/native/sun/awt/image/jpeg/jfdctint.c | 287 - src/share/native/sun/awt/image/jpeg/jidctflt.c | 246 - src/share/native/sun/awt/image/jpeg/jidctfst.c | 372 -- src/share/native/sun/awt/image/jpeg/jidctint.c | 393 -- src/share/native/sun/awt/image/jpeg/jidctred.c | 402 -- src/share/native/sun/awt/image/jpeg/jinclude.h | 95 - src/share/native/sun/awt/image/jpeg/jmemmgr.c | 1124 ------ src/share/native/sun/awt/image/jpeg/jmemnobs.c | 113 - src/share/native/sun/awt/image/jpeg/jmemsys.h | 202 - src/share/native/sun/awt/image/jpeg/jmorecfg.h | 378 -- src/share/native/sun/awt/image/jpeg/jpeg-6b/README | 385 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jcapimin.c | 284 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcapistd.c | 165 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jccoefct.c | 453 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jccolor.c | 462 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jcdctmgr.c | 391 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jchuff.c | 913 +++++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jchuff.h | 51 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcinit.c | 76 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcmainct.c | 297 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcmarker.c | 682 +++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jcmaster.c | 594 +++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jcomapi.c | 110 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jconfig.h | 43 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcparam.c | 614 +++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jcphuff.c | 837 ++++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jcprepct.c | 358 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jcsample.c | 523 +++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jctrans.c | 392 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdapimin.c | 399 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdapistd.c | 279 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdcoefct.c | 740 ++++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdcolor.c | 398 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdct.h | 180 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jddctmgr.c | 273 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdhuff.c | 655 +++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdhuff.h | 205 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdinput.c | 385 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmainct.c | 516 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmarker.c | 1384 ++++++++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmaster.c | 561 +++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmerge.c | 404 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdphuff.c | 672 +++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdpostct.c | 294 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdsample.c | 482 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdtrans.c | 147 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jerror.c | 272 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jerror.h | 295 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jfdctflt.c | 172 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jfdctfst.c | 228 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jfdctint.c | 287 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctflt.c | 246 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctfst.c | 372 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctint.c | 393 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctred.c | 402 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jinclude.h | 95 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemmgr.c | 1124 ++++++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemnobs.c | 113 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemsys.h | 202 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jmorecfg.h | 378 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jpegint.h | 396 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jpeglib.h | 1100 ++++++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jquant1.c | 860 ++++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jquant2.c | 1314 +++++++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jutils.c | 183 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jversion.h | 18 + src/share/native/sun/awt/image/jpeg/jpegdecoder.c | 2 +- src/share/native/sun/awt/image/jpeg/jpegint.h | 396 -- src/share/native/sun/awt/image/jpeg/jpeglib.h | 1100 ------ src/share/native/sun/awt/image/jpeg/jquant1.c | 860 ---- src/share/native/sun/awt/image/jpeg/jquant2.c | 1314 ------- src/share/native/sun/awt/image/jpeg/jutils.c | 183 - src/share/native/sun/awt/image/jpeg/jversion.h | 18 - src/share/native/sun/awt/medialib/awt_ImagingLib.c | 519 +- src/share/native/sun/awt/medialib/mlib_ImageCreate.c | 62 +- src/share/native/sun/awt/medialib/safe_alloc.h | 1 - src/share/native/sun/awt/medialib/safe_math.h | 35 + src/share/native/sun/awt/splashscreen/java_awt_SplashScreen.c | 3 +- src/share/native/sun/awt/splashscreen/splashscreen_gif.c | 19 +- src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c | 11 +- src/share/native/sun/awt/splashscreen/splashscreen_png.c | 2 +- src/share/native/sun/font/FontInstanceAdapter.cpp | 47 +- src/share/native/sun/font/FontInstanceAdapter.h | 1 + src/share/native/sun/font/fontscalerdefs.h | 21 +- src/share/native/sun/font/freetypeScaler.c | 13 +- src/share/native/sun/font/layout/AlternateSubstSubtables.cpp | 11 +- src/share/native/sun/font/layout/AlternateSubstSubtables.h | 6 +- src/share/native/sun/font/layout/ArabicLayoutEngine.cpp | 36 +- src/share/native/sun/font/layout/ArabicLayoutEngine.h | 2 +- src/share/native/sun/font/layout/ArabicShaping.cpp | 14 +- src/share/native/sun/font/layout/ArabicShaping.h | 2 + src/share/native/sun/font/layout/AttachmentPosnSubtables.h | 6 +- src/share/native/sun/font/layout/CanonData.cpp | 5 + src/share/native/sun/font/layout/CanonShaping.cpp | 10 +- src/share/native/sun/font/layout/CanonShaping.h | 2 + src/share/native/sun/font/layout/ClassDefinitionTables.cpp | 104 +- src/share/native/sun/font/layout/ClassDefinitionTables.h | 27 +- src/share/native/sun/font/layout/ContextualGlyphInsertion.h | 15 +- src/share/native/sun/font/layout/ContextualGlyphInsertionProc2.cpp | 139 + src/share/native/sun/font/layout/ContextualGlyphInsertionProc2.h | 106 + src/share/native/sun/font/layout/ContextualGlyphSubstProc.cpp | 48 +- src/share/native/sun/font/layout/ContextualGlyphSubstProc.h | 8 +- src/share/native/sun/font/layout/ContextualGlyphSubstProc2.cpp | 170 + src/share/native/sun/font/layout/ContextualGlyphSubstProc2.h | 92 + src/share/native/sun/font/layout/ContextualGlyphSubstitution.h | 13 +- src/share/native/sun/font/layout/ContextualSubstSubtables.cpp | 20 +- src/share/native/sun/font/layout/ContextualSubstSubtables.h | 22 + src/share/native/sun/font/layout/CoverageTables.h | 3 + src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp | 8 +- src/share/native/sun/font/layout/CursiveAttachmentSubtables.h | 3 +- src/share/native/sun/font/layout/DeviceTables.h | 1 + src/share/native/sun/font/layout/ExtensionSubtables.cpp | 10 +- src/share/native/sun/font/layout/ExtensionSubtables.h | 3 +- src/share/native/sun/font/layout/Features.cpp | 12 +- src/share/native/sun/font/layout/GDEFMarkFilter.cpp | 7 +- src/share/native/sun/font/layout/GDEFMarkFilter.h | 4 +- src/share/native/sun/font/layout/GXLayoutEngine.cpp | 5 +- src/share/native/sun/font/layout/GXLayoutEngine.h | 4 +- src/share/native/sun/font/layout/GXLayoutEngine2.cpp | 91 + src/share/native/sun/font/layout/GXLayoutEngine2.h | 149 + src/share/native/sun/font/layout/GlyphDefinitionTables.cpp | 28 +- src/share/native/sun/font/layout/GlyphDefinitionTables.h | 20 +- src/share/native/sun/font/layout/GlyphIterator.cpp | 27 +- src/share/native/sun/font/layout/GlyphIterator.h | 6 +- src/share/native/sun/font/layout/GlyphLookupTables.cpp | 15 +- src/share/native/sun/font/layout/GlyphLookupTables.h | 4 +- src/share/native/sun/font/layout/GlyphPositioningTables.cpp | 6 +- src/share/native/sun/font/layout/GlyphPositioningTables.h | 5 +- src/share/native/sun/font/layout/GlyphPosnLookupProc.cpp | 38 +- src/share/native/sun/font/layout/GlyphPosnLookupProc.h | 4 +- src/share/native/sun/font/layout/GlyphSubstLookupProc.cpp | 30 +- src/share/native/sun/font/layout/GlyphSubstLookupProc.h | 4 +- src/share/native/sun/font/layout/GlyphSubstitutionTables.cpp | 7 +- src/share/native/sun/font/layout/GlyphSubstitutionTables.h | 5 +- src/share/native/sun/font/layout/HanLayoutEngine.cpp | 2 +- src/share/native/sun/font/layout/HanLayoutEngine.h | 2 +- src/share/native/sun/font/layout/HangulLayoutEngine.cpp | 2 +- src/share/native/sun/font/layout/HangulLayoutEngine.h | 2 +- src/share/native/sun/font/layout/ICUFeatures.h | 9 +- src/share/native/sun/font/layout/IndicClassTables.cpp | 6 +- src/share/native/sun/font/layout/IndicLayoutEngine.cpp | 2 +- src/share/native/sun/font/layout/IndicLayoutEngine.h | 2 +- src/share/native/sun/font/layout/IndicRearrangement.h | 10 +- src/share/native/sun/font/layout/IndicRearrangementProcessor.cpp | 14 +- src/share/native/sun/font/layout/IndicRearrangementProcessor.h | 7 +- src/share/native/sun/font/layout/IndicRearrangementProcessor2.cpp | 425 ++ src/share/native/sun/font/layout/IndicRearrangementProcessor2.h | 88 + src/share/native/sun/font/layout/IndicReordering.cpp | 15 +- src/share/native/sun/font/layout/IndicReordering.h | 6 +- src/share/native/sun/font/layout/KernTable.cpp | 77 +- src/share/native/sun/font/layout/KernTable.h | 12 +- src/share/native/sun/font/layout/KhmerLayoutEngine.cpp | 2 +- src/share/native/sun/font/layout/KhmerLayoutEngine.h | 2 +- src/share/native/sun/font/layout/LEFontInstance.h | 19 + src/share/native/sun/font/layout/LEGlyphFilter.h | 4 +- src/share/native/sun/font/layout/LEGlyphStorage.cpp | 16 +- src/share/native/sun/font/layout/LEInsertionList.h | 4 +- src/share/native/sun/font/layout/LEScripts.h | 24 +- src/share/native/sun/font/layout/LETableReference.h | 443 ++ src/share/native/sun/font/layout/LETypes.h | 199 +- src/share/native/sun/font/layout/LayoutEngine.cpp | 159 +- src/share/native/sun/font/layout/LayoutEngine.h | 25 +- src/share/native/sun/font/layout/LigatureSubstProc.cpp | 68 +- src/share/native/sun/font/layout/LigatureSubstProc.h | 6 +- src/share/native/sun/font/layout/LigatureSubstProc2.cpp | 170 + src/share/native/sun/font/layout/LigatureSubstProc2.h | 97 + src/share/native/sun/font/layout/LigatureSubstSubtables.cpp | 8 +- src/share/native/sun/font/layout/LigatureSubstSubtables.h | 5 +- src/share/native/sun/font/layout/LigatureSubstitution.h | 19 +- src/share/native/sun/font/layout/LookupProcessor.cpp | 127 +- src/share/native/sun/font/layout/LookupProcessor.h | 19 +- src/share/native/sun/font/layout/LookupTables.cpp | 29 +- src/share/native/sun/font/layout/LookupTables.h | 10 +- src/share/native/sun/font/layout/Lookups.cpp | 36 +- src/share/native/sun/font/layout/Lookups.h | 29 +- src/share/native/sun/font/layout/MPreFixups.cpp | 6 +- src/share/native/sun/font/layout/MarkArrays.h | 1 + src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp | 10 +- src/share/native/sun/font/layout/MarkToBasePosnSubtables.h | 4 +- src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp | 10 +- src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.h | 5 +- src/share/native/sun/font/layout/MarkToMarkPosnSubtables.cpp | 10 +- src/share/native/sun/font/layout/MarkToMarkPosnSubtables.h | 4 +- src/share/native/sun/font/layout/MorphStateTables.h | 7 +- src/share/native/sun/font/layout/MorphTables.cpp | 40 +- src/share/native/sun/font/layout/MorphTables.h | 306 +- src/share/native/sun/font/layout/MorphTables2.cpp | 248 + src/share/native/sun/font/layout/MultipleSubstSubtables.cpp | 8 +- src/share/native/sun/font/layout/MultipleSubstSubtables.h | 4 +- src/share/native/sun/font/layout/NonContextualGlyphSubst.h | 7 +- src/share/native/sun/font/layout/NonContextualGlyphSubstProc.cpp | 23 +- src/share/native/sun/font/layout/NonContextualGlyphSubstProc.h | 6 +- src/share/native/sun/font/layout/NonContextualGlyphSubstProc2.cpp | 88 + src/share/native/sun/font/layout/NonContextualGlyphSubstProc2.h | 68 + src/share/native/sun/font/layout/OpenTypeLayoutEngine.cpp | 222 +- src/share/native/sun/font/layout/OpenTypeLayoutEngine.h | 16 +- src/share/native/sun/font/layout/OpenTypeTables.h | 3 +- src/share/native/sun/font/layout/OpenTypeUtilities.cpp | 98 +- src/share/native/sun/font/layout/OpenTypeUtilities.h | 13 +- src/share/native/sun/font/layout/PairPositioningSubtables.cpp | 59 +- src/share/native/sun/font/layout/PairPositioningSubtables.h | 15 +- src/share/native/sun/font/layout/ScriptAndLanguage.cpp | 65 +- src/share/native/sun/font/layout/ScriptAndLanguage.h | 9 +- src/share/native/sun/font/layout/ScriptAndLanguageTags.cpp | 15 +- src/share/native/sun/font/layout/ScriptAndLanguageTags.h | 13 +- src/share/native/sun/font/layout/SegmentArrayProcessor.cpp | 20 +- src/share/native/sun/font/layout/SegmentArrayProcessor.h | 6 +- src/share/native/sun/font/layout/SegmentArrayProcessor2.cpp | 84 + src/share/native/sun/font/layout/SegmentArrayProcessor2.h | 82 + src/share/native/sun/font/layout/SegmentSingleProcessor.cpp | 17 +- src/share/native/sun/font/layout/SegmentSingleProcessor.h | 6 +- src/share/native/sun/font/layout/SegmentSingleProcessor2.cpp | 79 + src/share/native/sun/font/layout/SegmentSingleProcessor2.h | 82 + src/share/native/sun/font/layout/ShapingTypeData.cpp | 2 + src/share/native/sun/font/layout/SimpleArrayProcessor.cpp | 20 +- src/share/native/sun/font/layout/SimpleArrayProcessor.h | 6 +- src/share/native/sun/font/layout/SimpleArrayProcessor2.cpp | 78 + src/share/native/sun/font/layout/SimpleArrayProcessor2.h | 83 + src/share/native/sun/font/layout/SinglePositioningSubtables.cpp | 24 +- src/share/native/sun/font/layout/SinglePositioningSubtables.h | 7 +- src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp | 24 +- src/share/native/sun/font/layout/SingleSubstitutionSubtables.h | 7 +- src/share/native/sun/font/layout/SingleTableProcessor.cpp | 13 +- src/share/native/sun/font/layout/SingleTableProcessor.h | 6 +- src/share/native/sun/font/layout/SingleTableProcessor2.cpp | 77 + src/share/native/sun/font/layout/SingleTableProcessor2.h | 82 + src/share/native/sun/font/layout/StateTableProcessor.cpp | 24 +- src/share/native/sun/font/layout/StateTableProcessor.h | 9 +- src/share/native/sun/font/layout/StateTableProcessor2.cpp | 236 + src/share/native/sun/font/layout/StateTableProcessor2.h | 85 + src/share/native/sun/font/layout/StateTables.h | 54 +- src/share/native/sun/font/layout/SubtableProcessor.cpp | 6 +- src/share/native/sun/font/layout/SubtableProcessor.h | 6 +- src/share/native/sun/font/layout/SubtableProcessor2.cpp | 57 + src/share/native/sun/font/layout/SubtableProcessor2.h | 70 + src/share/native/sun/font/layout/SunLayoutEngine.cpp | 17 +- src/share/native/sun/font/layout/ThaiLayoutEngine.cpp | 9 +- src/share/native/sun/font/layout/TibetanLayoutEngine.cpp | 2 +- src/share/native/sun/font/layout/TibetanLayoutEngine.h | 2 +- src/share/native/sun/font/layout/TrimmedArrayProcessor.cpp | 20 +- src/share/native/sun/font/layout/TrimmedArrayProcessor.h | 6 +- src/share/native/sun/font/layout/TrimmedArrayProcessor2.cpp | 82 + src/share/native/sun/font/layout/TrimmedArrayProcessor2.h | 84 + src/share/native/sun/font/layout/ValueRecords.h | 1 + src/share/native/sun/font/sunFont.c | 18 +- src/share/native/sun/java2d/cmm/lcms/cmscam02.c | 42 +- src/share/native/sun/java2d/cmm/lcms/cmscgats.c | 213 +- src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c | 70 +- src/share/native/sun/java2d/cmm/lcms/cmserr.c | 28 +- src/share/native/sun/java2d/cmm/lcms/cmsgamma.c | 78 +- src/share/native/sun/java2d/cmm/lcms/cmsgmt.c | 15 +- src/share/native/sun/java2d/cmm/lcms/cmshalf.c | 564 +++ src/share/native/sun/java2d/cmm/lcms/cmsintrp.c | 347 +- src/share/native/sun/java2d/cmm/lcms/cmsio0.c | 112 +- src/share/native/sun/java2d/cmm/lcms/cmsio1.c | 287 +- src/share/native/sun/java2d/cmm/lcms/cmslut.c | 225 +- src/share/native/sun/java2d/cmm/lcms/cmsmd5.c | 2 +- src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c | 3 +- src/share/native/sun/java2d/cmm/lcms/cmsnamed.c | 201 +- src/share/native/sun/java2d/cmm/lcms/cmsopt.c | 121 +- src/share/native/sun/java2d/cmm/lcms/cmspack.c | 1392 +++++-- src/share/native/sun/java2d/cmm/lcms/cmspcs.c | 1 + src/share/native/sun/java2d/cmm/lcms/cmsplugin.c | 17 +- src/share/native/sun/java2d/cmm/lcms/cmsps2.c | 88 +- src/share/native/sun/java2d/cmm/lcms/cmssamp.c | 305 +- src/share/native/sun/java2d/cmm/lcms/cmssm.c | 14 +- src/share/native/sun/java2d/cmm/lcms/cmstypes.c | 820 ++++- src/share/native/sun/java2d/cmm/lcms/cmsvirt.c | 92 +- src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c | 12 +- src/share/native/sun/java2d/cmm/lcms/cmsxform.c | 371 +- src/share/native/sun/java2d/cmm/lcms/lcms2.h | 153 +- src/share/native/sun/java2d/cmm/lcms/lcms2_internal.h | 130 +- src/share/native/sun/java2d/cmm/lcms/lcms2_plugin.h | 91 +- src/share/native/sun/java2d/loops/TransformHelper.c | 11 +- src/share/native/sun/java2d/pipe/Region.c | 5 +- src/share/native/sun/reflect/Reflection.c | 12 +- src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h | 6 +- src/solaris/bin/java_md_common.c | 16 + src/solaris/classes/sun/awt/X11/GtkFileDialogPeer.java | 9 +- src/solaris/classes/sun/awt/X11/XCheckboxMenuItemPeer.java | 29 +- src/solaris/classes/sun/awt/X11/XDecoratedPeer.java | 5 +- src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java | 18 +- src/solaris/classes/sun/awt/X11/XEmbeddingContainer.java | 16 +- src/solaris/classes/sun/awt/X11/XGlobalCursorManager.java | 26 +- src/solaris/classes/sun/awt/X11/XIconInfo.java | 237 - src/solaris/classes/sun/awt/X11/XIconWindow.java | 9 +- src/solaris/classes/sun/awt/X11/XMenuBarPeer.java | 28 +- src/solaris/classes/sun/awt/X11/XMenuItemPeer.java | 73 +- src/solaris/classes/sun/awt/X11/XMenuPeer.java | 20 +- src/solaris/classes/sun/awt/X11/XNETProtocol.java | 12 +- src/solaris/classes/sun/awt/X11/XPopupMenuPeer.java | 59 +- src/solaris/classes/sun/awt/X11/XScrollPanePeer.java | 16 +- src/solaris/classes/sun/awt/X11/XSystemTrayPeer.java | 49 +- src/solaris/classes/sun/awt/X11/XTextAreaPeer.java | 6 +- src/solaris/classes/sun/awt/X11/XTextFieldPeer.java | 6 +- src/solaris/classes/sun/awt/X11/XTextTransferHelper.java | 47 - src/solaris/classes/sun/awt/X11/XToolkit.java | 30 +- src/solaris/classes/sun/awt/X11/XWM.java | 15 +- src/solaris/classes/sun/awt/X11/XWarningWindow.java | 65 +- src/solaris/classes/sun/awt/X11/XWindow.java | 48 +- src/solaris/classes/sun/awt/X11/XWindowAttributesData.java | 7 +- src/solaris/classes/sun/awt/X11/XWindowPeer.java | 55 +- src/solaris/classes/sun/awt/X11/XlibWrapper.java | 12 +- src/solaris/classes/sun/awt/X11/security-icon-bw16.png | Bin src/solaris/classes/sun/awt/X11/security-icon-bw24.png | Bin src/solaris/classes/sun/awt/X11/security-icon-bw32.png | Bin src/solaris/classes/sun/awt/X11/security-icon-bw48.png | Bin src/solaris/classes/sun/awt/X11/security-icon-interim16.png | Bin src/solaris/classes/sun/awt/X11/security-icon-interim24.png | Bin src/solaris/classes/sun/awt/X11/security-icon-interim32.png | Bin src/solaris/classes/sun/awt/X11/security-icon-interim48.png | Bin src/solaris/classes/sun/awt/X11/security-icon-yellow16.png | Bin src/solaris/classes/sun/awt/X11/security-icon-yellow24.png | Bin src/solaris/classes/sun/awt/X11/security-icon-yellow32.png | Bin src/solaris/classes/sun/awt/X11/security-icon-yellow48.png | Bin src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java | 32 +- src/solaris/classes/sun/nio/ch/SctpChannelImpl.java | 14 +- src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java | 16 +- src/solaris/classes/sun/nio/ch/SctpNet.java | 62 +- src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java | 2 +- src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java | 3 +- src/solaris/native/common/deps/cups_fp.c | 104 + src/solaris/native/common/deps/cups_fp.h | 61 + src/solaris/native/common/deps/fontconfig2/fontconfig/fontconfig.h | 302 + src/solaris/native/common/deps/fontconfig2/fontconfig_fp.c | 188 + src/solaris/native/common/deps/fontconfig2/fontconfig_fp.h | 164 + src/solaris/native/common/deps/gconf2/gconf/gconf-client.h | 41 + src/solaris/native/common/deps/gconf2/gconf_fp.c | 76 + src/solaris/native/common/deps/gconf2/gconf_fp.h | 48 + src/solaris/native/common/deps/glib2/gio/gio_typedefs.h | 65 + src/solaris/native/common/deps/glib2/gio_fp.c | 109 + src/solaris/native/common/deps/glib2/gio_fp.h | 61 + src/solaris/native/common/deps/glib2/glib_fp.h | 41 + src/solaris/native/common/deps/gtk2/gtk/gtk.h | 567 +++ src/solaris/native/common/deps/gtk2/gtk_fp.c | 398 ++ src/solaris/native/common/deps/gtk2/gtk_fp.h | 469 ++ src/solaris/native/common/deps/syscalls_fp.c | 138 + src/solaris/native/common/deps/syscalls_fp.h | 124 + src/solaris/native/java/lang/java_props_md.c | 7 +- src/solaris/native/java/net/Inet4AddressImpl.c | 22 +- src/solaris/native/java/net/Inet6AddressImpl.c | 13 +- src/solaris/native/java/net/NetworkInterface.c | 13 +- src/solaris/native/java/net/PlainDatagramSocketImpl.c | 55 +- src/solaris/native/java/net/net_util_md.c | 6 +- src/solaris/native/sun/awt/CUPSfuncs.c | 137 +- src/solaris/native/sun/awt/awt_GraphicsEnv.c | 7 +- src/solaris/native/sun/awt/awt_GraphicsEnv.h | 3 + src/solaris/native/sun/awt/awt_Robot.c | 8 +- src/solaris/native/sun/awt/awt_UNIXToolkit.c | 30 +- src/solaris/native/sun/awt/fontconfig.h | 941 ----- src/solaris/native/sun/awt/fontpath.c | 415 +- src/solaris/native/sun/awt/gtk2_interface.c | 982 +---- src/solaris/native/sun/awt/gtk2_interface.h | 577 +--- src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c | 22 +- src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c | 68 +- src/solaris/native/sun/awt/swing_GTKEngine.c | 76 +- src/solaris/native/sun/awt/swing_GTKStyle.c | 20 +- src/solaris/native/sun/java2d/x11/X11SurfaceData.c | 11 +- src/solaris/native/sun/net/spi/DefaultProxySelector.c | 465 +- src/solaris/native/sun/nio/ch/DatagramChannelImpl.c | 9 +- src/solaris/native/sun/nio/ch/EPollArrayWrapper.c | 62 +- src/solaris/native/sun/nio/ch/FileDispatcherImpl.c | 6 - src/solaris/native/sun/nio/ch/IOUtil.c | 10 + src/solaris/native/sun/nio/ch/Net.c | 9 +- src/solaris/native/sun/nio/ch/SctpChannelImpl.c | 27 +- src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c | 94 +- src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c | 50 +- src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c | 111 +- src/solaris/native/sun/xawt/XlibWrapper.c | 22 +- src/solaris/native/sun/xawt/awt_Desktop.c | 103 +- src/windows/bin/cmdtoargs.c | 609 +++ src/windows/bin/java_md.c | 154 +- src/windows/classes/java/lang/ProcessImpl.java | 241 +- src/windows/classes/java/net/DefaultDatagramSocketImplFactory.java | 51 +- src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java | 32 +- src/windows/classes/java/net/DualStackPlainSocketImpl.java | 39 +- src/windows/classes/java/net/PlainSocketImpl.java | 25 +- src/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java | 47 +- src/windows/classes/java/net/TwoStacksPlainSocketImpl.java | 39 +- src/windows/classes/sun/awt/windows/WCanvasPeer.java | 1 - src/windows/classes/sun/awt/windows/WComponentPeer.java | 9 +- src/windows/classes/sun/awt/windows/WEmbeddedFrame.java | 15 +- src/windows/classes/sun/awt/windows/WFileDialogPeer.java | 4 +- src/windows/classes/sun/awt/windows/WMouseDragGestureRecognizer.java | 2 - src/windows/classes/sun/awt/windows/WPopupMenuPeer.java | 2 - src/windows/classes/sun/awt/windows/WPrintDialogPeer.java | 4 +- src/windows/classes/sun/awt/windows/WWindowPeer.java | 8 +- src/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java | 25 +- src/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java | 7 +- src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java | 4 +- src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c | 5 +- src/windows/native/java/net/DualStackPlainSocketImpl.c | 6 +- src/windows/native/java/net/Inet4AddressImpl.c | 14 +- src/windows/native/java/net/Inet6AddressImpl.c | 13 +- src/windows/native/java/net/NetworkInterface.c | 9 +- src/windows/native/java/net/NetworkInterface.h | 1 - src/windows/native/java/net/NetworkInterface_winXP.c | 6 +- src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c | 63 +- src/windows/native/java/net/TwoStacksPlainSocketImpl.c | 22 +- src/windows/native/java/net/net_util_md.c | 71 +- src/windows/native/java/net/net_util_md.h | 5 +- src/windows/native/sun/awt/splashscreen/splashscreen_sys.c | 31 +- src/windows/native/sun/font/lcdglyph.c | 10 +- src/windows/native/sun/java2d/opengl/WGLSurfaceData.c | 3 +- src/windows/native/sun/java2d/windows/GDIBlitLoops.cpp | 1 + src/windows/native/sun/java2d/windows/GDIRenderer.cpp | 2 +- src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp | 5 +- src/windows/native/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.c | 31 +- src/windows/native/sun/nio/ch/DatagramChannelImpl.c | 10 +- src/windows/native/sun/nio/ch/IOUtil.c | 23 +- src/windows/native/sun/nio/ch/Net.c | 18 +- src/windows/native/sun/nio/ch/SocketDispatcher.c | 8 - src/windows/native/sun/nio/ch/nio_util.h | 1 - src/windows/native/sun/windows/CmdIDList.cpp | 6 +- src/windows/native/sun/windows/Devices.cpp | 7 +- src/windows/native/sun/windows/ShellFolder2.cpp | 6 + src/windows/native/sun/windows/WPrinterJob.cpp | 2 +- src/windows/native/sun/windows/alloc.h | 3 + src/windows/native/sun/windows/awt.h | 6 +- src/windows/native/sun/windows/awt_BitmapUtil.cpp | 14 +- src/windows/native/sun/windows/awt_Component.cpp | 45 +- src/windows/native/sun/windows/awt_Cursor.cpp | 6 +- src/windows/native/sun/windows/awt_DataTransferer.cpp | 12 +- src/windows/native/sun/windows/awt_DesktopProperties.cpp | 6 +- src/windows/native/sun/windows/awt_DnDDT.cpp | 4 +- src/windows/native/sun/windows/awt_InputMethod.cpp | 8 +- src/windows/native/sun/windows/awt_PrintControl.cpp | 4 +- src/windows/native/sun/windows/awt_PrintJob.cpp | 17 +- src/windows/native/sun/windows/awt_Robot.cpp | 5 + src/windows/native/sun/windows/awt_TextComponent.cpp | 22 +- src/windows/native/sun/windows/awt_TextComponent.h | 3 +- src/windows/native/sun/windows/awt_Window.cpp | 23 +- test/Makefile | 21 +- test/ProblemList.txt | 435 +-- test/TEST.ROOT | 12 + test/com/oracle/security/ucrypto/TestAES.java | 118 +- test/com/oracle/security/ucrypto/TestDigest.java | 24 +- test/com/oracle/security/ucrypto/TestRSA.java | 276 +- test/com/oracle/security/ucrypto/UcryptoTest.java | 28 +- test/com/sun/crypto/provider/Cipher/DES/Sealtest.java | 18 +- test/com/sun/crypto/provider/Cipher/RSA/TestOAEP_KAT.java | 110 +- test/com/sun/crypto/provider/Cipher/UTIL/TestUtil.java | 13 +- test/com/sun/jdi/ShellScaffold.sh | 3 +- test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java | 23 +- test/com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java | 46 +- test/com/sun/org/apache/xml/internal/security/TruncateHMAC.java | 1 + test/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java | 9 +- test/com/sun/org/apache/xml/internal/security/transforms/MyTransform.java | 23 +- test/com/sun/security/auth/login/ConfigFile/IllegalURL.java | 5 +- test/demo/jvmti/mtrace/TraceJFrame.java | 29 +- test/java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java | 9 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/AbsoluteComponentCenterCalculator.java | 37 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/DataFlavorSearcher.java | 47 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/InterprocessMessages.java | 28 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html | 27 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java | 205 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MyTransferable.java | 62 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/NextFramePositionCalculator.java | 20 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/SourcePanel.java | 26 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/TargetPanel.java | 83 + test/java/awt/Focus/OverrideRedirectWindowActivationTest/OverrideRedirectWindowActivationTest.java | 157 + test/java/awt/Frame/7024749/bug7024749.java | 4 +- test/java/awt/Frame/HugeFrame/HugeFrame.java | 49 + test/java/awt/Frame/WindowDragTest/WindowDragTest.java | 5 +- test/java/awt/Modal/ModalDialogMultiscreenTest/ModalDialogMultiscreenTest.java | 441 ++ test/java/awt/Modal/WsDisabledStyle/Winkey/Winkey.java | 8 +- test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh | 58 +- test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh | 64 +- test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.html | 22 + test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.java | 235 + test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/TestApplet.java | 67 + test/java/awt/font/LineBreakMeasurer/AllFontsLBM.java | 78 + test/java/awt/font/TextLayout/TestKerning.java | 94 + test/java/awt/image/mlib/MlibOpsTest.java | 2 +- test/java/beans/Introspector/4520754/Test4520754.java | 4 +- test/java/beans/Introspector/6380849/TestBeanInfo.java | 10 +- test/java/beans/Introspector/Test7193977.java | 159 + test/java/beans/Introspector/Test7195106.java | 67 + test/java/beans/PropertyEditor/6380849/TestPropertyEditor.java | 26 +- test/java/beans/PropertyEditor/Test6963811.java | 6 +- test/java/beans/XMLEncoder/Test7169395.java | 101 + test/java/io/FileInputStream/LargeFileAvailable.java | 66 +- test/java/io/Serializable/resolveClass/deserializeButton/Foo.java | 17 +- test/java/io/Serializable/resolveClass/deserializeButton/Test.java | 4 +- test/java/io/Serializable/resolveClass/deserializeButton/run.sh | 4 +- test/java/lang/ProcessBuilder/Basic.java | 54 +- test/java/lang/Runtime/exec/ExecCommand.java | 163 + test/java/lang/Runtime/exec/StreamsSurviveDestroy.java | 47 +- test/java/lang/ThreadGroup/NullThreadName.java | 5 +- test/java/lang/ThreadGroup/Stop.java | 61 +- test/java/lang/instrument/ManifestTest.sh | 23 +- test/java/lang/invoke/InvokeGenericTest.java | 2 +- test/java/net/BindException/Test.java | 23 +- test/java/net/InetAddress/GetLocalHostWithSM.java | 14 +- test/java/net/ResponseCache/Test.java | 80 + test/java/net/Socket/B6210227.java | 58 + test/java/net/Socks/SocksServer.java | 39 +- test/java/net/Socks/SocksV4Test.java | 38 +- test/java/net/URL/Gopher.java | 74 + test/java/net/URL/Test.java | 4 - test/java/net/URL/TestHttps.java | 34 + test/java/net/ipv6tests/B6521014.java | 4 +- test/java/nio/MappedByteBuffer/Basic.java | 91 +- test/java/nio/channels/AsynchronousSocketChannel/Basic.java | 1146 +++--- test/java/nio/channels/AsynchronousSocketChannel/Leaky.java | 6 +- test/java/nio/channels/DatagramChannel/AdaptDatagramSocket.java | 42 +- test/java/nio/channels/DatagramChannel/IsBound.java | 34 +- test/java/nio/channels/DatagramChannel/IsConnected.java | 26 +- test/java/nio/channels/DatagramChannel/SelectWhenRefused.java | 17 +- test/java/nio/channels/DatagramChannel/SendToUnresolved.java | 2 +- test/java/nio/channels/Selector/Alias.java | 21 +- test/java/nio/channels/Selector/BasicConnect.java | 91 +- test/java/nio/channels/Selector/ChangingInterests.java | 190 + test/java/nio/channels/Selector/Connect.java | 19 +- test/java/nio/channels/Selector/ConnectWrite.java | 18 +- test/java/nio/channels/Selector/KeysReady.java | 19 +- test/java/nio/channels/SocketChannel/AdaptSocket.java | 52 +- test/java/nio/channels/SocketChannel/Basic.java | 16 +- test/java/nio/channels/SocketChannel/BufferSize.java | 9 +- test/java/nio/channels/SocketChannel/Connect.java | 17 +- test/java/nio/channels/SocketChannel/ConnectState.java | 110 +- test/java/nio/channels/SocketChannel/FinishConnect.java | 51 +- test/java/nio/channels/SocketChannel/IsConnectable.java | 27 +- test/java/nio/channels/SocketChannel/LocalAddress.java | 12 +- test/java/nio/channels/SocketChannel/Stream.java | 21 +- test/java/nio/channels/SocketChannel/VectorParams.java | 26 +- test/java/nio/channels/TestServers.java | 849 ++++ test/java/nio/channels/TestUtil.java | 4 - test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so | Bin test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so | Bin test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so | Bin test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so | Bin test/java/rmi/MarshalledObject/compare/Compare.java | 1 - test/java/rmi/MarshalledObject/compare/HashCode.java | 1 - test/java/rmi/MarshalledObject/compare/NullReference.java | 1 - test/java/rmi/Naming/DefaultRegistryPort.java | 1 - test/java/rmi/Naming/LookupIPv6.java | 5 +- test/java/rmi/Naming/LookupNameWithColon.java | 18 +- test/java/rmi/Naming/RmiIsNoScheme.java | 13 +- test/java/rmi/Naming/UnderscoreHost.java | 70 +- test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java | 11 +- test/java/rmi/RMISecurityManager/checkPackageAccess/CheckPackageAccess.java | 3 +- test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java | 3 +- test/java/rmi/activation/Activatable/checkActivateRef/security.policy | 3 +- test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java | 5 +- test/java/rmi/activation/Activatable/checkAnnotations/security.policy | 3 +- test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java | 7 +- test/java/rmi/activation/Activatable/checkImplClassLoader/security.policy | 3 +- test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java | 4 +- test/java/rmi/activation/Activatable/checkRegisterInLog/security.policy | 5 +- test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java | 6 +- test/java/rmi/activation/Activatable/createPrivateActivable/security.policy | 3 +- test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java | 6 +- test/java/rmi/activation/Activatable/downloadParameterClass/security.policy | 3 +- test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java | 5 +- test/java/rmi/activation/Activatable/elucidateNoSuchMethod/security.policy | 3 +- test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh | 20 +- test/java/rmi/activation/Activatable/extLoadedImpl/security.policy | 3 +- test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java | 5 +- test/java/rmi/activation/Activatable/forceLogSnapshot/security.policy | 3 +- test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java | 5 +- test/java/rmi/activation/Activatable/inactiveGroup/security.policy | 5 +- test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java | 6 +- test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java | 6 +- test/java/rmi/activation/Activatable/nestedActivate/security.policy | 5 +- test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java | 5 +- test/java/rmi/activation/Activatable/nonExistentActivatable/security.policy | 3 +- test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java | 5 +- test/java/rmi/activation/Activatable/restartCrashedService/security.policy | 3 +- test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java | 3 +- test/java/rmi/activation/Activatable/restartLatecomer/security.policy | 3 +- test/java/rmi/activation/Activatable/restartService/RestartService.java | 6 +- test/java/rmi/activation/Activatable/restartService/security.policy | 3 +- test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java | 15 +- test/java/rmi/activation/Activatable/shutdownGracefully/security.policy | 3 +- test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java | 6 +- test/java/rmi/activation/Activatable/unregisterInactive/security.policy | 3 +- test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java | 7 +- test/java/rmi/activation/ActivateFailedException/activateFails/security.policy | 3 +- test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java | 4 +- test/java/rmi/activation/ActivationGroupDesc/checkDefaultGroupName/CheckDefaultGroupName.java | 9 +- test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java | 4 +- test/java/rmi/activation/ActivationSystem/activeGroup/security.policy | 3 +- test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java | 5 +- test/java/rmi/activation/ActivationSystem/modifyDescriptor/security.policy | 3 +- test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java | 17 +- test/java/rmi/activation/ActivationSystem/stubClassesPermitted/security.policy | 9 +- test/java/rmi/activation/ActivationSystem/unregisterGroup/ActivateMe.java | 4 +- test/java/rmi/activation/ActivationSystem/unregisterGroup/CallbackInterface.java | 29 - test/java/rmi/activation/ActivationSystem/unregisterGroup/Callback_Stub.java | 122 - test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java | 155 +- test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup_Stub.java | 144 - test/java/rmi/activation/ActivationSystem/unregisterGroup/group.security.policy | 1 + test/java/rmi/activation/ActivationSystem/unregisterGroup/security.policy | 9 +- test/java/rmi/activation/CommandEnvironment/NullOptions.java | 1 - test/java/rmi/activation/CommandEnvironment/SetChildEnv.java | 44 +- test/java/rmi/activation/CommandEnvironment/security.policy | 1 + test/java/rmi/activation/checkusage/CheckUsage.java | 31 +- test/java/rmi/activation/log/LogTest.java | 1 - test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java | 32 +- test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java | 34 +- test/java/rmi/activation/rmidViaInheritedChannel/rmid.security.policy | 1 + test/java/rmi/dgc/VMID/CheckVMID.java | 2 +- test/java/rmi/dgc/dgcAckFailure/DGCAckFailure.java | 3 +- test/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java | 4 +- test/java/rmi/dgc/retryDirtyCalls/RetryDirtyCalls.java | 3 +- test/java/rmi/invalidName/InvalidName.java | 2 +- test/java/rmi/registry/altSecurityManager/AltSecurityManager.java | 49 +- test/java/rmi/registry/checkusage/CheckUsage.java | 30 +- test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java | 14 +- test/java/rmi/registry/emptyName/EmptyName.java | 6 +- test/java/rmi/registry/interfaceHash/InterfaceHash.java | 8 +- test/java/rmi/registry/multipleRegistries/MultipleRegistries.java | 16 +- test/java/rmi/registry/readTest/readTest.java | 9 +- test/java/rmi/registry/readTest/readTest.sh | 30 +- test/java/rmi/registry/reexport/Reexport.java | 35 +- test/java/rmi/reliability/benchmark/runRmiBench.sh | 28 +- test/java/rmi/reliability/benchmark/runSerialBench.sh | 32 +- test/java/rmi/reliability/juicer/AppleUserImpl.java | 29 +- test/java/rmi/reliability/juicer/ApplicationServer.java | 27 +- test/java/rmi/server/ObjID/randomIDs/RandomIDs.java | 1 - test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java | 4 +- test/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java | 2 +- test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java | 10 +- test/java/rmi/server/RMIClassLoader/downloadArrayClass/security.policy | 2 + test/java/rmi/server/RMIClassLoader/getClassAnnotation/NullClass.java | 1 - test/java/rmi/server/RMIClassLoader/getClassLoader/GetClassLoader.java | 4 +- test/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java | 7 +- test/java/rmi/server/RMIClassLoader/loadProxyClasses/security.policy | 1 + test/java/rmi/server/RMIClassLoader/noSecurityManager/NoSecurityManager.java | 2 +- test/java/rmi/server/RMIClassLoader/spi/ContextInsulation.java | 6 +- test/java/rmi/server/RMIClassLoader/spi/DefaultProperty.java | 5 +- test/java/rmi/server/RMIClassLoader/spi/Installed.java | 6 +- test/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java | 4 +- test/java/rmi/server/RMIClassLoader/spi/Property.java | 5 +- test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly.java | 7 +- test/java/rmi/server/RMIClassLoader/useCodebaseOnlyDefault/UseCodebaseOnlyDefault.java | 100 + test/java/rmi/server/RMIClassLoader/useGetURLs/UseGetURLs.java | 3 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/EchoImpl.java | 7 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java | 20 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy | 3 + test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl.java | 5 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java | 19 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy | 2 + test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/EchoImpl.java | 5 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java | 21 +- test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/security.policy | 9 + test/java/rmi/server/RemoteObject/notExtending/NotExtending.java | 4 +- test/java/rmi/server/RemoteObject/verifyRemoteEquals/VerifyRemoteEquals.java | 8 +- test/java/rmi/server/RemoteServer/AddrInUse.java | 12 +- test/java/rmi/server/UnicastRemoteObject/changeHostName/ChangeHostName.java | 3 +- test/java/rmi/server/UnicastRemoteObject/exportObject/GcDuringExport.java | 1 + test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java | 20 +- test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownImpl.java | 5 +- test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport.java | 3 +- test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport2.java | 3 +- test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java | 15 +- test/java/rmi/server/Unmarshal/PrimitiveClasses.java | 1 + test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshal.java | 39 + test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread.java | 6 +- test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshall.java | 39 - test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java | 11 +- test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java | 14 +- test/java/rmi/server/Unreferenced/leaseCheckInterval/SelfTerminator.java | 6 +- test/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet.java | 2 - test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java | 10 +- test/java/rmi/server/clientStackTrace/ClientStackTrace.java | 2 +- test/java/rmi/server/getRemoteClass/GetRemoteClass.java | 2 +- test/java/rmi/server/serverStackTrace/ServerStackTrace.java | 3 +- test/java/rmi/server/serverStackTrace/SuppressStackTraces.java | 5 +- test/java/rmi/server/useCustomRef/UseCustomRef.java | 12 +- test/java/rmi/server/useCustomRef/security.policy | 3 + test/java/rmi/testlibrary/ActivationLibrary.java | 94 +- test/java/rmi/testlibrary/JavaVM.java | 93 +- test/java/rmi/testlibrary/RMID.java | 104 +- test/java/rmi/testlibrary/RegistryRunner.java | 9 +- test/java/rmi/testlibrary/StreamPipe.java | 71 +- test/java/rmi/testlibrary/TestLibrary.java | 193 +- test/java/rmi/transport/acceptLoop/CloseServerSocketOnTermination.java | 1 - test/java/rmi/transport/checkFQDN/CheckFQDN.java | 20 +- test/java/rmi/transport/checkFQDN/CheckFQDNClient.java | 5 +- test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java | 17 +- test/java/rmi/transport/checkLeaseInfoLeak/LeaseLeakClient.java | 6 +- test/java/rmi/transport/checkLeaseInfoLeak/security.policy | 1 + test/java/rmi/transport/closeServerSocket/CloseServerSocket.java | 10 +- test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java | 17 +- test/java/rmi/transport/dgcDeadLock/TestImpl.java | 10 +- test/java/rmi/transport/handshakeFailure/HandshakeFailure.java | 7 +- test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java | 7 +- test/java/rmi/transport/httpSocket/HttpSocketTest.java | 16 +- test/java/rmi/transport/httpSocket/security.policy | 4 + test/java/rmi/transport/pinClientSocketFactory/PinClientSocketFactory.java | 6 +- test/java/rmi/transport/pinLastArguments/PinLastArguments.java | 13 +- test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java | 9 +- test/java/rmi/transport/readTimeout/ReadTimeoutTest.java | 9 +- test/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java | 7 +- test/java/rmi/transport/runtimeThreadInheritanceLeak/RuntimeThreadInheritanceLeak.java | 1 - test/java/security/BasicPermission/PermClass.java | 77 +- test/java/security/BasicPermission/SerialVersion.java | 48 +- test/java/security/KeyFactory/Failover.java | 14 +- test/java/security/KeyPairGenerator/Failover.java | 14 +- test/java/security/Provider/ChangeProviders.java | 14 +- test/java/security/Provider/GetInstance.java | 14 +- test/java/security/Provider/RemoveProvider.java | 14 +- test/java/security/Provider/Turkish.java | 94 +- test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh | 1 + test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh | 6 +- test/java/security/Security/NoInstalledProviders.java | 16 +- test/java/security/Security/SynchronizedAccess.java | 16 +- test/java/security/Security/removing/RemoveProviders.java | 14 +- test/java/security/UnresolvedPermission/Equals.java | 3 +- test/java/security/spec/EllipticCurveMatch.java | 7 +- test/java/security/testlibrary/Providers.java | 36 + test/java/security/testlibrary/ProvidersSnapshot.java | 48 + test/java/util/Locale/data/deflocale.sol10 | 1725 ---------- test/java/util/Timer/KillThread.java | 7 +- test/java/util/concurrent/Executors/AutoShutdown.java | 5 + test/java/util/concurrent/FutureTask/BlockingTaskExecutor.java | 4 +- test/java/util/concurrent/Phaser/Basic.java | 10 +- test/java/util/concurrent/ThreadPoolExecutor/Custom.java | 8 +- test/java/util/concurrent/locks/Lock/FlakyMutex.java | 2 +- test/java/util/logging/CustomLogManager.java | 177 + test/java/util/logging/CustomLogManagerTest.java | 63 + test/java/util/logging/DrainFindDeadlockTest.java | 196 + test/java/util/logging/LogManagerInstanceTest.java | 76 + test/java/util/logging/SimpleLogManager.java | 113 + test/java/util/logging/bundlesearch/ClassPathTestBundle_en.properties | 25 + test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java | 163 + test/java/util/logging/bundlesearch/LoadItUp1.java | 49 + test/java/util/logging/bundlesearch/LoadItUp2.java | 62 + test/java/util/logging/bundlesearch/LoadItUp2Invoker.java | 60 + test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java | 297 + test/java/util/logging/bundlesearch/TwiceIndirectlyLoadABundle.java | 91 + test/java/util/logging/bundlesearch/resources/CallerSearchableResource_en.properties | 25 + test/java/util/logging/bundlesearch/resources/ContextClassLoaderTestBundle_en.properties | 25 + test/java/util/logging/bundlesearch/resources/StackSearchableResource_en.properties | 25 + test/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpecException.java | 16 +- test/javax/crypto/JceSecurity/SunJCE_BC_LoadOrdering.java | 16 +- test/javax/crypto/sanity/CheckManifestForRelease.java | 187 + test/javax/crypto/sanity/p11-solaris.txt | 21 + test/javax/imageio/stream/StreamCloserLeak/run_test.sh | 28 +- test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java | 6 +- test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java | 6 +- test/javax/rmi/ssl/SocketFactoryTest.java | 3 +- test/javax/security/auth/login/LoginContext/ResetConfigModule.java | 53 +- test/javax/swing/AncestorNotifier/7193219/bug7193219.java | 85 + test/javax/swing/JColorChooser/Test6827032.java | 86 + test/javax/swing/JComboBox/ShowPopupAfterHidePopupTest/ShowPopupAfterHidePopupTest.java | 78 + test/javax/swing/JFrame/4962534/bug4962534.html | 43 + test/javax/swing/JFrame/4962534/bug4962534.java | 235 + test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java | 83 + test/javax/swing/JMenuItem/ShortcutNotDiplayed/ShortcutNotDisplayedTest.java | 105 + test/javax/swing/JSlider/4252173/bug4252173.java | 12 +- test/javax/swing/JSpinner/6532833/bug6532833.java | 11 +- test/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java | 9 +- test/javax/swing/text/StyledEditorKit/4506788/bug4506788.html | 28 + test/javax/swing/text/StyledEditorKit/4506788/bug4506788.java | 131 + test/javax/xml/crypto/dsig/GenerationTests.java | 8 +- test/javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java | 7 +- test/javax/xml/crypto/dsig/ValidationTests.java | 4 +- test/lib/security/java.policy/Ext_AllPolicy.sh | 7 +- test/lib/testlibrary/ClassFileInstaller.java | 53 + test/sun/awt/AppContext/8012933/Test8012933.java | 92 + test/sun/java2d/OpenGL/CustomCompositeTest.java | 266 + test/sun/management/jmxremote/bootstrap/linux-i586/launcher | Bin test/sun/management/jmxremote/bootstrap/solaris-i586/launcher | Bin test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher | Bin test/sun/management/windows/revokeall.exe | Bin test/sun/misc/Version/Version.java | 114 +- test/sun/net/InetAddress/nameservice/dns/cname.sh | 2 +- test/sun/net/www/messageheader/0 | 4 + test/sun/net/www/messageheader/1 | 4 + test/sun/net/www/messageheader/2 | 5 + test/sun/net/www/messageheader/3 | 6 + test/sun/net/www/messageheader/4 | 7 + test/sun/net/www/messageheader/5 | 7 + test/sun/net/www/messageheader/6 | 5 + test/sun/net/www/messageheader/HTest.java | 73 + test/sun/net/www/protocol/file/DirPermissionDenied.sh | 1 + test/sun/net/www/protocol/http/StackTraceTest.java | 36 +- test/sun/net/www/protocol/jar/B4957695.java | 86 +- test/sun/reflect/CallerSensitive/CallerSensitiveFinder.java | 248 + test/sun/reflect/CallerSensitive/ClassFileReader.java | 338 + test/sun/reflect/CallerSensitive/MethodFinder.java | 201 + test/sun/reflect/CallerSensitive/MissingCallerSensitive.java | 73 + test/sun/rmi/log/ReliableLog/LogAlignmentTest.java | 6 +- test/sun/rmi/log/ReliableLog/SnapshotSize.java | 2 + test/sun/rmi/rmic/RMIGenerator/RmicDefault.java | 1 - test/sun/rmi/rmic/newrmic/equivalence/AppleUserImpl.java | 17 +- test/sun/rmi/rmic/newrmic/equivalence/run.sh | 32 +- test/sun/rmi/runtime/Log/4504153/Test4504153.java | 5 +- test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java | 17 +- test/sun/rmi/runtime/Log/checkLogging/CheckLogStreams.java | 6 +- test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java | 14 +- test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java | 6 +- test/sun/rmi/transport/proxy/EagerHttpFallback.java | 9 +- test/sun/rmi/transport/tcp/DeadCachedConnection.java | 12 +- test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java | 7 +- test/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing.java | 1 - test/sun/security/ec/TestEC.java | 16 + test/sun/security/jgss/spnego/NoSpnegoAsDefMech.java | 2 +- test/sun/security/krb5/auto/BadKdc.java | 28 +- test/sun/security/krb5/auto/BadKdc1.java | 16 +- test/sun/security/krb5/auto/BadKdc2.java | 12 +- test/sun/security/krb5/auto/BadKdc3.java | 12 +- test/sun/security/krb5/auto/BadKdc4.java | 12 +- test/sun/security/krb5/config/DNS.java | 38 + test/sun/security/krb5/config/NamingManager.java | 60 + test/sun/security/krb5/config/dns.sh | 41 + test/sun/security/mscapi/ShortRSAKey1024.sh | 28 +- test/sun/security/mscapi/ShortRSAKey512.sh | 86 - test/sun/security/mscapi/ShortRSAKey768.sh | 85 - test/sun/security/mscapi/ShortRSAKeyWithinTLS.java | 6 +- test/sun/security/pkcs11/MessageDigest/TestCloning.java | 141 + test/sun/security/pkcs11/PKCS11Test.java | 57 +- test/sun/security/pkcs11/Secmod/AddPrivateKey.java | 1 + test/sun/security/pkcs11/Secmod/AddTrustedCert.java | 1 + test/sun/security/pkcs11/Secmod/Crypto.java | 1 + test/sun/security/pkcs11/Secmod/GetPrivateKey.java | 1 + test/sun/security/pkcs11/Secmod/JksSetPrivateKey.java | 1 + test/sun/security/pkcs11/Secmod/TrustAnchors.java | 1 + test/sun/security/pkcs11/SecmodTest.java | 4 +- test/sun/security/pkcs11/ec/ReadCertificates.java | 3 +- test/sun/security/pkcs11/ec/ReadPKCS12.java | 3 +- test/sun/security/pkcs11/ec/TestECDH.java | 3 +- test/sun/security/pkcs11/ec/TestECDSA.java | 3 +- test/sun/security/pkcs11/fips/CipherTest.java | 83 +- test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java | 5 +- test/sun/security/pkcs11/fips/TrustManagerTest.java | 1 + test/sun/security/pkcs11/rsa/TestCACerts.java | 49 +- test/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java | 3 +- test/sun/security/pkcs12/PKCS12SameKeyId.java | 12 +- test/sun/security/provider/PolicyFile/Comparator.java | 1 + test/sun/security/provider/certpath/X509CertPath/ForwardBuildCompromised.java | 312 - test/sun/security/provider/certpath/X509CertPath/ReverseBuildCompromised.java | 315 - test/sun/security/provider/certpath/X509CertPath/ValidateCompromised.java | 297 - test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ProviderTest.java | 44 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/ReadBlocksClose.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/ReadHandshake.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/ReadZeroBytes.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/RemoveMarkReset.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppOutputStream/NoExceptionOnClose.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/CipherSuiteOrder.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/RSAExport.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/main.java | 7 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/HandshakeOutStream/NullCerts.java | 9 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/ClientHelloRead.java | 44 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/SSLSocketTimeoutNulls.java | 7 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ProtocolVersion/HttpsProtocols.java | 16 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/BadKSProvider.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/BadTSProvider.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/GoodProvider.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/RehandshakeFinished.java | 25 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineDeadlock.java | 7 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSessionImpl/HashCodeMissing.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/AsyncSSLSocketClose.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ClientModeClientAuth.java | 7 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ClientTimeout.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/CloseSocketException.java | 13 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/InvalidateServerSessionRenegotiate.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NewSocketMethods.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NonAutoClose.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ReuseAddr.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ReverseNameLookup.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/SSLSocketImplThrowsWrongExceptions.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ServerTimeout.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/SetClientMode.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/UnconnectedSocketWrongExceptions.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/AnonCipherWithWantClientAuth.java | 7 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/GetPeerHost.java | 13 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SocketCreation/SocketCreation.java | 7 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/ClientServer.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/PKIXExtendedTM.java | 5 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SelfIssuedCert.java | 5 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SunX509ExtendedTM.java | 7 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/X509ExtendedTMEnabled.java | 10 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/spi/ProviderInit.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyAuthTest.java | 16 +- test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ServerIdentityTest.java | 72 +- test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/CriticalSubjectAltName.java | 6 + test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/GetResponseCode.java | 6 + test/sun/security/ssl/javax/net/ssl/Fix5070632.java | 23 +- test/sun/security/ssl/javax/net/ssl/FixingJavadocs/ComURLNulls.java | 114 +- test/sun/security/ssl/javax/net/ssl/FixingJavadocs/ImplicitHandshake.java | 6 + test/sun/security/ssl/javax/net/ssl/FixingJavadocs/JavaxURLNulls.java | 118 +- test/sun/security/ssl/javax/net/ssl/FixingJavadocs/SSLSessionNulls.java | 6 + test/sun/security/ssl/javax/net/ssl/FixingJavadocs/SSLSocketInherit.java | 6 + test/sun/security/ssl/javax/net/ssl/NewAPIs/CheckMyTrustedKeystore.java | 6 + test/sun/security/ssl/javax/net/ssl/NewAPIs/HttpsURLConnectionLocalCertificateChain.java | 6 + test/sun/security/ssl/javax/net/ssl/NewAPIs/JSSERenegotiate.java | 7 +- test/sun/security/ssl/javax/net/ssl/NewAPIs/KeyManagerTrustManager.java | 49 +- test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLCtxAccessToSessCtx.java | 6 + test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/AcceptLargeFragments.java | 13 +- test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ExtendedKeySocket.java | 6 + test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargePacket.java | 6 +- test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/NoAuthClientAuth.java | 7 +- test/sun/security/ssl/javax/net/ssl/NewAPIs/SessionCacheSizeTests.java | 6 + test/sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java | 8 +- test/sun/security/ssl/javax/net/ssl/NewAPIs/testEnabledProtocols.java | 6 + test/sun/security/ssl/javax/net/ssl/SSLServerSocket/DefaultSSLServSocketFac.java | 19 +- test/sun/security/ssl/javax/net/ssl/TLSv11/EmptyCertificateAuthorities.java | 8 +- test/sun/security/ssl/javax/net/ssl/TLSv11/ExportableBlockCipher.java | 8 +- test/sun/security/ssl/javax/net/ssl/TLSv11/ExportableStreamCipher.java | 8 +- test/sun/security/ssl/javax/net/ssl/TLSv11/GenericBlockCipher.java | 8 +- test/sun/security/ssl/javax/net/ssl/TLSv11/GenericStreamCipher.java | 8 +- test/sun/security/ssl/sanity/pluggability/CheckSSLContextExport.java | 19 +- test/sun/security/ssl/sanity/pluggability/CheckSockFacExport1.java | 83 +- test/sun/security/ssl/sanity/pluggability/CheckSockFacExport2.java | 87 +- test/sun/security/ssl/sun/net/www/http/ChunkedOutputStream/Test.java | 57 +- test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java | 38 +- test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CloseKeepAliveCached.java | 16 +- test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CookieHandlerTest.java | 52 +- test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CookieHttpsClientTest.java | 1 + test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/DNSIdentities.java | 55 +- test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java | 9 +- test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsPost.java | 58 +- test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsProxyStackOverflow.java | 3 + test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java | 5 + test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java | 73 +- test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java | 55 +- test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPIdentities.java | 56 +- test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/Identities.java | 57 +- test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.java | 85 +- test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.java | 14 +- test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ReadTimeout.java | 88 +- test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/Redirect.java | 49 +- test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/RetryHttps.java | 73 +- test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java | 78 +- test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/ComHostnameVerifier.java | 6 + test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/JavaxHTTPSConnection.java | 86 +- test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/JavaxHostnameVerifier.java | 6 + test/sun/security/ssl/templates/SSLEngineTemplate.java | 7 +- test/sun/security/ssl/templates/SSLSocketTemplate.java | 6 + test/sun/security/tools/jarsigner/AlgOptions.sh | 7 +- test/sun/security/tools/jarsigner/PercentSign.sh | 7 +- test/sun/security/tools/jarsigner/diffend.sh | 7 +- test/sun/security/tools/jarsigner/oldsig.sh | 7 +- test/sun/security/tools/keytool/AltProviderPath.sh | 7 +- test/sun/security/tools/keytool/SecretKeyKS.sh | 7 +- test/sun/security/tools/keytool/StandardAlgName.sh | 7 +- test/sun/security/tools/keytool/StartDateTest.java | 4 +- test/sun/security/tools/keytool/i18n.sh | 7 +- test/sun/security/tools/keytool/resource.sh | 13 +- test/sun/security/tools/policytool/Alias.sh | 11 +- test/sun/security/tools/policytool/ChangeUI.sh | 11 +- test/sun/security/tools/policytool/OpenPolicy.sh | 12 +- test/sun/security/tools/policytool/SaveAs.sh | 12 +- test/sun/security/tools/policytool/UpdatePermissions.sh | 12 +- test/sun/security/tools/policytool/UsePolicy.sh | 12 +- test/sun/security/tools/policytool/i18n.sh | 12 +- test/sun/security/util/Oid/S11N.java | 246 + test/sun/security/util/Oid/S11N.sh | 171 - test/sun/security/util/Oid/SerialTest.java | 66 - test/sun/security/x509/AlgorithmId/ExtensibleAlgorithmId.java | 3 + test/sun/tools/common/ApplicationSetup.sh | 6 +- test/sun/tools/jcmd/jcmd-Defaults.sh | 4 +- test/sun/tools/jcmd/jcmd-f.sh | 2 +- test/sun/tools/jcmd/jcmd-help-help.sh | 2 +- test/sun/tools/jcmd/jcmd-help.sh | 4 +- test/sun/tools/jcmd/jcmd-pid.sh | 4 +- test/sun/tools/jcmd/jcmd_Output1.awk | 17 +- test/sun/tools/jinfo/Basic.sh | 15 +- test/sun/tools/jps/jps-Vvml_2.sh | 4 +- test/sun/tools/jps/jps-l_Output1.awk | 7 +- test/sun/tools/jps/jps-m_2.sh | 4 +- test/sun/tools/jps/jps_Output1.awk | 7 +- test/sun/tools/jstat/jstatClassOutput1.sh | 4 +- test/sun/tools/jstat/jstatClassloadOutput1.sh | 4 +- test/sun/tools/jstat/jstatCompilerOutput1.sh | 4 +- test/sun/tools/jstat/jstatFileURITest1.sh | 6 +- test/sun/tools/jstat/jstatGcCapacityOutput1.sh | 4 +- test/sun/tools/jstat/jstatGcCauseOutput1.sh | 4 +- test/sun/tools/jstat/jstatGcNewCapacityOutput1.sh | 4 +- test/sun/tools/jstat/jstatGcNewOutput1.sh | 4 +- test/sun/tools/jstat/jstatGcOldCapacityOutput1.sh | 4 +- test/sun/tools/jstat/jstatGcOldOutput1.sh | 4 +- test/sun/tools/jstat/jstatGcOutput1.sh | 4 +- test/sun/tools/jstat/jstatGcPermCapacityOutput1.sh | 4 +- test/sun/tools/jstat/jstatLineCounts1.sh | 4 +- test/sun/tools/jstat/jstatLineCounts2.sh | 4 +- test/sun/tools/jstat/jstatLineCounts3.sh | 4 +- test/sun/tools/jstat/jstatLineCounts4.sh | 4 +- test/sun/tools/jstat/jstatOptions1.sh | 6 +- test/sun/tools/jstat/jstatPrintCompilationOutput1.sh | 4 +- test/sun/tools/jstat/jstatSnap1.sh | 4 +- test/sun/tools/jstat/jstatSnap2.sh | 4 +- test/sun/tools/jstat/jstatTimeStamp1.sh | 4 +- test/sun/tools/jstatd/jpsOutput1.awk | 6 +- test/sun/tools/jstatd/jstatdDefaults.sh | 4 +- test/sun/tools/jstatd/jstatdExternalRegistry.sh | 4 +- test/sun/tools/jstatd/jstatdPort.sh | 4 +- test/sun/tools/jstatd/jstatdServerName.sh | 10 +- test/sun/tools/native2ascii/NativeErrors.java | 4 +- test/tools/launcher/Arrrghs.java | 478 ++- test/tools/launcher/RunpathTest.java | 84 + test/tools/launcher/TestHelper.java | 115 +- test/tools/launcher/ToolsOpts.java | 218 + test/tools/pack200/MemoryAllocatorTest.java | 369 ++ 1815 files changed, 76181 insertions(+), 50032 deletions(-) diffs (truncated from 178942 to 500 lines): diff -r 8c2c5d63a17e -r bd392c168d5c .hgtags --- a/.hgtags Mon Aug 13 14:20:05 2012 -0700 +++ b/.hgtags Fri Jun 21 15:46:14 2013 -0500 @@ -50,6 +50,7 @@ f708138c9aca4b389872838fe6773872fce3609e jdk7-b73 eacb36e30327e7ae33baa068e82ddccbd91eaae2 jdk7-b74 8885b22565077236a927e824ef450742e434a230 jdk7-b75 +fb2ee5e96b171ae9db67274d87ffaba941e8bfa6 icedtea7-1.12 8fb602395be0f7d5af4e7e93b7df2d960faf9d17 jdk7-b76 e6a5d095c356a547cf5b3c8885885aca5e91e09b jdk7-b77 1143e498f813b8223b5e3a696d79da7ff7c25354 jdk7-b78 @@ -63,6 +64,7 @@ eae6e9ab26064d9ba0e7665dd646a1fd2506fcc1 jdk7-b86 2cafbbe9825e911a6ca6c17d9a18eb1f0bf0873c jdk7-b87 b3c69282f6d3c90ec21056cd1ab70dc0c895b069 jdk7-b88 +2017795af50aebc00f500e58f708980b49bc7cd1 icedtea7-1.13 4a6abb7e224cc8d9a583c23c5782e4668739a119 jdk7-b89 7f90d0b9dbb7ab4c60d0b0233e4e77fb4fac597c jdk7-b90 08a31cab971fcad4695e913d0f3be7bde3a90747 jdk7-b91 @@ -111,6 +113,7 @@ 554adcfb615e63e62af530b1c10fcf7813a75b26 jdk7-b134 d8ced728159fbb2caa8b6adb477fd8efdbbdf179 jdk7-b135 aa13e7702cd9d8aca9aa38f1227f966990866944 jdk7-b136 +1571aa7abe47a54510c62a5b59a8c343cdaf67cb icedtea-1.14 29296ea6529a418037ccce95903249665ef31c11 jdk7-b137 60d3d55dcc9c31a30ced9caa6ef5c0dcd7db031d jdk7-b138 d80954a89b49fda47c0c5cace65a17f5a758b8bd jdk7-b139 @@ -123,6 +126,7 @@ 539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146 69e973991866c948cf1808b06884ef2d28b64fcb jdk7u1-b01 f097ca2434b1412b12ab4a5c2397ce271bf681e7 jdk7-b147 +7ec1845521edfb1843cad3868217983727ece53d icedtea-2.0-branchpoint 2baf612764d215e6f3a5b48533f74c6924ac98d7 jdk7u1-b02 a4781b6d9cfb6901452579adee17c9a17c1b584c jdk7u1-b03 b223ed9a5fdf8ce3af42adfa8815975811d70eae jdk7u1-b04 @@ -141,6 +145,7 @@ 79c8c4608f60e1f981b17ba4077dfcaa2ed67be4 jdk7u2-b12 fb2980d7c9439e3d62ab12f40506a2a2db2df0f4 jdk7u2-b13 24e42f1f9029f9f5a9b1481d523facaf09452e5b jdk7u2-b21 +a75913596199fbb8583f9d74021f54dc76f87b14 icedtea-2.1-branchpoint e3790f3ce50aa4e2a1b03089ac0bcd48f9d1d2c2 jdk7u3-b02 7e8351342f0b22b694bd3c2db979643529f32e71 jdk7u3-b03 fc6b7b6ac837c9e867b073e13fc14e643f771028 jdk7u3-b04 @@ -157,6 +162,7 @@ 6485e842d7f736b6ca3d7e4a7cdc5de6bbdd870c jdk7u4-b10 d568e85567ccfdd75f3f0c42aa0d75c440422827 jdk7u4-b11 16781e84dcdb5f82c287a3b5387dde9f8aaf74e0 jdk7u4-b12 +907555f6191a0cd84886b07c4c40bc6ce498b8b1 icedtea-2.2-branchpoint c929e96aa059c8b79ab94d5b0b1a242ca53a5b32 jdk7u4-b13 09f612bac047b132bb9bf7d4aa8afe6ea4d5b938 jdk7u4-b14 9e15d1f3fa4b35b8c950323c76b9ed094d434b97 jdk7u5-b01 @@ -191,6 +197,7 @@ e50c9a5f001c61f49e7e71b25b97ed4095d3557b jdk7u6-b15 966e21feb7f088e318a35b069c1a61ff6363e554 jdk7u6-b16 aa0ad405f70bc7a7af95fef109f114ceecf31232 jdk7u6-b17 +8ff5fca08814f1f0eeda40aaec6f2936076b7444 icedtea-2.3-branchpoint 4a6917092af80481c1fa5b9ec8ccae75411bb72c jdk7u6-b18 a263f787ced5bc7c14078ae552c82de6bd011611 jdk7u6-b19 09145b546a2b6ae1f44d5c8a7d2a37d48e4b39e2 jdk7u6-b20 @@ -199,3 +206,113 @@ 0ae89e53f5300da1961984a7d81c220c7cf717d7 jdk7u6-b23 1c775da998735711853cfe1ae1d6baddc5f12a66 jdk7u6-b24 4bd0528374971157afd6372890f4250e1cf712d9 jdk7u6-b30 +2029e066b8c29fc043a751a1d0541b9195e27007 icedtea-2.3 +ae5c5c93d36e36e33c46eb82dcb04f2616652dfd icedtea-2.3.1 +5f709891901c546447f34c47a690614a2f15a5d4 icedtea-2.3.2 +5f709891901c546447f34c47a690614a2f15a5d4 icedtea-2.3.2 +0000000000000000000000000000000000000000 icedtea-2.3.2 +0000000000000000000000000000000000000000 icedtea-2.3.2 +328cea87bd22f69401866251856e348a405aac03 icedtea-2.3.2 +328cea87bd22f69401866251856e348a405aac03 icedtea-2.3.2 +0000000000000000000000000000000000000000 icedtea-2.3.2 +0000000000000000000000000000000000000000 icedtea-2.3.2 +64ec99488219da2565d3eea0a53ffb4854c87fbe icedtea-2.3.2 +6d4f9b2e4a51be218c0d0a1b10cd8469d8ca3cdc icedtea-2.3.3 +363064d273675e7ba3417583ee9e4f220bd4e1c9 icedtea-2.3.4 +50e268c1fb1f8a0f0f5b61e70801c58e4b7e547d icedtea-2.3.5 +ca6ee539c5f4f4dd9d5fb9b0604d94c5806c3e28 icedtea-2.3.6 +ca6ee539c5f4f4dd9d5fb9b0604d94c5806c3e28 icedtea-2.3.6 +0000000000000000000000000000000000000000 icedtea-2.3.6 +8c2c5d63a17ee5aa85face026d6f60fb7d34aded jdk7u6-b31 +78e01a6ca8d30e8fc4eb297d297a098edfb3fec6 jdk7u7-b10 +9666d4e4bbf3f80614e246d5c15df86154544013 jdk7u7-b30 +94154c14973aee7c5ff4846af7bcb71fe7a82fa5 jdk7u7-b11 +f93d2e3b2610b612401c95dd56d1a1122d35f676 jdk7u7-b31 +94a7d51992ae6fd31f9adc15c4976d6354dca14d jdk7u7-b01 +901c290c9c8b495a2696f10a87523363239d001b jdk7u7-b02 +0e2200a8762c1fdbd1ea812ba3f6535245372c81 jdk7u9-b03 +0000000000000000000000000000000000000000 jdk7u7-b01 +94a7d51992ae6fd31f9adc15c4976d6354dca14d jdk7u9-b01 +0000000000000000000000000000000000000000 jdk7u7-b02 +901c290c9c8b495a2696f10a87523363239d001b jdk7u9-b02 +7302c386ca9c6cd20c27d0a2adb0b142f679d6b3 jdk7u9-b04 +ffad06d7009576c3098705e05452ebc309a59e56 jdk7u9-b05 +3b1a395f1948c7063d342a0c3e26c8450c6e7acb jdk7u9-b31 +77f7e5f13763fed11afb6e12840d78bd55c2d979 jdk7u9-b32 +c1efb11d7db509dafd7882811b2562ba593f6431 jdk7u10-b10 +0243e41000c6f76654725cac31ffdc95633c63e7 jdk7u10-b11 +c86a49dd4a0dca3a56f00429cfcffb2ad5f2a224 jdk7u10-b12 +c6de70ed568d190c9c7d9641b88b9b5f1bc36fd5 jdk7u10-b13 +abe96e9e10f973cf0fdacc1475e69a274ef76fcf jdk7u10-b14 +c9a0e381cd8eaf62bcacfd59b01c249de81ae167 jdk7u10-b15 +ed59989fb0635f2d4461173e218c43494f06bb82 jdk7u10-b16 +a1c5bac982a6d4aa58f551cb46cde53f526aca48 jdk7u10-b17 +115d1e4365293846bbc911cf312886c471e37fbd jdk7u10-b18 +84218dff5e4c7bc00fd9266769c0d12bdde866f5 jdk7u10-b30 +3515fd583ede49b125a0b5f72ac403b3984d199b jdk7u10-b31 +ecc14534318c80dc7612c8b1d328a67849c5b07f jdk7u11-b20 +d9969a953f693f5760b1d2759f11a2cb222e4f20 jdk7u11-b21 +c7282a85c6bcc717b7099a03db028ecb77b41098 jdk7u11-b32 +8fd5e105c6a288b01f8809a6c84a5a64a63f39be jdk7u11-b33 +84da14fbd3ac12a3c6734fa4b6a366cfde1426af jdk7u11-b03 +932ef74edbf984299a68c126c70bbe04ffbde9b5 jdk7u11-b04 +fb35fb91f6478f8076993bcc4112746bcd9a2985 jdk7u11-b05 +f26def552d2c4873aeaee00241f60efc462a11a7 jdk7u11-b06 +1d14a3d7bac870423e52a889d2f5f60ee76ddc6a jdk7u11-b07 +ee61b528b3f866b20095f5e9593896d4ea4be468 jdk7u11-b08 +0b9564dab118d40bc5edc60269f736f97ab6f385 jdk7u13-b09 +0000000000000000000000000000000000000000 icedtea-2.3.6 +5e57911564beda267157195361fe7dd70457822f icedtea-2.3.6 +4b2d9db27e29232933c8f80fcb6a462b5e892cd5 icedtea-2.3.7 +4b2d9db27e29232933c8f80fcb6a462b5e892cd5 icedtea-2.3.7 +0000000000000000000000000000000000000000 icedtea-2.3.7 +0000000000000000000000000000000000000000 icedtea-2.3.7 +22461cb8daf1b193b2bdd323afecb26149577bd8 icedtea-2.3.7 +22461cb8daf1b193b2bdd323afecb26149577bd8 icedtea-2.3.7 +0000000000000000000000000000000000000000 icedtea-2.3.7 +0000000000000000000000000000000000000000 icedtea-2.3.7 +afc09edc979709bd0cf9abb342704dbe6587123e icedtea-2.3.7 +4f97a6256473be83ea10038ff236a28176691f4a icedtea-2.3.8 +cbbb166b38eb15f5d5c68e913ee18f6f352b7af0 jdk7u13-b10 +28700a56b69d80e70aecf230ab7f9ad4bb5acf23 jdk7u13-b30 +8eb180a284b0911b2645d5cbdff5be499a75d6b2 jdk7u13-b20 +835448d525a10bb826f4f7ebe272fc410bdb0f5d jdk7u15-b01 +0443fe2d8023111b52f4c8db32e038f4a5a9f373 jdk7u15-b02 +70b0f967c0649c501fb14a27bb06daeccbff823a jdk7u15-b30 +9f20468265071696b4d2ece286bc228a4d5a302a jdk7u15-b31 +3ef25219292f57ea56ac0ef338ceadf5fd098bdf jdk7u15-b33 +87e45d30e24db726ea03b20d861f0a025e437641 jdk7u15-b03 +b5ae6fb92e71df1833221026efe50863593bf682 jdk7u17-b01 +8e91101e36f0e0bcb68036c32c69dda38e79b118 icedtea-2.3.9 +b130c8cfecfc552614047b3244d5d94439827fcd jdk7u17-b02 +a474615061bf610105a426780a7ac4c95bd76456 jdk7u17-b30 +1ad6f413e250bd2671b4908e232bd0d244c917a7 jdk7u17-b31 +6c6b9d7943e78d1f797b0c2e1c1231f81816dfde jdk7u17-b32 +8261e56b7f91c7553e8485b206bdc9030a3546e4 jdk7u21-b01 +af6be9d7aed7c323858932c908b049f4bcdb6a3e jdk7u21-b05 +ffc1454e644a39265cd6d80ef4b4c12c5dbf35c9 jdk7u21-b06 +b453d9be6b3f5496aa217ade7478d3b7fa32b13b jdk7u21-b07 +de4e41c5c549136209a68154d847cf126e563b88 jdk7u21-b08 +622aedcdda610a148a082558a0c25d8b3b735d07 jdk7u21-b09 +f447c3bbf074439ece0ce9fea82c857f93817801 jdk7u21-b10 +f9323b9d020ce8d313af2d2e2682e2b6cabcc40d jdk7u21-b11 +08ed0bfc9668f04ce4e3803f16aad92f6e50f885 jdk7u21-b30 +f3cf02a53684b9fbefabb212c80dfbea0c27f113 jdk7u21-b12 +a5e712ea6944b1c81bcd5343a50645964f12b107 jdk7u21-b02 +9d87f5f84afef6ba4c92523a76e3c81fd9acfa00 jdk7u21-b03 +139d3e3b62d49374112ce1add84cd3d1e5ed5335 jdk7u21-b04 +7fd0922d6ed2988954c666de313f7fceef75dc63 jdk7u25-b01 +846304f476f1b1d2955d025d54307be76c3c4874 jdk7u25-b02 +2a444d8e36ebc7161a735b45143b22e141d9a5c0 jdk7u25-b03 +7fc6c331082c3586fa6c6ead014c96f3c532bc34 jdk7u25-b04 +f2d4da9ba0f05165e8a85d0fd5085d707e434eab jdk7u25-b05 +5748526c96f0d3fd5771b72a81fcd61f4e23b0d8 jdk7u25-b06 +fe514475bc17355f5f0a8dc7dd423d0043ed5326 jdk7u25-b07 +f8373784a79eba32b47e655cc5880f594a12423c jdk7u25-b08 +023297d5b047c0b6c54869d6514fa3c1427c206c jdk7u25-b09 +c82ed89b21bcb5279ff2fd4bc54127cd580dea7e jdk7u25-b10 +ef5d29607ccee9712f2c768f269e4b9fa53a6859 jdk7u25-b11 +39282f16234385bbddd19189de2450f8bf88492b jdk7u25-b12 +ba6c3d64b94d17d90b86e36b7a282480a1c6808a jdk7u25-b13 +a71103b8cbb155a4af136baaee4f4bdd30ee817c jdk7u25-b14 +e1768e2070c938ec97325ad48b0d281e3031a29c jdk7u25-b15 diff -r 8c2c5d63a17e -r bd392c168d5c .jcheck/conf --- a/.jcheck/conf Mon Aug 13 14:20:05 2012 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 8c2c5d63a17e -r bd392c168d5c make/com/oracle/security/ucrypto/Makefile --- a/make/com/oracle/security/ucrypto/Makefile Mon Aug 13 14:20:05 2012 -0700 +++ b/make/com/oracle/security/ucrypto/Makefile Fri Jun 21 15:46:14 2013 -0500 @@ -198,9 +198,9 @@ # # Build ucrypto.jar. # - $(UNSIGNED_DIR)/ucrypto.jar: build + $(UNSIGNED_DIR)/ucrypto.jar: build $(JCE_MANIFEST_FILE) $(prep-target) - $(BOOT_JAR_CMD) cf $@ $(JAR_DIRS) \ + $(BOOT_JAR_CMD) cmf $(JCE_MANIFEST_FILE) $@ $(JAR_DIRS) \ $(BOOT_JAR_JFLAGS) @$(java-vm-cleanup) diff -r 8c2c5d63a17e -r bd392c168d5c make/com/sun/java/pack/Makefile --- a/make/com/sun/java/pack/Makefile Mon Aug 13 14:20:05 2012 -0700 +++ b/make/com/sun/java/pack/Makefile Fri Jun 21 15:46:14 2013 -0500 @@ -32,6 +32,7 @@ LIBRARY = unpack PRODUCT = sun PGRM = unpack200 +JAVAC_MAX_WARNINGS=true include $(BUILDDIR)/common/Defs.gmk CPLUSPLUSLIBRARY=true @@ -57,7 +58,6 @@ vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR) ifeq ($(STANDALONE),true) - ifneq ($(SYSTEM_ZLIB),true) ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME) ZIPOBJS = $(ZIPOBJDIR)/zcrc32.$(OBJECT_SUFFIX) \ @@ -71,13 +71,14 @@ $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \ $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX) - ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) - OTHER_CXXFLAGS += $(ZINCLUDE) - LDDFLAGS += $(ZIPOBJS) - else - LDDFLAGS += -lz - OTHER_CXXFLAGS += -DSYSTEM_ZLIB - endif + ifdef USE_SYSTEM_ZLIB + OTHER_CXXFLAGS += $(ZLIB_CFLAGS) -DUSE_SYSTEM_ZLIB=1 + OTHER_LDLIBS += $(ZLIB_LIBS) + else + ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) + OTHER_CXXFLAGS += $(ZINCLUDE) + LDDFLAGS += $(ZIPOBJS) + endif else OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI OTHER_LDLIBS += $(JVMLIB) @@ -99,8 +100,7 @@ RES = $(OBJDIR)/$(PGRM).res else LDOUTPUT = -o #Have a space - LDDFLAGS += -lc - OTHER_LDLIBS += $(LIBCXX) + OTHER_LDLIBS += -lc $(LIBCXX) # setup the list of libraries to link in... ifeq ($(PLATFORM), linux) ifeq ("$(CC_VER_MAJOR)", "3") @@ -157,7 +157,7 @@ $(prep-target) $(RM) $(TEMPDIR)/mapfile-vers $(CP) mapfile-vers-unpack200 $(TEMPDIR)/mapfile-vers - $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX) + $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(OTHER_LDLIBS) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX) ifdef MT $(MT) /manifest $(OBJDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1 endif diff -r 8c2c5d63a17e -r bd392c168d5c make/com/sun/nio/sctp/Makefile --- a/make/com/sun/nio/sctp/Makefile Mon Aug 13 14:20:05 2012 -0700 +++ b/make/com/sun/nio/sctp/Makefile Fri Jun 21 15:46:14 2013 -0500 @@ -60,7 +60,9 @@ -I$(CLASSHDRDIR)/../../../../java/java.nio/nio/CClassHeaders ifeq ($(PLATFORM), linux) +ifneq ($(COMPILER_WARNINGS_FATAL),false) COMPILER_WARNINGS_FATAL=true +endif #OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread -ldl endif diff -r 8c2c5d63a17e -r bd392c168d5c make/common/Defs-linux.gmk --- a/make/common/Defs-linux.gmk Mon Aug 13 14:20:05 2012 -0700 +++ b/make/common/Defs-linux.gmk Fri Jun 21 15:46:14 2013 -0500 @@ -191,15 +191,26 @@ # We need this frame pointer to make it easy to walk the stacks. # This should be the default on X86, but ia64 and amd64 may not have this # as the default. +CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN +CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN +CFLAGS_REQUIRED_hppa += CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN +CFLAGS_REQUIRED_m68k += +CFLAGS_REQUIRED_mips += +CFLAGS_REQUIRED_mipsel += -D_LITTLE_ENDIAN +CFLAGS_REQUIRED_ppc += -m32 +CFLAGS_REQUIRED_ppc64 += -m64 +CFLAGS_REQUIRED_s390 += +CFLAGS_REQUIRED_s390x += -m64 CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9 LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9 CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9 LDFLAGS_COMMON_sparc += -m32 -mcpu=v9 CFLAGS_REQUIRED_arm += -fsigned-char -D_LITTLE_ENDIAN CFLAGS_REQUIRED_ppc += -fsigned-char -D_BIG_ENDIAN +CFLAGS_REQUIRED_sh += -mieee ifeq ($(ZERO_BUILD), true) CFLAGS_REQUIRED = $(ZERO_ARCHFLAG) ifeq ($(ZERO_ENDIANNESS), little) @@ -289,11 +300,15 @@ CPP_ARCH_FLAGS = -DARCH='"$(ARCH)"' -# Alpha arch does not like "alpha" defined (potential general arch cleanup issue here) -ifneq ($(ARCH),alpha) +# Alpha and sh archs do not like "alpha" or "sh" defined (potential general arch cleanup issue here) +ifeq ($(ARCH),alpha) + CPP_ARCH_FLAGS += -D_$(ARCH)_ +else +ifeq ($(ARCH),sh) + CPP_ARCH_FLAGS += -D_$(ARCH)_ +else CPP_ARCH_FLAGS += -D$(ARCH) -else - CPP_ARCH_FLAGS += -D_$(ARCH)_ +endif endif CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -DLINUX $(VERSION_DEFINES) \ diff -r 8c2c5d63a17e -r bd392c168d5c make/common/Defs.gmk --- a/make/common/Defs.gmk Mon Aug 13 14:20:05 2012 -0700 +++ b/make/common/Defs.gmk Fri Jun 21 15:46:14 2013 -0500 @@ -312,6 +312,7 @@ JDK_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2sdk-image JRE_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2re-image +JDK_SERVER_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2sdk-server-image #where the demo source can be found DEMOSRCDIR = $(SHARE_SRC)/demo diff -r 8c2c5d63a17e -r bd392c168d5c make/common/Library.gmk --- a/make/common/Library.gmk Mon Aug 13 14:20:05 2012 -0700 +++ b/make/common/Library.gmk Fri Jun 21 15:46:14 2013 -0500 @@ -269,6 +269,7 @@ ifneq ($(PLATFORM), macosx) ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1) + ifneq ($(STRIP_POLICY),no_strip) ifeq ($(PLATFORM), solaris) # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from @@ -279,19 +280,20 @@ # # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. - (set -e ; \ - $(CD) $(@D) ; \ - $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \ - $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ - $(ADD_GNU_DEBUGLINK) $(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \ - ) + (set -e ; \ + $(CD) $(@D) ; \ + $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \ + $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ + $(ADD_GNU_DEBUGLINK) $(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \ + ) else # PLATFORM != solaris - (set -e ; \ - $(CD) $(@D) ; \ - $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ - $(OBJCOPY) --add-gnu-debuglink=$(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \ - ) - endif # PLATFORM == solaris + (set -e ; \ + $(CD) $(@D) ; \ + $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ + $(OBJCOPY) --add-gnu-debuglink=$(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \ + ) + endif # PLATFORM == solaris + endif # STRIP_POLICY != no_strip ifeq ($(STRIP_POLICY),all_strip) $(STRIP) $@ else @@ -305,12 +307,14 @@ # implied else here is no stripping at all endif endif - ifeq ($(ZIP_DEBUGINFO_FILES),1) - (set -e ; \ - $(CD) $(@D) ; \ - $(ZIPEXE) -q $(LIB_PREFIX)$(LIBRARY).diz $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ - $(RM) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ - ) + ifneq ($(STRIP_POLICY),no_strip) + ifeq ($(ZIP_DEBUGINFO_FILES),1) + (set -e ; \ + $(CD) $(@D) ; \ + $(ZIPEXE) -q $(LIB_PREFIX)$(LIBRARY).diz $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ + $(RM) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ + ) + endif endif endif # LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS endif # ENABLE_FULL_DEBUG_SYMBOLS diff -r 8c2c5d63a17e -r bd392c168d5c make/common/Program.gmk --- a/make/common/Program.gmk Mon Aug 13 14:20:05 2012 -0700 +++ b/make/common/Program.gmk Fri Jun 21 15:46:14 2013 -0500 @@ -62,12 +62,14 @@ program: $(ACTUAL_PROGRAM) # Work-around for missing processor specific mapfiles +ifneq (,$(filter $(ARCH), amd64 i586 sparc sparcv9)) ifndef CROSS_COMPILE_ARCH # reuse the mapfiles in the launcher's directory, the same should # be applicable to the tool launchers as well. FILES_m = $(BUILDDIR)/java/main/java/mapfile-$(ARCH) include $(BUILDDIR)/common/Mapfile-vers.gmk endif +endif include $(JDK_TOPDIR)/make/common/Rules.gmk @@ -108,6 +110,9 @@ endif # ARCH_DATA_MODEL endif # PLATFORM SOLARIS ifeq ($(PLATFORM), linux) + ifdef USE_SYSTEM_ZLIB + OTHER_LDLIBS += $(ZLIB_LIBS) + endif LDFLAGS += $(LDFLAG_Z_ORIGIN) LDFLAGS += -Wl,--allow-shlib-undefined LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli @@ -126,6 +131,26 @@ endif # PLATFORM # +# Applications expect to be able to link against libjawt without invoking +# System.loadLibrary("jawt") first. This was the behaviour described in the +# devloper documentation of JAWT and what worked with OpenJDK6. +# +ifeq ($(PLATFORM), solaris) + ifeq ($(ARCH_DATA_MODEL), 32) + LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH) + LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH) + else # ! ARCH_DATA_MODEL 64-bit + LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH) + LDFLAGS += -R \$$ORIGIN/../../jre/lib/$(LIBARCH) + endif # ARCH_DATA_MODEL +endif # PLATFORM SOLARIS +ifeq ($(PLATFORM), linux) + LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH) + LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH) +endif # PLATFORM LINUX + + +# # Launcher specific files. # FILES_o = $(OBJDIR)/main.$(OBJECT_SUFFIX) @@ -153,7 +178,6 @@ ifndef LOCAL_RESOURCE_FILE @$(ECHO) $(OBJDIR)/$(PROGRAM).res >> $@ endif # LOCAL_RESOURCE_FILE - @$(ECHO) setargv.obj >> $@ @$(ECHO) Created $@ $(ACTUAL_PROGRAM):: $(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX) @@ -251,7 +275,8 @@ ifneq ($(PLATFORM), macosx) ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ifeq ($(PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS),1) - ifeq ($(PLATFORM), solaris) + ifneq ($(STRIP_POLICY),no_strip) + ifeq ($(PLATFORM), solaris) # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from # empty section headers until a fixed $(OBJCOPY) is available. @@ -261,19 +286,20 @@ # # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. - (set -e ; \ - $(CD) $(@D) ; \ - $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \ - $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \ - $(ADD_GNU_DEBUGLINK) $(@F).debuginfo $(@F) ; \ - ) - else # PLATFORM != solaris - (set -e ; \ - $(CD) $(@D) ; \ - $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \ - $(OBJCOPY) --add-gnu-debuglink=$(@F).debuginfo $(@F) ; \ - ) - endif # PLATFORM == solaris + (set -e ; \ + $(CD) $(@D) ; \ + $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \ + $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \ + $(ADD_GNU_DEBUGLINK) $(@F).debuginfo $(@F) ; \ + ) + else # PLATFORM != solaris + (set -e ; \ + $(CD) $(@D) ; \ + $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \ + $(OBJCOPY) --add-gnu-debuglink=$(@F).debuginfo $(@F) ; \ + ) + endif # PLATFORM == solaris + endif ifeq ($(STRIP_POLICY),all_strip) $(STRIP) $@ else From bugzilla-daemon at icedtea.classpath.org Sat Jun 22 18:38:01 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 23 Jun 2013 01:38:01 +0000 Subject: [Bug 1486] New: Fatal error problematic frame: libGL.so Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1486 Bug ID: 1486 Summary: Fatal error problematic frame: libGL.so Classification: Unclassified Product: IcedTea Version: unspecified Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: YumekuiNeru at hotmail.com CC: unassigned at icedtea.classpath.org Created attachment 893 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=893&action=edit Error report file Attempting to load the FunOrb game Tomb Racer with the RSU RuneScape client using Icedtea7 causes a crash as soon as loading finishes. http://tomb2.funorb.com/a=289/tombracer/8179/game.ws ( http://tomb2.funorb.com/a=289/tombracer/8179/jav_config.ws ) Attached below is the error report file. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130623/63dd09b3/attachment.html From bugzilla-daemon at icedtea.classpath.org Sat Jun 22 18:39:26 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 23 Jun 2013 01:39:26 +0000 Subject: [Bug 1486] Fatal error problematic frame: libGL.so In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1486 --- Comment #1 from YumekuiNeru at hotmail.com --- Created attachment 894 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=894&action=edit Output after launching client that led up to crash -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130623/8f7f5193/attachment.html From andrew at icedtea.classpath.org Sun Jun 23 08:54:25 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Sun, 23 Jun 2013 15:54:25 +0000 Subject: /hg/release/icedtea7-forest-2.3: Added tag icedtea-2.3.10 for ch... Message-ID: changeset f143f229bd12 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=f143f229bd12 author: andrew date: Sun Jun 23 16:53:43 2013 +0100 Added tag icedtea-2.3.10 for changeset fb1ac57ada6c diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r fb1ac57ada6c -r f143f229bd12 .hgtags --- a/.hgtags Wed May 22 17:41:59 2013 +0100 +++ b/.hgtags Sun Jun 23 16:53:43 2013 +0100 @@ -261,3 +261,4 @@ 2412f7b8551ede5296cb6e1d6189f40aad9eeffe jdk7u15-b32 0c2b2dae93e7a720bbcc2e13a1913a2264335554 jdk7u17-b01 12b96a57263c1215818f4d1abfb6dc8b4bc6b436 icedtea-2.3.9 +fb1ac57ada6c9de6313982f0ab63276547b8819b icedtea-2.3.10 From andrew at icedtea.classpath.org Sun Jun 23 08:54:37 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Sun, 23 Jun 2013 15:54:37 +0000 Subject: /hg/release/icedtea7-forest-2.3/corba: Added tag icedtea-2.3.10 ... Message-ID: changeset eda3895cb67e in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=eda3895cb67e author: andrew date: Sun Jun 23 16:53:44 2013 +0100 Added tag icedtea-2.3.10 for changeset 8e581b671511 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 8e581b671511 -r eda3895cb67e .hgtags --- a/.hgtags Mon Apr 08 23:12:03 2013 +0100 +++ b/.hgtags Sun Jun 23 16:53:44 2013 +0100 @@ -261,3 +261,4 @@ b192d148731916e4b1b47b7a3e6b0a1d7ddf3f14 jdk7u15-b32 94e8b9b0e0ef1685e2f2fcc886e08a42a85c8e03 jdk7u17-b01 47a6bf94ce11644ba0f1dc4f251f61ccd1b78c34 icedtea-2.3.9 +8e581b67151110a223a6f42a135193261a551a0d icedtea-2.3.10 From andrew at icedtea.classpath.org Sun Jun 23 08:54:52 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Sun, 23 Jun 2013 15:54:52 +0000 Subject: /hg/release/icedtea7-forest-2.3/jaxp: Added tag icedtea-2.3.10 f... Message-ID: changeset 181faea8867b in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=181faea8867b author: andrew date: Sun Jun 23 16:53:45 2013 +0100 Added tag icedtea-2.3.10 for changeset 1a02956fcfaf diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 1a02956fcfaf -r 181faea8867b .hgtags --- a/.hgtags Wed May 22 17:42:01 2013 +0100 +++ b/.hgtags Sun Jun 23 16:53:45 2013 +0100 @@ -261,3 +261,4 @@ eb9d57159e5126cf4316c9571ac39324a8b442a8 jdk7u15-b32 8a9867ee429440b657eb5852c4dae5f029356022 jdk7u17-b01 d2142901bcb789071858ae249d5a29f12d8bce78 icedtea-2.3.9 +1a02956fcfaf708c626e06105dbf615594af88f7 icedtea-2.3.10 From andrew at icedtea.classpath.org Sun Jun 23 08:55:03 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Sun, 23 Jun 2013 15:55:03 +0000 Subject: /hg/release/icedtea7-forest-2.3/jaxws: Added tag icedtea-2.3.10 ... Message-ID: changeset 5dc89903bfc7 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=5dc89903bfc7 author: andrew date: Sun Jun 23 16:53:47 2013 +0100 Added tag icedtea-2.3.10 for changeset c0e829bfbf62 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r c0e829bfbf62 -r 5dc89903bfc7 .hgtags --- a/.hgtags Thu Mar 21 11:08:05 2013 -0400 +++ b/.hgtags Sun Jun 23 16:53:47 2013 +0100 @@ -261,3 +261,4 @@ c7ea4220ad61b125bd7c4b7f112dd9ff18e9be33 jdk7u15-b32 b8496d1dc0058341da1790bc2e7d2dbba6d4f90e jdk7u17-b01 b1877762d45c1117b5476cf78400ae9affe1b76d icedtea-2.3.9 +c0e829bfbf6281c829e0f6af051b96a9eba0052f icedtea-2.3.10 From andrew at icedtea.classpath.org Sun Jun 23 08:55:14 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Sun, 23 Jun 2013 15:55:14 +0000 Subject: /hg/release/icedtea7-forest-2.3/langtools: Added tag icedtea-2.3... Message-ID: changeset e2c5f493844a in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=e2c5f493844a author: andrew date: Sun Jun 23 16:53:49 2013 +0100 Added tag icedtea-2.3.10 for changeset 8cf15d334ad3 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 8cf15d334ad3 -r e2c5f493844a .hgtags --- a/.hgtags Wed Jun 05 14:31:54 2013 -0700 +++ b/.hgtags Sun Jun 23 16:53:49 2013 +0100 @@ -261,3 +261,4 @@ a778aaf53c52f78c92f29a1220d9f46de94c9247 jdk7u15-b32 edfcf07c2877af8efa649e514167b22b7f6fc0b4 jdk7u17-b01 fd956199cb8213f9af95b694ebdde6aa1fd7f53a icedtea-2.3.9 +8cf15d334ad372f540d7504212cc21ff7a223852 icedtea-2.3.10 From andrew at icedtea.classpath.org Sun Jun 23 08:55:26 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Sun, 23 Jun 2013 15:55:26 +0000 Subject: /hg/release/icedtea7-forest-2.3/hotspot: Added tag icedtea-2.3.1... Message-ID: changeset 7e85081672b2 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=7e85081672b2 author: andrew date: Sun Jun 23 16:53:51 2013 +0100 Added tag icedtea-2.3.10 for changeset 4e374ade4066 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 4e374ade4066 -r 7e85081672b2 .hgtags --- a/.hgtags Fri Apr 05 08:36:12 2013 -0400 +++ b/.hgtags Sun Jun 23 16:53:51 2013 +0100 @@ -386,3 +386,4 @@ 34a7b6dda06e2ff6f7e9ad563e3fc3ecd8993579 jdk7u15-b32 a4dfda7a2655209abb170b2fa4914dbbba89bcd3 jdk7u17-b01 ad5a321edea22c86af5c7844ed49f7b6105ab7ff icedtea-2.3.9 +4e374ade4066e340199c6f2371769e9aa2852282 icedtea-2.3.10 From andrew at icedtea.classpath.org Sun Jun 23 08:55:37 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Sun, 23 Jun 2013 15:55:37 +0000 Subject: /hg/release/icedtea7-forest-2.3/jdk: Added tag icedtea-2.3.10 fo... Message-ID: changeset 0a482b2f7c35 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=0a482b2f7c35 author: andrew date: Sun Jun 23 16:54:05 2013 +0100 Added tag icedtea-2.3.10 for changeset bd392c168d5c diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r bd392c168d5c -r 0a482b2f7c35 .hgtags --- a/.hgtags Fri Jun 21 15:46:14 2013 -0500 +++ b/.hgtags Sun Jun 23 16:54:05 2013 +0100 @@ -316,3 +316,4 @@ ba6c3d64b94d17d90b86e36b7a282480a1c6808a jdk7u25-b13 a71103b8cbb155a4af136baaee4f4bdd30ee817c jdk7u25-b14 e1768e2070c938ec97325ad48b0d281e3031a29c jdk7u25-b15 +bd392c168d5c0e44f05f50fd0e0a1f90443bf897 icedtea-2.3.10 From jvanek at redhat.com Mon Jun 24 03:27:32 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 24 Jun 2013 12:27:32 +0200 Subject: [rfc][icedtea-web] fix (And tests) for PR1473 In-Reply-To: <51C46DA6.2020101@redhat.com> References: <51B5B02E.7020001@redhat.com> <51B5EFA8.1010601@redhat.com> <51B6329B.9010402@redhat.com> <51B70B80.4070809@redhat.com> <51B724F6.5000602@redhat.com> <51C460D0.1090309@redhat.com> <51C46DA6.2020101@redhat.com> Message-ID: <51C81F14.6010306@redhat.com> On 06/21/2013 05:13 PM, Adam Domurad wrote: > >>> >>> OK we discussed this more on IRC and I think we're agreed: >>> - Don't redownload if no href (already the case) >>> - Don't redownload if not local file (needs to be added) >>> >>> The case where you save the JNLP and immediately launch it >>> unfortunately does redownload, we can >>> however do some timestamp check if you really do not like this. >>> Other than that ideally the caching system would be allow for a simple >>> HEAD request to determine if >>> the JNLP needs to be updated, instead of a full redownload. >> >> >> ook, try this:) > > Thanks for the update! I would like to backport this to 1.4 also. >> > > Patch: > >> diff -r a236aa5f729b netx/net/sourceforge/jnlp/Launcher.java >> --- a/netx/net/sourceforge/jnlp/Launcher.java Fri Jun 21 12:15:03 2013 +0200 >> +++ b/netx/net/sourceforge/jnlp/Launcher.java Fri Jun 21 16:13:37 2013 +0200 >> @@ -260,30 +260,18 @@ >> return tg.getApplication(); >> } >> >> - /** >> - * Launches a JNLP file by calling the launch method for the >> - * appropriate file type. >> - * >> - * @param location the URL of the JNLP file to launch >> - * @throws LaunchException if there was an exception >> - * @return the application instance >> - */ >> - public ApplicationInstance launch(URL location) throws LaunchException { >> - return launch(toFile(location)); >> - } >> >> /** >> * Launches a JNLP file by calling the launch method for the >> * appropriate file type. >> * >> * @param location the URL of the JNLP file to launch >> - * @param fromSource if true, the JNLP file will be re-read from the source >> * location to get the pristine version >> * @throws LaunchException if there was an exception >> * @return the application instance >> */ >> - public ApplicationInstance launch(URL location, boolean fromSource) throws LaunchException { >> - return launch(fromUrl(location, fromSource)); >> + public ApplicationInstance launch(URL location) throws LaunchException { >> + return launch(fromUrl(location)); >> } >> >> /** >> @@ -372,28 +360,7 @@ >> } >> } >> >> - /** >> - * Launches a JNLP file by calling the launch method for the >> - * appropriate file type in a different thread. >> - * >> - * @param file the JNLP file to launch >> - */ >> - public void launchBackground(JNLPFile file) { >> - BgRunner runner = new BgRunner(file, null); >> - new Thread(runner).start(); >> - } >> - >> - /** >> - * Launches the JNLP file at the specified location in the >> - * background by calling the launch method for its file type. >> - * >> - * @param location the location of the JNLP file >> - */ >> - public void launchBackground(URL location) { >> - BgRunner runner = new BgRunner(null, location); >> - new Thread(runner).start(); >> - } >> - >> + >> /** >> * Launches the JNLP file in a new JVM instance. The launched >> * application's output is sent to the system out and it's >> @@ -473,62 +440,36 @@ >> /** >> * Returns the JNLPFile for the URL, with error handling. >> */ >> - private JNLPFile fromUrl(URL location, boolean fromSource) throws LaunchException { >> + private JNLPFile fromUrl(URL location) throws LaunchException { >> try { >> JNLPFile file = null; >> >> file = new JNLPFile(location, parserSettings); >> + >> + boolean isLocal = false; >> + boolean haveHref = false; >> + if ("file".equalsIgnoreCase(location.getProtocol()) && new >> File(location.getFile()).exists()) { > > Hm, why does it have to exist to be local (current logic == only redownload if it exists) ? Anyway, > its probably harmless either way > >> + isLocal = true; >> + } >> + if (file.getSourceLocation() != null) { >> + haveHref = true; >> + } >> >> - if (fromSource) { >> - // Launches the jnlp file where this file originated. >> - if (file.getSourceLocation() != null) { >> - file = new JNLPFile(file.getSourceLocation(), parserSettings); >> - } >> + if (isLocal && haveHref) { >> + file = new JNLPFile(file.getSourceLocation(), parserSettings); >> } >> return file; >> } catch (Exception ex) { >> - if (ex instanceof LaunchException) >> + if (ex instanceof LaunchException) { >> throw (LaunchException) ex; // already sent to handler when first thrown >> - else >> + } else { >> // IO and Parse >> throw launchError(new LaunchException(null, ex, R("LSFatal"), R("LCReadError"), >> R("LCantRead"), R("LCantReadInfo"))); >> + } >> } >> } >> >> - /** >> - * Returns the JNLPFile for the URL, with error handling. >> - */ >> - @Deprecated >> - private JNLPFile toFile(URL location) throws LaunchException { >> - try { >> - JNLPFile file = null; >> - >> - try { >> - ParserSettings settings = new ParserSettings(true, true, false); >> - file = new JNLPFile(location, (Version) null, settings, updatePolicy); // strict >> - } catch (ParseException ex) { >> - ParserSettings settings = new ParserSettings(false, true, true); >> - file = new JNLPFile(location, (Version) null, settings, updatePolicy); >> - >> - // only here if strict failed but lax did not fail >> - LaunchException lex = >> - launchWarning(new LaunchException(file, ex, R("LSMinor"), >> R("LCFileFormat"), R("LNotToSpec"), R("LNotToSpecInfo"))); >> - >> - if (lex != null) >> - throw lex; >> - } >> - >> - return file; >> - } catch (Exception ex) { >> - if (ex instanceof LaunchException) >> - throw (LaunchException) ex; // already sent to handler when first thrown >> - else >> - // IO and Parse >> - throw launchError(new LaunchException(null, ex, R("LSFatal"), R("LCReadError"), >> R("LCantRead"), R("LCantReadInfo"))); >> - } >> - } >> - >> - /** >> + /** >> * Launches a JNLP application. This method should be called >> * from a thread in the application's thread group. >> */ >> @@ -973,31 +914,6 @@ >> >> }; >> >> - /** >> - * This runnable is used by the launchBackground >> - * methods to launch a JNLP file from a separate thread. >> - */ >> - private class BgRunner implements Runnable { >> - private JNLPFile file; >> - private URL location; >> - >> - BgRunner(JNLPFile file, URL location) { >> - this.file = file; >> - this.location = location; >> - } >> - >> - public void run() { >> - try { >> - if (file != null) >> - launch(file); >> - if (location != null) >> - launch(location); >> - } catch (LaunchException ex) { >> - // launch method communicates error conditions to the >> - // handler if it exists, otherwise we don't care because >> - // there's nothing that can be done about the exception. >> - } >> - } >> - }; >> + > > I approve this sneak-in Not sneek! Those hunks would need some changes, and are useless so removal was thebest. > >> >> } >> diff -r a236aa5f729b netx/net/sourceforge/jnlp/runtime/Boot.java >> --- a/netx/net/sourceforge/jnlp/runtime/Boot.java Fri Jun 21 12:15:03 2013 +0200 >> +++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Fri Jun 21 16:13:37 2013 +0200 >> @@ -215,7 +215,7 @@ >> Launcher launcher = new Launcher(false); >> launcher.setParserSettings(settings); >> launcher.setInformationToMerge(extra); >> - launcher.launch(getFileLocation(), true); >> + launcher.launch(getFileLocation()); >> } catch (LaunchException ex) { >> // default handler prints this >> } catch (Exception ex) { >> diff -r a236aa5f729b tests/reproducers/simple/GeneratedId/resources/GeneratedId.jnlp >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/tests/reproducers/simple/GeneratedId/resources/GeneratedId.jnlp Fri Jun 21 16:13:37 2013 >> +0200 >> @@ -0,0 +1,51 @@ >> + >> + >> + >> + >> + >> + >> + Test Generated Id >> + IcedTea >> + >> + >> + >> + >> + >> + SomeId >> + >> + >> diff -r a236aa5f729b tests/reproducers/simple/GeneratedId/srcs/GeneratedId.java >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/tests/reproducers/simple/GeneratedId/srcs/GeneratedId.java Fri Jun 21 16:13:37 2013 +0200 >> @@ -0,0 +1,44 @@ >> +/* 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 GeneratedId { >> + static public void main(String[] args) { >> + for(int x = 0; x> + System.out.println(x+" - id: "+args[x]); >> + } >> + } >> +} >> diff -r a236aa5f729b tests/reproducers/simple/GeneratedId/testcases/GeneratedIdTest.java >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/tests/reproducers/simple/GeneratedId/testcases/GeneratedIdTest.java Fri Jun 21 16:13:37 >> 2013 +0200 >> @@ -0,0 +1,183 @@ >> +/* 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.io.File; >> +import java.io.FileInputStream; >> +import java.io.IOException; >> +import java.util.ArrayList; >> +import java.util.List; >> +import junit.framework.Assert; >> +import net.sourceforge.jnlp.ProcessResult; >> +import net.sourceforge.jnlp.ServerAccess; >> +import org.junit.Test; >> + >> +public class GeneratedIdTest { >> + >> + private static final ServerAccess server = new ServerAccess(); >> + private static final String okBase = "0 - id: "; >> + private static final String someId1 = "SomeId"; >> + private static final String someId2 = "AnotherId"; >> + private static final String okBase1 = okBase + someId1; >> + private static final String okBase2 = okBase + someId2; >> + private static final String baseName1 = "GeneratedId.jnlp"; >> + private static final String baseName1_noHref = "GeneratedIdNoHref.jnlp"; >> + private static final String baseName2 = "GeneratedId_1_tmp.jnlp"; >> + private static final String baseName2_noHref = "GeneratedIdNoHref_1_tmp.jnlp"; >> + >> + public static File prepareChangedFileWithHref() throws IOException { >> + File src = new File(server.getDir(), baseName1); >> + File dest = new File(server.getDir(), baseName2); >> + String srcJnlp = ServerAccess.getContentOfStream(new FileInputStream(src)); >> + ServerAccess.saveFile(srcJnlp.replace(someId1, someId2), dest); >> + return dest; >> + } >> + >> + public static File prepareChangedFileNoHref() throws IOException { >> + File src = new File(server.getDir(), baseName1); >> + File dest = new File(server.getDir(), baseName2_noHref); >> + String srcJnlp = ServerAccess.getContentOfStream(new FileInputStream(src)); >> + ServerAccess.saveFile(srcJnlp.replace(someId1, >> someId2).replace("href=\"GeneratedId.jnlp\"", ""), dest); >> + return dest; >> + } >> + >> + public static File prepareCopiedFileNoHref() throws IOException { >> + File src = new File(server.getDir(), baseName1); >> + File dest = new File(server.getDir(), baseName1_noHref); >> + String srcJnlp = ServerAccess.getContentOfStream(new FileInputStream(src)); >> + ServerAccess.saveFile(srcJnlp.replace("href=\"GeneratedId.jnlp\"", ""), dest); >> + return dest; >> + } >> + >> + @Test >> + //have href >> + //is local >> + //should be redownlaoded > > s/redownlaoded/redownloaded/ (for each comment) :-) > >> + //href points to different file >> + public void launchLocalChangedFileWithHref() throws Exception { >> + File dest = prepareChangedFileWithHref(); >> + List l = new ArrayList(3); >> + l.add(server.getJavawsLocation()); >> + l.add(ServerAccess.HEADLES_OPTION); >> + l.add(dest.getAbsolutePath()); >> + ProcessResult pr = ServerAccess.executeProcess(l); >> + Assert.assertTrue("Stdout should contain '" + okBase1 + "', but did not.", >> pr.stdout.contains(okBase1)); >> + } >> + >> + @Test >> + //do not have href >> + //is local >> + //should NOT be redownlaoded >> + public void launchLocalChangedFileWithNoHref() throws Exception { >> + File dest = prepareChangedFileNoHref(); >> + List l = new ArrayList(3); >> + l.add(server.getJavawsLocation()); >> + l.add(ServerAccess.HEADLES_OPTION); >> + l.add(dest.getAbsolutePath()); >> + ProcessResult pr = ServerAccess.executeProcess(l); >> + Assert.assertTrue("Stdout should contain '" + okBase2 + "', but did not.", >> pr.stdout.contains(okBase2)); >> + } >> + >> + @Test >> + //do have href > > [nit] space > >> + //is local >> + //should be redownlaoded (how to verify!?!) >> + public void launchLocalFileWithHref() throws Exception { >> + File dest = new File(server.getDir(), baseName1); >> + List l = new ArrayList(3); >> + l.add(server.getJavawsLocation()); >> + l.add(ServerAccess.HEADLES_OPTION); >> + l.add(dest.getAbsolutePath()); >> + ProcessResult pr = ServerAccess.executeProcess(l); >> + Assert.assertTrue("Stdout should contain '" + okBase1 + "', but did not.", >> pr.stdout.contains(okBase1)); >> + } >> + >> + @Test >> + //do have href > > Do NOT here. :-) > >> + //is local >> + //should NOT be redownlaoded (how to verify!?!) > > [nit] IMO unnecessary comment because there is no need to verify this. No href+local file -> no > place to possibly redownload from. > >> + public void launchLocalFileNoHref() throws Exception { >> + File dest = prepareCopiedFileNoHref(); >> + List l = new ArrayList(3); >> + l.add(server.getJavawsLocation()); >> + l.add(ServerAccess.HEADLES_OPTION); >> + l.add(dest.getAbsolutePath()); >> + ProcessResult pr = ServerAccess.executeProcess(l); >> + Assert.assertTrue("Stdout should contain '" + okBase1 + "', but did not.", >> pr.stdout.contains(okBase1)); >> + } >> + >> + @Test >> + //remote >> + //have href >> + //should not be redownlaoded (how to verify!?!) > > Although this one is trickier :-) > >> + //href is same file >> + public void launchRemoteFileWithHref() throws Exception { >> + ProcessResult pr = server.executeJavawsHeadless("/" + baseName1); >> + Assert.assertTrue("Stdout should contain '" + okBase1 + "', but did not.", >> pr.stdout.contains(okBase1)); >> + } >> + >> + //remote >> + //have href >> + //should NOT be redownlaoded >> + //href is different file >> + @Test >> + public void launchRemoteChangedFileWithHref() throws Exception { >> + File f = prepareChangedFileWithHref(); >> + ProcessResult pr = server.executeJavawsHeadless("/" + f.getName()); >> + Assert.assertTrue("Stdout should contain '" + okBase2 + "', but did not.", >> pr.stdout.contains(okBase2)); >> + } >> + >> + @Test >> + //remote >> + //have not href >> + //should not be redownlaoded (how to verify!?!) >> + //href is same file > > It has no href but 'href is same file' ?? > >> + public void launchRemoteFileWithNoHref() throws Exception { >> + File f = prepareCopiedFileNoHref(); >> + ProcessResult pr = server.executeJavawsHeadless("/" + f.getName()); >> + Assert.assertTrue("Stdout should contain '" + okBase1 + "', but did not.", >> pr.stdout.contains(okBase1)); >> + } >> + >> + //remote >> + //have not href >> + //should NOT be redownlaoded >> + //href is different file > > It has no href but 'href is different file' ?? > >> + @Test >> + public void launchRemoteChangedFileWithNoHref() throws Exception { >> + File f = prepareChangedFileNoHref(); >> + ProcessResult pr = server.executeJavawsHeadless("/" + f.getName()); >> + Assert.assertTrue("Stdout should contain '" + okBase2 + "', but did not.", >> pr.stdout.contains(okBase2)); >> + } >> +} > > > Thank you, mostly nits (beyond the typo). Address nits however you choose and push. all nits except the "fileExists" one fixed. Your eye was sharp as always. Thanx! From bugzilla-daemon at icedtea.classpath.org Mon Jun 24 03:28:08 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 24 Jun 2013 10:28:08 +0000 Subject: [Bug 1473] javaws should not depend on name of local file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1473 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from JiriVanek --- Redownlaoding was not caused by wrong name, but by effort to redownlaod everything. Fixe dnow in head and will go to 1.4 soon. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130624/3da1f891/attachment.html From jvanek at icedtea.classpath.org Mon Jun 24 03:30:03 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Mon, 24 Jun 2013 10:30:03 +0000 Subject: /hg/icedtea-web: JNLP file is now re-downloading only if is loca... Message-ID: changeset cedfb2895986 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=cedfb2895986 author: Jiri Vanek date: Mon Jun 24 12:29:46 2013 +0200 JNLP file is now re-downloading only if is local and have href. Real couse of PR1473 diffstat: ChangeLog | 18 + NEWS | 1 + netx/net/sourceforge/jnlp/Launcher.java | 124 +----- netx/net/sourceforge/jnlp/runtime/Boot.java | 2 +- tests/reproducers/simple/GeneratedId/resources/GeneratedId.jnlp | 51 ++ tests/reproducers/simple/GeneratedId/srcs/GeneratedId.java | 44 ++ tests/reproducers/simple/GeneratedId/testcases/GeneratedIdTest.java | 181 ++++++++++ tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java | 13 +- 8 files changed, 326 insertions(+), 108 deletions(-) diffs (truncated from 546 to 500 lines): diff -r ee92f55c69a3 -r cedfb2895986 ChangeLog --- a/ChangeLog Fri Jun 21 13:55:10 2013 -0400 +++ b/ChangeLog Mon Jun 24 12:29:46 2013 +0200 @@ -1,3 +1,21 @@ +2013-06-24 Jiri Vanek + + JNLP file is now re-downloading only if is local and have href + * /netx/net/sourceforge/jnlp/Launcher.java: (launch) api cleared + from (fromSource). (fromUrl) removed always re-downloading code and + replaced by conditional. (launchBackground), (toFile), (BgRunner) + removed. + * netx/net/sourceforge/jnlp/runtime/Boot.java: following new (launch) + * tests/reproducers/simple/GeneratedId/srcs/GeneratedId.java: just + arguments reprinting application + * tests/reproducers/simple/GeneratedId/testcases/GeneratedIdTest.java + various tests based on href/no href x local/remote jnlp files + * tests/reproducers/simple/GeneratedId/resources/GeneratedId.jnlp: base + simple jnlp with someId argument + * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: reprinting + the get/head correctly and with echo + * NEWS: mentioned PR1473 + 2013-06-21 Adam Domurad * plugin/icedteanp/IcedTeaScriptablePluginObject.cc: Simplify diff -r ee92f55c69a3 -r cedfb2895986 NEWS --- a/NEWS Fri Jun 21 13:55:10 2013 -0400 +++ b/NEWS Mon Jun 24 12:29:46 2013 +0200 @@ -15,6 +15,7 @@ - PR1465 - java.io.FileNotFoundException while trying to download a JAR file - Netx can now parse malformed jnlp files using tagsoup - PR1026 - Apps fail to run because of the nanoxml parser's strict XML validation + - PR1473 - javaws should not depend on name of local file * Plugin - PR854: Resizing an applet several times causes 100% CPU load diff -r ee92f55c69a3 -r cedfb2895986 netx/net/sourceforge/jnlp/Launcher.java --- a/netx/net/sourceforge/jnlp/Launcher.java Fri Jun 21 13:55:10 2013 -0400 +++ b/netx/net/sourceforge/jnlp/Launcher.java Mon Jun 24 12:29:46 2013 +0200 @@ -260,30 +260,18 @@ return tg.getApplication(); } - /** - * Launches a JNLP file by calling the launch method for the - * appropriate file type. - * - * @param location the URL of the JNLP file to launch - * @throws LaunchException if there was an exception - * @return the application instance - */ - public ApplicationInstance launch(URL location) throws LaunchException { - return launch(toFile(location)); - } /** * Launches a JNLP file by calling the launch method for the * appropriate file type. * * @param location the URL of the JNLP file to launch - * @param fromSource if true, the JNLP file will be re-read from the source * location to get the pristine version * @throws LaunchException if there was an exception * @return the application instance */ - public ApplicationInstance launch(URL location, boolean fromSource) throws LaunchException { - return launch(fromUrl(location, fromSource)); + public ApplicationInstance launch(URL location) throws LaunchException { + return launch(fromUrl(location)); } /** @@ -372,28 +360,7 @@ } } - /** - * Launches a JNLP file by calling the launch method for the - * appropriate file type in a different thread. - * - * @param file the JNLP file to launch - */ - public void launchBackground(JNLPFile file) { - BgRunner runner = new BgRunner(file, null); - new Thread(runner).start(); - } - - /** - * Launches the JNLP file at the specified location in the - * background by calling the launch method for its file type. - * - * @param location the location of the JNLP file - */ - public void launchBackground(URL location) { - BgRunner runner = new BgRunner(null, location); - new Thread(runner).start(); - } - + /** * Launches the JNLP file in a new JVM instance. The launched * application's output is sent to the system out and it's @@ -473,62 +440,36 @@ /** * Returns the JNLPFile for the URL, with error handling. */ - private JNLPFile fromUrl(URL location, boolean fromSource) throws LaunchException { + private JNLPFile fromUrl(URL location) throws LaunchException { try { JNLPFile file = null; file = new JNLPFile(location, parserSettings); + + boolean isLocal = false; + boolean haveHref = false; + if ("file".equalsIgnoreCase(location.getProtocol()) && new File(location.getFile()).exists()) { + isLocal = true; + } + if (file.getSourceLocation() != null) { + haveHref = true; + } - if (fromSource) { - // Launches the jnlp file where this file originated. - if (file.getSourceLocation() != null) { - file = new JNLPFile(file.getSourceLocation(), parserSettings); - } + if (isLocal && haveHref) { + file = new JNLPFile(file.getSourceLocation(), parserSettings); } return file; } catch (Exception ex) { - if (ex instanceof LaunchException) + if (ex instanceof LaunchException) { throw (LaunchException) ex; // already sent to handler when first thrown - else + } else { // IO and Parse throw launchError(new LaunchException(null, ex, R("LSFatal"), R("LCReadError"), R("LCantRead"), R("LCantReadInfo"))); + } } } - /** - * Returns the JNLPFile for the URL, with error handling. - */ - @Deprecated - private JNLPFile toFile(URL location) throws LaunchException { - try { - JNLPFile file = null; - - try { - ParserSettings settings = new ParserSettings(true, true, false); - file = new JNLPFile(location, (Version) null, settings, updatePolicy); // strict - } catch (ParseException ex) { - ParserSettings settings = new ParserSettings(false, true, true); - file = new JNLPFile(location, (Version) null, settings, updatePolicy); - - // only here if strict failed but lax did not fail - LaunchException lex = - launchWarning(new LaunchException(file, ex, R("LSMinor"), R("LCFileFormat"), R("LNotToSpec"), R("LNotToSpecInfo"))); - - if (lex != null) - throw lex; - } - - return file; - } catch (Exception ex) { - if (ex instanceof LaunchException) - throw (LaunchException) ex; // already sent to handler when first thrown - else - // IO and Parse - throw launchError(new LaunchException(null, ex, R("LSFatal"), R("LCReadError"), R("LCantRead"), R("LCantReadInfo"))); - } - } - - /** + /** * Launches a JNLP application. This method should be called * from a thread in the application's thread group. */ @@ -973,31 +914,6 @@ }; - /** - * This runnable is used by the launchBackground - * methods to launch a JNLP file from a separate thread. - */ - private class BgRunner implements Runnable { - private JNLPFile file; - private URL location; - - BgRunner(JNLPFile file, URL location) { - this.file = file; - this.location = location; - } - - public void run() { - try { - if (file != null) - launch(file); - if (location != null) - launch(location); - } catch (LaunchException ex) { - // launch method communicates error conditions to the - // handler if it exists, otherwise we don't care because - // there's nothing that can be done about the exception. - } - } - }; + } diff -r ee92f55c69a3 -r cedfb2895986 netx/net/sourceforge/jnlp/runtime/Boot.java --- a/netx/net/sourceforge/jnlp/runtime/Boot.java Fri Jun 21 13:55:10 2013 -0400 +++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Mon Jun 24 12:29:46 2013 +0200 @@ -215,7 +215,7 @@ Launcher launcher = new Launcher(false); launcher.setParserSettings(settings); launcher.setInformationToMerge(extra); - launcher.launch(getFileLocation(), true); + launcher.launch(getFileLocation()); } catch (LaunchException ex) { // default handler prints this } catch (Exception ex) { diff -r ee92f55c69a3 -r cedfb2895986 tests/reproducers/simple/GeneratedId/resources/GeneratedId.jnlp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/GeneratedId/resources/GeneratedId.jnlp Mon Jun 24 12:29:46 2013 +0200 @@ -0,0 +1,51 @@ + + + + + + + Test Generated Id + IcedTea + + + + + + SomeId + + diff -r ee92f55c69a3 -r cedfb2895986 tests/reproducers/simple/GeneratedId/srcs/GeneratedId.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/GeneratedId/srcs/GeneratedId.java Mon Jun 24 12:29:46 2013 +0200 @@ -0,0 +1,44 @@ +/* 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 GeneratedId { + static public void main(String[] args) { + for(int x = 0; x l = new ArrayList(3); + l.add(server.getJavawsLocation()); + l.add(ServerAccess.HEADLES_OPTION); + l.add(dest.getAbsolutePath()); + ProcessResult pr = ServerAccess.executeProcess(l); + Assert.assertTrue("Stdout should contain '" + okBase1 + "', but did not.", pr.stdout.contains(okBase1)); + } + + @Test + //do not have href + //is local + //should NOT be redownloaded + public void launchLocalChangedFileWithNoHref() throws Exception { + File dest = prepareChangedFileNoHref(); + List l = new ArrayList(3); + l.add(server.getJavawsLocation()); + l.add(ServerAccess.HEADLES_OPTION); + l.add(dest.getAbsolutePath()); + ProcessResult pr = ServerAccess.executeProcess(l); + Assert.assertTrue("Stdout should contain '" + okBase2 + "', but did not.", pr.stdout.contains(okBase2)); + } + + @Test + //do have href + //is local + //should be redownloaded (how to verify!?!) + public void launchLocalFileWithHref() throws Exception { + File dest = new File(server.getDir(), baseName1); + List l = new ArrayList(3); + l.add(server.getJavawsLocation()); + l.add(ServerAccess.HEADLES_OPTION); + l.add(dest.getAbsolutePath()); + ProcessResult pr = ServerAccess.executeProcess(l); + Assert.assertTrue("Stdout should contain '" + okBase1 + "', but did not.", pr.stdout.contains(okBase1)); + } + + @Test + //do not have href + //is local + //should NOT be redownloaded (how to verify!?!) + public void launchLocalFileNoHref() throws Exception { + File dest = prepareCopiedFileNoHref(); + List l = new ArrayList(3); + l.add(server.getJavawsLocation()); + l.add(ServerAccess.HEADLES_OPTION); + l.add(dest.getAbsolutePath()); + ProcessResult pr = ServerAccess.executeProcess(l); + Assert.assertTrue("Stdout should contain '" + okBase1 + "', but did not.", pr.stdout.contains(okBase1)); + } + + @Test + //remote + //have href + //should not be redownloaded (how to verify!?!) + //href is same file + public void launchRemoteFileWithHref() throws Exception { + ProcessResult pr = server.executeJavawsHeadless("/" + baseName1); + Assert.assertTrue("Stdout should contain '" + okBase1 + "', but did not.", pr.stdout.contains(okBase1)); + } + + //remote + //have href + //should NOT be redownloaded + //href is different file + @Test + public void launchRemoteChangedFileWithHref() throws Exception { + File f = prepareChangedFileWithHref(); + ProcessResult pr = server.executeJavawsHeadless("/" + f.getName()); + Assert.assertTrue("Stdout should contain '" + okBase2 + "', but did not.", pr.stdout.contains(okBase2)); + } + + @Test + //remote + //have not href + //should not be redownloaded (how to verify!?!) + public void launchRemoteFileWithNoHref() throws Exception { + File f = prepareCopiedFileNoHref(); From bugzilla-daemon at icedtea.classpath.org Mon Jun 24 03:30:21 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 24 Jun 2013 10:30:21 +0000 Subject: [Bug 1473] javaws should not depend on name of local file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1473 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea-web?cmd=changeset;node=cedfb2895986 author: Jiri Vanek date: Mon Jun 24 12:29:46 2013 +0200 JNLP file is now re-downloading only if is local and have href. Real couse of PR1473 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130624/01b20513/attachment.html From adomurad at redhat.com Mon Jun 24 06:07:23 2013 From: adomurad at redhat.com (Adam Domurad) Date: Mon, 24 Jun 2013 09:07:23 -0400 Subject: [rfc][icedtea-web] fix (And tests) for PR1473 In-Reply-To: <51C81F14.6010306@redhat.com> References: <51B5B02E.7020001@redhat.com> <51B5EFA8.1010601@redhat.com> <51B6329B.9010402@redhat.com> <51B70B80.4070809@redhat.com> <51B724F6.5000602@redhat.com> <51C460D0.1090309@redhat.com> <51C46DA6.2020101@redhat.com> <51C81F14.6010306@redhat.com> Message-ID: <51C8448B.4000800@redhat.com> On 06/24/2013 06:27 AM, Jiri Vanek wrote: > On 06/21/2013 05:13 PM, Adam Domurad wrote: >> >>>> >>>> OK we discussed this more on IRC and I think we're agreed: >>>> - Don't redownload if no href (already the case) >>>> - Don't redownload if not local file (needs to be added) >>>> >>>> The case where you save the JNLP and immediately launch it >>>> unfortunately does redownload, we can >>>> however do some timestamp check if you really do not like this. >>>> Other than that ideally the caching system would be allow for a simple >>>> HEAD request to determine if >>>> the JNLP needs to be updated, instead of a full redownload. >>> >>> >>> ook, try this:) >> >> Thanks for the update! > > I would like to backport this to 1.4 also. > Ack for 1.4 Cheers, -Adam From bugzilla-daemon at icedtea.classpath.org Mon Jun 24 06:56:04 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 24 Jun 2013 13:56:04 +0000 Subject: [Bug 1486] Fatal error problematic frame: libGL.so In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1486 Xerxes R?nby changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |xerxes at zafena.se Resolution|--- |INVALID --- Comment #2 from Xerxes R?nby --- RuneScape have invented their own Java to OpenGL binding, the crash is triggered in native code inside your OpenGL driver after a call from RuneScapes OpenGL binding. [Dynamic-linking native method jaclib.memory.Stream.getLSB ... JNI] [Dynamic-linking native method jaggl.OpenGL.arePbuffersAvailable ... JNI] [Dynamic-linking native method jaggl.OpenGL.glGetFloatv ... JNI] [Dynamic-linking native method jaggl.OpenGL.glGenBuffersARB ... JNI] # # A fatal error has been detected by the Java Runtime Environment: # # SIGILL (0x4) at pc=0x00007fec99846040, pid=4471, tid=140653971465984 # # JRE version: 7.0_21-b02 # Java VM: OpenJDK 64-Bit Server VM (23.7-b01 mixed mode linux-amd64 compressed oops) # Problematic frame: # C [libGL.so.1+0x313040] glGenBuffersARB+0x0 backtrace: Stack: [0x00007fec8de16000,0x00007fec8e017000], sp=0x00007fec8e015158, free space=2044k Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) C [libGL.so.1+0x313040] glGenBuffersARB+0x0 Java frames: (J=compiled Java code, j=interpreted, Vv=VM code) j jaggl.OpenGL.glGenBuffersARB(I[II)V+0 j sqa.(Ljava/awt/Canvas;Ld;I)V+1035 j lv.a(Ljava/awt/Canvas;Ld;IB)Lha;+19 j ha.a(IIILlia;ZILd;Ljava/awt/Canvas;)Lha;+55 j dg.a(IILd;Llia;Ljava/awt/Canvas;I)Lha;+52 j oq.a(Ljava/awt/Canvas;B)V+660 j oq.a(Ljava/awt/Canvas;I)Z+46 j oq.b(I)Z+19 j rma.c(Z)V+20 j opa.e(I)V+519 j opa.b(I)Z+31 j pp.d(I)V+111 j uo.a(Z)V+96 j uo.run()V+333 j java.lang.Thread.run()V+11 v ~StubRoutines::call_stub I will close this bug as INVALID since the error is outside the IcedTea code-base. The crash originate from a call to your OpenGL driver from Jagex native code. Also the Jagex code have been "obfuscated" and this makes debugging impossible unless you have acess to the Jagex sourcecode. I suggest you forward this bug in combination with your Linux OS and nvidia GPU driver version to RuneScape/Jagex developers who maintains the jaggl.OpenGL.* binding. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130624/32995858/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Jun 24 07:09:12 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 24 Jun 2013 14:09:12 +0000 Subject: [Bug 1486] Fatal error problematic frame: libGL.so In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1486 --- Comment #3 from Xerxes R?nby --- For further investigatioon: Null pointer exceptions inside glGenBuffersARB are usually triggered if an OpenGL application tries to issue OpenGL calls without first initializing the display or pbuffer. Potential races that trigger these kind of crashes can only be solved by improving the OpenGL binding/windowing system to prevent this from happening. http://lwjgl.org/forum/index.php?action=printpage;topic=2834.0 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130624/89c26709/attachment.html From aazores at redhat.com Mon Jun 24 07:17:52 2013 From: aazores at redhat.com (Andrew Azores) Date: Mon, 24 Jun 2013 10:17:52 -0400 Subject: [rfc][icedtea-web] Removing applications tab in jawas-about In-Reply-To: <51ACF0FC.7010107@redhat.com> References: <519CC72F.30107@redhat.com> <519CD4B1.3030708@redhat.com> <519FC36A.8070505@redhat.com> <51A33BDC.4090002@redhat.com> <51A8B9BC.3040603@redhat.com> <51ACF0FC.7010107@redhat.com> Message-ID: <51C85510.9000000@redhat.com> Changelog: * Makefile.am: removed logic for extras.jar, added netx-html-gen stamp * netx/net/sourceforge/jnlp/about/AboutDialog.java (main, centerDialog, createAndShowGUI, display): added tabs for new generated HTML, removed unused methods, added static display method. Moved out of extras into netx and renamed from Main to AboutDialog. * netx/net/sourceforge/jnlp/about/HTMLPanel.java: changed imports to match refactor of AboutDialog * netx/net/sourceforge/jnlp/runtime/Boot.java (main, getAboutFile, getJNLPFile): changed way of opening About dialog to using new static display method rather than JNLP launch. Removed methods relating to old JNLP launch. * netx/net/sourceforge/jnlp/resources/Messages.properties: added info for javaws -about -headless * netx/net/sourceforge/jnlp/resources/about.html: moved out of extras * netx/net/sourceforge/jnlp/resources/applications.html: same * netx/net/sourceforge/jnlp/resources/jamIcon.jpg: same * netx/net/sourceforge/jnlp/resources/notes.html: same * netx/net/sourceforge/jnlp/resources/notes.html: same Creating the HTML docs from plaintext AUTHORS, COPYING, NEWS, ChangeLog is now done in the Makefile rather than at runtime. Boot.java also now properly launches the About Dialog. Thanks, Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: fix.patch Type: text/x-patch Size: 9927 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130624/59a8288e/fix.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: Makefile.am.patch Type: text/x-patch Size: 7894 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130624/59a8288e/Makefile.am.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: resources.patch Type: text/x-patch Size: 5100 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130624/59a8288e/resources.patch From bugzilla-daemon at icedtea.classpath.org Mon Jun 24 07:36:01 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 24 Jun 2013 14:36:01 +0000 Subject: [Bug 1486] Fatal error problematic frame: libGL.so In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1486 --- Comment #4 from Xerxes R?nby --- I asked the JogAmp team, who also maintains a Java OpenGL binding, about a second opinion on this bug. My analysis in comment 3 is wrong since this bug have triggered a SIGILL (execution of invalid instruction) instead of a SIGSEGV (segmentation fault) http://jogamp.org/log/irc/jogamp_20130624050527.html#l192 (16:22:48) sgothel: SIGILL (0x4) at pc=0x00007fec99846040, pid=4471, tid=140653971465984 -> pointer invalid I guess (16:23:05) sgothel: looks like they do not validate what they have looked up via dlsym (16:27:14) sgothel: SIGILL The SIGILL signal is sent to a process when it attempts to execute a malformed, unknown, or privileged instruction. (16:27:40) sgothel: glGenBuffersARB+0x0 -> invalid I hope this may help the Jagex developers to fix their OpenGL binding. Cheers Xerxes -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130624/266f0b25/attachment.html From adomurad at redhat.com Mon Jun 24 13:21:52 2013 From: adomurad at redhat.com (Adam Domurad) Date: Mon, 24 Jun 2013 16:21:52 -0400 Subject: Fwd: [rfc][icedtea-web] renewed tagsoup In-Reply-To: <51C407C1.1050603@redhat.com> References: <51ADE9CB.2090709@redhat.com> <51B5F346.4070106@redhat.com> <51C31D18.40908@redhat.com> <51C33753.5050702@redhat.com> <51C407C1.1050603@redhat.com> Message-ID: <51C8AA60.2000303@redhat.com> >> >> Thank you for handling this! >> >> Happy hacking, >> -Adam > Hm, Andrew Azores pointed out that HEAD doesn't build without tagsoup installed. It's intended to be an optional dependency AFAICS so that should be looked at. Thanks, -Adam From jvanek at redhat.com Tue Jun 25 01:34:34 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 25 Jun 2013 10:34:34 +0200 Subject: Fwd: [rfc][icedtea-web] renewed tagsoup In-Reply-To: <51C8AA60.2000303@redhat.com> References: <51ADE9CB.2090709@redhat.com> <51B5F346.4070106@redhat.com> <51C31D18.40908@redhat.com> <51C33753.5050702@redhat.com> <51C407C1.1050603@redhat.com> <51C8AA60.2000303@redhat.com> Message-ID: <51C9561A.3020307@redhat.com> On 06/24/2013 10:21 PM, Adam Domurad wrote: > >>> >>> Thank you for handling this! >>> >>> Happy hacking, >>> -Adam >> > > Hm, Andrew Azores pointed out that HEAD doesn't build without tagsoup installed. It's intended to be > an optional dependency AFAICS so that should be looked at. > > Thanks, > -Adam yap, small overlook. Thanx for catch diff -r cedfb2895986 acinclude.m4 --- a/acinclude.m4 Mon Jun 24 12:29:46 2013 +0200 +++ b/acinclude.m4 Tue Jun 25 10:12:17 2013 +0200 @@ -425,7 +425,7 @@ fi AC_MSG_RESULT(${TAGSOUP_JAR}) AC_SUBST(TAGSOUP_JAR) - AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != xno]) + AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != x]) ]) dnl Generic macro to check for a Java class ok to push? From bugzilla-daemon at icedtea.classpath.org Tue Jun 25 01:50:03 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 25 Jun 2013 08:50:03 +0000 Subject: [Bug 864] icedtea-web is confused by dual monitor setup In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=864 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |jvanek at redhat.com Resolution|--- |WORKSFORME --- Comment #1 from JiriVanek --- It was fixed when all dialogues were centered to "curent" monitor http://icedtea.classpath.org/hg/icedtea-web/rev/3e4b40d47487 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130625/16a299a9/attachment.html From adomurad at redhat.com Tue Jun 25 06:14:46 2013 From: adomurad at redhat.com (Adam Domurad) Date: Tue, 25 Jun 2013 09:14:46 -0400 Subject: Fwd: [rfc][icedtea-web] renewed tagsoup In-Reply-To: <51C9561A.3020307@redhat.com> References: <51ADE9CB.2090709@redhat.com> <51B5F346.4070106@redhat.com> <51C31D18.40908@redhat.com> <51C33753.5050702@redhat.com> <51C407C1.1050603@redhat.com> <51C8AA60.2000303@redhat.com> <51C9561A.3020307@redhat.com> Message-ID: <51C997C6.4030108@redhat.com> On 06/25/2013 04:34 AM, Jiri Vanek wrote: > On 06/24/2013 10:21 PM, Adam Domurad wrote: >> >>>> >>>> Thank you for handling this! >>>> >>>> Happy hacking, >>>> -Adam >>> >> >> Hm, Andrew Azores pointed out that HEAD doesn't build without tagsoup >> installed. It's intended to be >> an optional dependency AFAICS so that should be looked at. >> >> Thanks, >> -Adam > yap, small overlook. Thanx for catch > > diff -r cedfb2895986 acinclude.m4 > --- a/acinclude.m4 Mon Jun 24 12:29:46 2013 +0200 > +++ b/acinclude.m4 Tue Jun 25 10:12:17 2013 +0200 > @@ -425,7 +425,7 @@ > fi > AC_MSG_RESULT(${TAGSOUP_JAR}) > AC_SUBST(TAGSOUP_JAR) > - AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != xno]) > + AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != x]) > ]) > > dnl Generic macro to check for a Java class > > > ok to push? OK to push as long as --with-tagsoup=no still works. Cheers, -Adam From andrew at icedtea.classpath.org Tue Jun 25 07:08:34 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 25 Jun 2013 14:08:34 +0000 Subject: /hg/release/icedtea6-1.11: 2 new changesets Message-ID: changeset d7eca687b7d2 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=d7eca687b7d2 author: Andrew John Hughes date: Sat Jun 22 16:38:24 2013 -0500 Add 2013/06/18 security patches. 2013-06-22 Andrew John Hughes * patches/idresolver_fix.patch: Removed. Part of 6469266. * Makefile.am: (SECURITY_PATCHES): Add new ones. (SPECIAL_SECURITY_PATCH_1): Renamed from SPECIAL_SECURITY_PATCH. (SPECIAL_SECURITY_PATCH_2): Add 8009071, which needs to be applied after some AWT backports. (ICEDTEA_PATCHES): Use SPECIAL_SECURITY_PATCH_{1,2}. Move 8005615, 8007393 & 8007611 to SECURITY_PATCHES as must be applied before 8004584. Add 7171223 to end. * patches/openjdk/6307603-xrender-01.patch, * patches/openjdk/6469266-xmlsec_1.4.2.patch, * patches/openjdk/6656651-windows_lcd_glyphs.patch, * patches/openjdk/6786028-wcag_bold_tags.patch, * patches/openjdk/6786682-wcag_lang.patch, * patches/openjdk/6786688-wcag_table.patch, * patches/openjdk/6786690-wcag_dl.patch, * patches/openjdk/6802694-no_deprecated.patch, * patches/openjdk/6851834-restructure.patch, * patches/openjdk/6888167-medialib_memory_leaks.patch, * patches/openjdk/6961178-doclet_xml.patch, * patches/openjdk/6990754-use_native_memory_for_symboltable.patch, * patches/openjdk/7006270-regressions.patch, * patches/openjdk/7008809-report_class_in_arraystoreexception.patch, * patches/openjdk/7014851-unused_parallel_compaction_code.patch, * patches/openjdk/7017732-move_static_fields_to_class.patch, * patches/openjdk/7036747-elfstringtable.patch, * patches/openjdk/7086585-flexible_field_injection.patch, * patches/openjdk/7171223-strict_aliasing.patch, * patches/openjdk/7195301-no_instanceof_node.patch, * patches/security/20130618/6741606-apache_santuario.patch, * patches/security/20130618/7158805-nested_subroutine_rewriting.patch, * patches/security/20130618/7170730-windows_network_stack.patch, * patches/security/20130618/8000638-improve_deserialization.patch, * patches/security/20130618/8000642-better_transportation_handling.patch, * patches/security/20130618/8001032-restrict_object_access-corba.patch, * patches/security/20130618/8001032-restrict_object_access-jdk.patch, * patches/security/20130618/8001033-refactor_address_handling.patch, * patches/security/20130618/8001034-memory_management.patch, * patches/security/20130618/8001038-resourcefully_handle_resources.patch, * patches/security/20130618/8001043-clarify_definition_restrictions.patch, * patches/security/20130618/8001309-better_handling_of_annotation_interfaces.patch, * patches/security/20130618/8001318-6_fixup.patch, * patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch, * patches/security/20130618/8001330-checking_order_improvement.patch, * patches/security/20130618/8001330-improve_checking_order.patch, * patches/security/20130618/8003703-update_rmi_connection_dialog.patch, * patches/security/20130618/8004584-augment_applet_contextualization.patch, * patches/security/20130618/8005007-better_glyph_processing.patch, * patches/security/20130618/8006328-6_fixup.patch, * patches/security/20130618/8006328-sound_class_robustness.patch, * patches/security/20130618/8006611-improve_scripting.patch, * patches/security/20130618/8007467-improve_jmx_internal_api_robustness.patch, * patches/security/20130618/8007471-6_fixup.patch, * patches/security/20130618/8007471-improve_mbean_notifications.patch, * patches/security/20130618/8007812-getenclosingmethod.patch, * patches/security/20130618/8008120-improve_jmx_class_checking.patch, * patches/security/20130618/8008124-better_compliance_testing.patch, * patches/security/20130618/8008128-better_jmx_api_coherence.patch, * patches/security/20130618/8008132-better_serialization.patch, * patches/security/20130618/8008585-jmx_data_handling.patch, * patches/security/20130618/8008593-better_urlclassloader.patch, * patches/security/20130618/8008603-jmx_provider_provision.patch, * patches/security/20130618/8008611-6_fixup.patch, * patches/security/20130618/8008611-jmx_annotations.patch, * patches/security/20130618/8008615-jmx_internal_api_robustness.patch, * patches/security/20130618/8008623-mbeanserver_handling.patch, * patches/security/20130618/8008744-6741606_rework.patch, * patches/security/20130618/8008982-jmx_interface_changes.patch, * patches/security/20130618/8009004-rmi_connection_improvement.patch, * patches/security/20130618/8009013-t2k_glyphs.patch, * patches/security/20130618/8009034-jmx_notification_improvement.patch, * patches/security/20130618/8009038-jmx_notification_support_improvement.patch, * patches/security/20130618/8009067-improve_key_storing.patch, * patches/security/20130618/8009071-improve_shape_handling.patch, * patches/security/20130618/8009235-improve_tsa_data_handling.patch, * patches/security/20130618/8009554-serialjavaobject.patch, * patches/security/20130618/8011243-improve_imaginglib.patch, * patches/security/20130618/8011248-better_component_rasters.patch, * patches/security/20130618/8011253-better_short_component_rasters.patch, * patches/security/20130618/8011257-better_byte_component_rasters.patch, * patches/security/20130618/8011557-improve_reflection.patch, * patches/security/20130618/8012375-javadoc_framing.patch, * patches/security/20130618/8012421-better_positioning.patch, * patches/security/20130618/8012438-better_image_validation.patch, * patches/security/20130618/8012597-better_image_channel_validation.patch, * patches/security/20130618/8012601-better_layout_validation.patch, * patches/security/20130618/8014281-better_xml_signature_checking.patch, * patches/security/20130618/8015997-more_javadoc_framing.patch, * patches/security/20130618/diamond_fix.patch, * patches/security/20130618/handle_npe.patch, * patches/security/20130618/hs_merge-01.patch, * patches/security/20130618/hs_merge-02.patch, * patches/security/20130618/hs_merge-03.patch, * patches/security/20130618/hs_merge-04.patch, * patches/security/20130618/javac_issue.patch, * patches/security/20130618/langtools_generics.patch, * patches/security/20130618/langtools_merge-01.patch, * patches/security/20130618/langtools_merge-02.patch, * patches/security/20130618/langtools_merge-03.patch: 2013/06/18 security patches. changeset f352f5c79104 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=f352f5c79104 author: Andrew John Hughes date: Tue Jun 25 15:07:59 2013 +0100 Correct issues found in building security patches. 2013-06-24 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Move 8009071 after library patch. * NEWS: Correct bug ID referenced for OJ3. * patches/ecj/needs-6.patch: Add cases for javax.sound and javax.management, due to @Override annotations in the security patches. * patches/openjdk/6307603-xrender-01.patch: Regenerated again as wrong last time. * patches/security/20130618/8009071-improve_shape_handling.patch: Include sizecalc.h in gif_lib.h. diffstat: ChangeLog | 122 +- Makefile.am | 105 +- NEWS | 2 +- patches/ecj/needs-6.patch | 24 + patches/idresolver_fix.patch | 194 - patches/openjdk/6307603-xrender-01.patch | 239 +- patches/openjdk/6469266-xmlsec_1.4.2.patch | 23876 ++++++++ patches/openjdk/6656651-windows_lcd_glyphs.patch | 938 + patches/openjdk/6786028-wcag_bold_tags.patch | 2914 + patches/openjdk/6786682-wcag_lang.patch | 274 + patches/openjdk/6786688-wcag_table.patch | 2828 + patches/openjdk/6786690-wcag_dl.patch | 3230 + patches/openjdk/6802694-no_deprecated.patch | 601 + patches/openjdk/6851834-restructure.patch | 26851 ++++++++++ patches/openjdk/6888167-medialib_memory_leaks.patch | 134 + patches/openjdk/6961178-doclet_xml.patch | 1989 + patches/openjdk/6990754-use_native_memory_for_symboltable.patch | 18947 +++++++ patches/openjdk/7006270-regressions.patch | 299 + patches/openjdk/7008809-report_class_in_arraystoreexception.patch | 189 + patches/openjdk/7014851-unused_parallel_compaction_code.patch | 810 + patches/openjdk/7017732-move_static_fields_to_class.patch | 3079 + patches/openjdk/7036747-elfstringtable.patch | 130 + patches/openjdk/7086585-flexible_field_injection.patch | 3424 + patches/openjdk/7171223-strict_aliasing.patch | 25 + patches/openjdk/7195301-no_instanceof_node.patch | 86 + patches/security/20130618/6741606-apache_santuario.patch | 8110 +++ patches/security/20130618/7158805-nested_subroutine_rewriting.patch | 462 + patches/security/20130618/7170730-windows_network_stack.patch | 1057 + patches/security/20130618/8000638-improve_deserialization.patch | 26 + patches/security/20130618/8000642-better_transportation_handling.patch | 808 + patches/security/20130618/8001032-restrict_object_access-corba.patch | 544 + patches/security/20130618/8001032-restrict_object_access-jdk.patch | 21 + patches/security/20130618/8001033-refactor_address_handling.patch | 119 + patches/security/20130618/8001034-memory_management.patch | 78 + patches/security/20130618/8001038-resourcefully_handle_resources.patch | 236 + patches/security/20130618/8001043-clarify_definition_restrictions.patch | 92 + patches/security/20130618/8001309-better_handling_of_annotation_interfaces.patch | 36 + patches/security/20130618/8001318-6_fixup.patch | 114 + patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch | 470 + patches/security/20130618/8001330-checking_order_improvement.patch | 380 + patches/security/20130618/8001330-improve_checking_order.patch | 97 + patches/security/20130618/8003703-update_rmi_connection_dialog.patch | 131 + patches/security/20130618/8004584-augment_applet_contextualization.patch | 322 + patches/security/20130618/8005007-better_glyph_processing.patch | 118 + patches/security/20130618/8006328-6_fixup.patch | 31 + patches/security/20130618/8006328-sound_class_robustness.patch | 6936 ++ patches/security/20130618/8006611-improve_scripting.patch | 78 + patches/security/20130618/8007467-improve_jmx_internal_api_robustness.patch | 108 + patches/security/20130618/8007471-6_fixup.patch | 25 + patches/security/20130618/8007471-improve_mbean_notifications.patch | 89 + patches/security/20130618/8007812-getenclosingmethod.patch | 89 + patches/security/20130618/8008120-improve_jmx_class_checking.patch | 332 + patches/security/20130618/8008124-better_compliance_testing.patch | 20 + patches/security/20130618/8008128-better_jmx_api_coherence.patch | 110 + patches/security/20130618/8008132-better_serialization.patch | 121 + patches/security/20130618/8008585-jmx_data_handling.patch | 69 + patches/security/20130618/8008593-better_urlclassloader.patch | 270 + patches/security/20130618/8008603-jmx_provider_provision.patch | 29 + patches/security/20130618/8008611-6_fixup.patch | 20 + patches/security/20130618/8008611-jmx_annotations.patch | 32 + patches/security/20130618/8008615-jmx_internal_api_robustness.patch | 70 + patches/security/20130618/8008623-mbeanserver_handling.patch | 121 + patches/security/20130618/8008744-6741606_rework.patch | 882 + patches/security/20130618/8008982-jmx_interface_changes.patch | 168 + patches/security/20130618/8009004-rmi_connection_improvement.patch | 54 + patches/security/20130618/8009013-t2k_glyphs.patch | 39 + patches/security/20130618/8009034-jmx_notification_improvement.patch | 30 + patches/security/20130618/8009038-jmx_notification_support_improvement.patch | 89 + patches/security/20130618/8009067-improve_key_storing.patch | 20 + patches/security/20130618/8009071-improve_shape_handling.patch | 1014 + patches/security/20130618/8009235-improve_tsa_data_handling.patch | 80 + patches/security/20130618/8009554-serialjavaobject.patch | 78 + patches/security/20130618/8011243-improve_imaginglib.patch | 618 + patches/security/20130618/8011248-better_component_rasters.patch | 51 + patches/security/20130618/8011253-better_short_component_rasters.patch | 140 + patches/security/20130618/8011257-better_byte_component_rasters.patch | 157 + patches/security/20130618/8011557-improve_reflection.patch | 132 + patches/security/20130618/8012375-javadoc_framing.patch | 61 + patches/security/20130618/8012421-better_positioning.patch | 100 + patches/security/20130618/8012438-better_image_validation.patch | 283 + patches/security/20130618/8012597-better_image_channel_validation.patch | 597 + patches/security/20130618/8012601-better_layout_validation.patch | 125 + patches/security/20130618/8014281-better_xml_signature_checking.patch | 49 + patches/security/20130618/8015997-more_javadoc_framing.patch | 21 + patches/security/20130618/diamond_fix.patch | 55 + patches/security/20130618/handle_npe.patch | 21 + patches/security/20130618/hs_merge-01.patch | 284 + patches/security/20130618/hs_merge-02.patch | 155 + patches/security/20130618/hs_merge-03.patch | 18 + patches/security/20130618/hs_merge-04.patch | 44 + patches/security/20130618/javac_issue.patch | 60 + patches/security/20130618/langtools_generics.patch | 600 + patches/security/20130618/langtools_merge-01.patch | 30 + patches/security/20130618/langtools_merge-02.patch | 30 + patches/security/20130618/langtools_merge-03.patch | 18 + 95 files changed, 118864 insertions(+), 320 deletions(-) diffs (truncated from 120278 to 500 lines): diff -r 272824be5054 -r f352f5c79104 ChangeLog --- a/ChangeLog Thu Apr 25 14:16:00 2013 +0100 +++ b/ChangeLog Tue Jun 25 15:07:59 2013 +0100 @@ -1,4 +1,124 @@ -2013-04-25 Andrew John Hughes +2013-06-24 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Move 8009071 after library patch. + * NEWS: Correct bug ID referenced for OJ3. + * patches/ecj/needs-6.patch: + Add cases for javax.sound and javax.management, due + to @Override annotations in the security patches. + * patches/openjdk/6307603-xrender-01.patch: + Regenerated again as wrong last time. + * patches/security/20130618/8009071-improve_shape_handling.patch: + Include sizecalc.h in gif_lib.h. + +2013-06-22 Andrew John Hughes + + * patches/idresolver_fix.patch: + Removed. Part of 6469266. + * Makefile.am: + (SECURITY_PATCHES): Add new ones. + (SPECIAL_SECURITY_PATCH_1): Renamed from + SPECIAL_SECURITY_PATCH. + (SPECIAL_SECURITY_PATCH_2): Add 8009071, which + needs to be applied after some AWT backports. + (ICEDTEA_PATCHES): Use SPECIAL_SECURITY_PATCH_{1,2}. + Move 8005615, 8007393 & 8007611 to SECURITY_PATCHES + as must be applied before 8004584. Add 7171223 to + end. + * patches/openjdk/6307603-xrender-01.patch: + Regenerated. + * patches/openjdk/6469266-xmlsec_1.4.2.patch, + * patches/openjdk/6656651-windows_lcd_glyphs.patch, + * patches/openjdk/6786028-wcag_bold_tags.patch, + * patches/openjdk/6786682-wcag_lang.patch, + * patches/openjdk/6786688-wcag_table.patch, + * patches/openjdk/6786690-wcag_dl.patch, + * patches/openjdk/6802694-no_deprecated.patch, + * patches/openjdk/6851834-restructure.patch, + * patches/openjdk/6888167-medialib_memory_leaks.patch, + * patches/openjdk/6961178-doclet_xml.patch, + * patches/openjdk/6990754-use_native_memory_for_symboltable.patch, + * patches/openjdk/7006270-regressions.patch, + * patches/openjdk/7008809-report_class_in_arraystoreexception.patch, + * patches/openjdk/7014851-unused_parallel_compaction_code.patch, + * patches/openjdk/7017732-move_static_fields_to_class.patch, + * patches/openjdk/7036747-elfstringtable.patch, + * patches/openjdk/7086585-flexible_field_injection.patch, + * patches/openjdk/7171223-strict_aliasing.patch, + * patches/openjdk/7195301-no_instanceof_node.patch, + * patches/security/20130618/6741606-apache_santuario.patch, + * patches/security/20130618/7158805-nested_subroutine_rewriting.patch, + * patches/security/20130618/7170730-windows_network_stack.patch, + * patches/security/20130618/8000638-improve_deserialization.patch, + * patches/security/20130618/8000642-better_transportation_handling.patch, + * patches/security/20130618/8001032-restrict_object_access-corba.patch, + * patches/security/20130618/8001032-restrict_object_access-jdk.patch, + * patches/security/20130618/8001033-refactor_address_handling.patch, + * patches/security/20130618/8001034-memory_management.patch, + * patches/security/20130618/8001038-resourcefully_handle_resources.patch, + * patches/security/20130618/8001043-clarify_definition_restrictions.patch, + * patches/security/20130618/8001309-better_handling_of_annotation_interfaces.patch, + * patches/security/20130618/8001318-6_fixup.patch, + * patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch, + * patches/security/20130618/8001330-checking_order_improvement.patch, + * patches/security/20130618/8001330-improve_checking_order.patch, + * patches/security/20130618/8003703-update_rmi_connection_dialog.patch, + * patches/security/20130618/8004584-augment_applet_contextualization.patch, + * patches/security/20130618/8005007-better_glyph_processing.patch, + * patches/security/20130618/8006328-6_fixup.patch, + * patches/security/20130618/8006328-sound_class_robustness.patch, + * patches/security/20130618/8006611-improve_scripting.patch, + * patches/security/20130618/8007467-improve_jmx_internal_api_robustness.patch, + * patches/security/20130618/8007471-6_fixup.patch, + * patches/security/20130618/8007471-improve_mbean_notifications.patch, + * patches/security/20130618/8007812-getenclosingmethod.patch, + * patches/security/20130618/8008120-improve_jmx_class_checking.patch, + * patches/security/20130618/8008124-better_compliance_testing.patch, + * patches/security/20130618/8008128-better_jmx_api_coherence.patch, + * patches/security/20130618/8008132-better_serialization.patch, + * patches/security/20130618/8008585-jmx_data_handling.patch, + * patches/security/20130618/8008593-better_urlclassloader.patch, + * patches/security/20130618/8008603-jmx_provider_provision.patch, + * patches/security/20130618/8008611-6_fixup.patch, + * patches/security/20130618/8008611-jmx_annotations.patch, + * patches/security/20130618/8008615-jmx_internal_api_robustness.patch, + * patches/security/20130618/8008623-mbeanserver_handling.patch, + * patches/security/20130618/8008744-6741606_rework.patch, + * patches/security/20130618/8008982-jmx_interface_changes.patch, + * patches/security/20130618/8009004-rmi_connection_improvement.patch, + * patches/security/20130618/8009013-t2k_glyphs.patch, + * patches/security/20130618/8009034-jmx_notification_improvement.patch, + * patches/security/20130618/8009038-jmx_notification_support_improvement.patch, + * patches/security/20130618/8009067-improve_key_storing.patch, + * patches/security/20130618/8009071-improve_shape_handling.patch, + * patches/security/20130618/8009235-improve_tsa_data_handling.patch, + * patches/security/20130618/8009554-serialjavaobject.patch, + * patches/security/20130618/8011243-improve_imaginglib.patch, + * patches/security/20130618/8011248-better_component_rasters.patch, + * patches/security/20130618/8011253-better_short_component_rasters.patch, + * patches/security/20130618/8011257-better_byte_component_rasters.patch, + * patches/security/20130618/8011557-improve_reflection.patch, + * patches/security/20130618/8012375-javadoc_framing.patch, + * patches/security/20130618/8012421-better_positioning.patch, + * patches/security/20130618/8012438-better_image_validation.patch, + * patches/security/20130618/8012597-better_image_channel_validation.patch, + * patches/security/20130618/8012601-better_layout_validation.patch, + * patches/security/20130618/8014281-better_xml_signature_checking.patch, + * patches/security/20130618/8015997-more_javadoc_framing.patch, + * patches/security/20130618/diamond_fix.patch, + * patches/security/20130618/handle_npe.patch, + * patches/security/20130618/hs_merge-01.patch, + * patches/security/20130618/hs_merge-02.patch, + * patches/security/20130618/hs_merge-03.patch, + * patches/security/20130618/hs_merge-04.patch, + * patches/security/20130618/javac_issue.patch, + * patches/security/20130618/langtools_generics.patch, + * patches/security/20130618/langtools_merge-01.patch, + * patches/security/20130618/langtools_merge-02.patch, + * patches/security/20130618/langtools_merge-03.patch: + 2013/06/18 security patches. + +2013-04-25 Andrew John Hughes * configure.ac: Bump to 1.11.12pre. * NEWS: Add section for 1.11.12. diff -r 272824be5054 -r f352f5c79104 Makefile.am --- a/Makefile.am Thu Apr 25 14:16:00 2013 +0100 +++ b/Makefile.am Tue Jun 25 15:07:59 2013 +0100 @@ -315,9 +315,99 @@ patches/security/20130416/8009305.patch \ patches/security/20130416/8009699.patch \ patches/security/20130416/8009814.patch \ - patches/security/20130416/8009857.patch + patches/security/20130416/8009857.patch \ + patches/openjdk/7195301-no_instanceof_node.patch \ + patches/openjdk/6469266-xmlsec_1.4.2.patch \ + patches/security/20130618/6741606-apache_santuario.patch \ + patches/security/20130618/7170730-windows_network_stack.patch \ + patches/security/20130618/8000638-improve_deserialization.patch \ + patches/security/20130618/8001032-restrict_object_access-corba.patch \ + patches/security/20130618/8001032-restrict_object_access-jdk.patch \ + patches/security/20130618/8001033-refactor_address_handling.patch \ + patches/security/20130618/8001034-memory_management.patch \ + patches/security/20130618/8001038-resourcefully_handle_resources.patch \ + patches/security/20130618/8001043-clarify_definition_restrictions.patch \ + patches/security/20130618/8001309-better_handling_of_annotation_interfaces.patch \ + patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch \ + patches/security/20130618/8001318-6_fixup.patch \ + patches/security/20130618/8001330-improve_checking_order.patch \ + patches/security/20130618/8003703-update_rmi_connection_dialog.patch \ + patches/openjdk/8005615-failure_to_load_logger_implementation.patch \ + patches/openjdk/8007393.patch \ + patches/openjdk/8007611.patch \ + patches/security/20130618/8004584-augment_applet_contextualization.patch \ + patches/security/20130618/8005007-better_glyph_processing.patch \ + patches/security/20130618/8006328-sound_class_robustness.patch \ + patches/security/20130618/8006328-6_fixup.patch \ + patches/security/20130618/8006611-improve_scripting.patch \ + patches/security/20130618/8007467-improve_jmx_internal_api_robustness.patch \ + patches/security/20130618/8007471-improve_mbean_notifications.patch \ + patches/security/20130618/8007471-6_fixup.patch \ + patches/security/20130618/8007812-getenclosingmethod.patch \ + patches/security/20130618/8008120-improve_jmx_class_checking.patch \ + patches/security/20130618/8008124-better_compliance_testing.patch \ + patches/security/20130618/8008128-better_jmx_api_coherence.patch \ + patches/security/20130618/8008132-better_serialization.patch \ + patches/security/20130618/8008585-jmx_data_handling.patch \ + patches/security/20130618/8008593-better_urlclassloader.patch \ + patches/security/20130618/8008603-jmx_provider_provision.patch \ + patches/security/20130618/8008611-jmx_annotations.patch \ + patches/security/20130618/8008611-6_fixup.patch \ + patches/security/20130618/8008615-jmx_internal_api_robustness.patch \ + patches/security/20130618/8008623-mbeanserver_handling.patch \ + patches/security/20130618/8008744-6741606_rework.patch \ + patches/security/20130618/8008982-jmx_interface_changes.patch \ + patches/security/20130618/8009004-rmi_connection_improvement.patch \ + patches/security/20130618/8009013-t2k_glyphs.patch \ + patches/security/20130618/8009034-jmx_notification_improvement.patch \ + patches/security/20130618/8009038-jmx_notification_support_improvement.patch \ + patches/security/20130618/8009067-improve_key_storing.patch \ + patches/security/20130618/8009235-improve_tsa_data_handling.patch \ + patches/security/20130618/8009554-serialjavaobject.patch \ + patches/openjdk/6888167-medialib_memory_leaks.patch \ + patches/security/20130618/8011243-improve_imaginglib.patch \ + patches/security/20130618/8011248-better_component_rasters.patch \ + patches/security/20130618/8011253-better_short_component_rasters.patch \ + patches/security/20130618/8011257-better_byte_component_rasters.patch \ + patches/security/20130618/8011557-improve_reflection.patch \ + patches/security/20130618/8012421-better_positioning.patch \ + patches/security/20130618/8012438-better_image_validation.patch \ + patches/security/20130618/8012597-better_image_channel_validation.patch \ + patches/security/20130618/8012601-better_layout_validation.patch \ + patches/security/20130618/8014281-better_xml_signature_checking.patch \ + patches/security/20130618/diamond_fix.patch \ + patches/security/20130618/handle_npe.patch \ + patches/security/20130618/javac_issue.patch \ + patches/security/20130618/7158805-nested_subroutine_rewriting.patch \ + patches/security/20130618/8001330-checking_order_improvement.patch \ + patches/openjdk/7036747-elfstringtable.patch \ + patches/openjdk/7017732-move_static_fields_to_class.patch \ + patches/openjdk/6990754-use_native_memory_for_symboltable.patch \ + patches/openjdk/7008809-report_class_in_arraystoreexception.patch \ + patches/openjdk/7086585-flexible_field_injection.patch \ + patches/security/20130618/hs_merge-01.patch \ + patches/security/20130618/hs_merge-02.patch \ + patches/security/20130618/hs_merge-03.patch \ + patches/openjdk/7014851-unused_parallel_compaction_code.patch \ + patches/security/20130618/hs_merge-04.patch \ + patches/security/20130618/8000642-better_transportation_handling.patch \ + patches/openjdk/6786028-wcag_bold_tags.patch \ + patches/openjdk/6786682-wcag_lang.patch \ + patches/openjdk/6802694-no_deprecated.patch \ + patches/openjdk/6786690-wcag_dl.patch \ + patches/openjdk/6786688-wcag_table.patch \ + patches/openjdk/6961178-doclet_xml.patch \ + patches/openjdk/6851834-restructure.patch \ + patches/openjdk/7006270-regressions.patch \ + patches/security/20130618/8012375-javadoc_framing.patch \ + patches/security/20130618/8015997-more_javadoc_framing.patch \ + patches/security/20130618/langtools_merge-01.patch \ + patches/security/20130618/langtools_merge-02.patch \ + patches/security/20130618/langtools_generics.patch \ + patches/security/20130618/langtools_merge-03.patch -SPECIAL_SECURITY_PATCH = patches/security/20120214/7112642.patch +SPECIAL_SECURITY_PATCH_1 = patches/security/20120214/7112642.patch +SPECIAL_SECURITY_PATCH_2 = patches/security/20130618/8009071-improve_shape_handling.patch ICEDTEA_PATCHES = \ $(DROP_PATCHES) \ @@ -335,13 +425,14 @@ patches/openjdk/6725214-direct3d-01.patch \ patches/openjdk/6748082-isDisplayLocal.patch \ patches/openjdk/6633275-shaped_translucent_windows.patch \ - $(SPECIAL_SECURITY_PATCH) \ + $(SPECIAL_SECURITY_PATCH_1) \ patches/openjdk/6769607-modal-hangs.patch \ patches/openjdk/6791612-opengl-jni-fix.patch \ patches/openjdk/6755274-glgetstring-crash.patch \ patches/openjdk/6984543-onscreen_rendering_resize_test.patch \ patches/openjdk/6693253-security_warning.patch \ patches/openjdk/6444769-windowwithwarningtest.patch \ + patches/openjdk/6656651-windows_lcd_glyphs.patch \ patches/notice-safepoints.patch \ patches/parisc-opt.patch \ patches/lucene-crash.patch \ @@ -354,6 +445,7 @@ patches/gcc-suffix.patch \ patches/memory-limits.patch \ patches/libraries.patch \ + $(SPECIAL_SECURITY_PATCH_2) \ patches/jvmtiEnv.patch \ patches/lcms.patch \ patches/print_lsb_release.patch \ @@ -521,7 +613,6 @@ patches/openjdk/7103725-ssl_beast_regression.patch \ patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch \ patches/openjdk/remove-mimpure-option-to-gcc.patch \ - patches/idresolver_fix.patch \ patches/openjdk/6792400-Avoid_loading_Normalizer_resources.patch \ patches/openjdk/7185678-xmenuitem_peer_npe.patch \ patches/merge_fix.patch \ @@ -529,18 +620,16 @@ patches/openjdk/7177216-native2ascii_changes_file_permissions.patch \ patches/openjdk/7199153-try_with_resources_pushed_to_6.patch \ patches/openjdk/7010849-modernise_sa.patch \ - patches/openjdk/8005615-failure_to_load_logger_implementation.patch \ patches/openjdk/8004341-jck_dialog_failure.patch \ patches/openjdk/8004341-jck_dialog_failure-02.patch \ patches/pr1319-support_giflib_5.patch \ - patches/openjdk/8007393.patch \ - patches/openjdk/8007611.patch \ patches/fix_get_stack_bounds_leak.patch \ patches/openjdk/7197906-handle_32_bit_shifts.patch \ patches/aarch64.patch \ patches/jaxws-tempfiles-ioutils-6.patch \ patches/object-factory-cl-internal.patch \ - patches/openjdk/8009530-icu_kern_table_support_broken.patch + patches/openjdk/8009530-icu_kern_table_support_broken.patch \ + patches/openjdk/7171223-strict_aliasing.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r 272824be5054 -r f352f5c79104 NEWS --- a/NEWS Thu Apr 25 14:16:00 2013 +0100 +++ b/NEWS Tue Jun 25 15:07:59 2013 +0100 @@ -72,7 +72,7 @@ - S7064279: Introspector.getBeanInfo() should release some resources in timely manner - S8004302: javax/xml/soap/Test7013971.java fails since jdk6u39b01 * Bug fixes - - OJ3: Fix get_stack_bounds memory leak (alternate fix for S7197906) + - OJ3: Fix get_stack_bounds memory leak (alternate fix for S7017193) - PR1362: Fedora 19 / rawhide FTBFS SIGILL - PR1319: Correct #ifdef to #if - PR1339: Simplify the rhino class rewriter to avoid use of concurrency diff -r 272824be5054 -r f352f5c79104 patches/ecj/needs-6.patch --- a/patches/ecj/needs-6.patch Thu Apr 25 14:16:00 2013 +0100 +++ b/patches/ecj/needs-6.patch Tue Jun 25 15:07:59 2013 +0100 @@ -22,3 +22,27 @@ GEN_DIR=$(GENSRCDIR)/sun/awt/X11 +diff -Nru openjdk-ecj.orig/jdk/make/javax/sound/Makefile openjdk-ecj/jdk/make/javax/sound/Makefile +--- openjdk-ecj.orig/jdk/make/javax/sound/Makefile 2013-06-24 00:00:22.031254425 +0100 ++++ openjdk-ecj/jdk/make/javax/sound/Makefile 2013-06-24 00:01:27.040288124 +0100 +@@ -28,6 +28,8 @@ + LIBRARY = jsound + PRODUCT = sun + include $(BUILDDIR)/common/Defs.gmk ++LANGUAGE_VERSION = -source 6 ++CLASS_VERSION = -target 6 + + # include defines for sound + include SoundDefs.gmk +diff -Nru openjdk-ecj.orig/jdk/make/javax/management/Makefile openjdk-ecj/jdk/make/javax/management/Makefile +--- openjdk-ecj.orig/jdk/make/javax/management/Makefile 2011-11-14 22:11:40.000000000 +0000 ++++ openjdk-ecj/jdk/make/javax/management/Makefile 2013-06-24 00:40:59.742001431 +0100 +@@ -31,6 +31,8 @@ + PACKAGE = javax.management + PRODUCT = sun + include $(BUILDDIR)/common/Defs.gmk ++LANGUAGE_VERSION = -source 6 ++CLASS_VERSION = -target 6 + + # + # Files to compile diff -r 272824be5054 -r f352f5c79104 patches/idresolver_fix.patch --- a/patches/idresolver_fix.patch Thu Apr 25 14:16:00 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,194 +0,0 @@ ---- openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java 2012-03-20 20:29:30.000000000 +0100 -+++ openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java 2012-03-20 22:18:41.094309861 +0100 -@@ -26,6 +26,7 @@ - import org.w3c.dom.Attr; - import org.w3c.dom.Document; - import org.w3c.dom.Element; -+import org.w3c.dom.NamedNodeMap; - import org.w3c.dom.Node; - - import java.util.Arrays; -@@ -175,69 +176,124 @@ - return null; - } - -+ private static java.util.List names; -+ private static int namesLength; -+ static { -+ String namespaces[]={ -+ Constants.SignatureSpecNS, -+ EncryptionConstants.EncryptionSpecNS, -+ "http://schemas.xmlsoap.org/soap/security/2000-12", -+ "http://www.w3.org/2002/03/xkms#", -+ "urn:oasis:names:tc:SAML:1.0:assertion", -+ "urn:oasis:names:tc:SAML:1.0:protocol" -+ }; -+ names = Arrays.asList(namespaces); -+ namesLength = names.size(); -+ } - -- static java.util.List names; -- static { -- String namespaces[]={ Constants.SignatureSpecNS, -- EncryptionConstants.EncryptionSpecNS, -- "http://schemas.xmlsoap.org/soap/security/2000-12", -- "http://www.w3.org/2002/03/xkms#" -- }; -- names=Arrays.asList(namespaces); -- } - -+ private static Element getElementBySearching(Node root,String id) { -+ Element []els=new Element[namesLength + 1]; -+ getEl(root,id,els); -+ for (int i=0;i2) -+ continue; -+ String value=n.getNodeValue(); -+ if (name.charAt(0)=='I') { -+ char ch=name.charAt(1); -+ if (ch=='d' && value.equals(id)) { -+ els[index]=el; -+ if (index==0) { - return 1; -- sibling=sibling.getNextSibling(); -+ } -+ } else if (ch=='D' &&value.endsWith(id)) { -+ if (index!=3) { -+ index=namesLength; -+ } -+ els[index]=el; - } From adomurad at redhat.com Tue Jun 25 07:11:19 2013 From: adomurad at redhat.com (Adam Domurad) Date: Tue, 25 Jun 2013 10:11:19 -0400 Subject: [rfc][icedtea-web] Fix many memory leaks due to utf8fromidentifier misuse Message-ID: <51C9A507.3060905@redhat.com> Hi all. Every single occurrence of utf8fromidentifier requires a call to 'memfree' after being used. This patch addresses this (there were around 40 occurrences). Some minor refactoring was bundled, sorry. It is hard not to bundle clean-up to avoid making a mess. Most notably name->name_id in many places, to allow for use of 'name' to hold the actual string. As well string fiddling was reduced in some places. A minor test is included in the changeset. ChangeLog: 2013-06-24 Adam Domurad * plugin/icedteanp/IcedTeaPluginUtils.cc (NPIdentifierAsString): Leak-free utf8fromidentifier wrapper. * plugin/icedteanp/IcedTeaPluginUtils.h: Same. * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc: Update calls * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: Same. * plugin/icedteanp/IcedTeaScriptablePluginObject.cc: Same. * plugin/icedteanp/IcedTeaScriptablePluginObject.h: Same. * tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc (NPIdentifierAsString): New, tests utility function * tests/cpp-unit-tests/browser_mock.cc (mock_utf8fromidentifier): New, mocks NPAPI function Happy hacking, -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: plugin-utf8fromidentifier-fix-leaks.patch Type: text/x-patch Size: 33296 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130625/344b304b/plugin-utf8fromidentifier-fix-leaks.patch From jvanek at redhat.com Tue Jun 25 08:01:40 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 25 Jun 2013 17:01:40 +0200 Subject: Fwd: [rfc][icedtea-web] renewed tagsoup In-Reply-To: <51C997C6.4030108@redhat.com> References: <51ADE9CB.2090709@redhat.com> <51B5F346.4070106@redhat.com> <51C31D18.40908@redhat.com> <51C33753.5050702@redhat.com> <51C407C1.1050603@redhat.com> <51C8AA60.2000303@redhat.com> <51C9561A.3020307@redhat.com> <51C997C6.4030108@redhat.com> Message-ID: <51C9B0D4.4070703@redhat.com> On 06/25/2013 03:14 PM, Adam Domurad wrote: > On 06/25/2013 04:34 AM, Jiri Vanek wrote: >> On 06/24/2013 10:21 PM, Adam Domurad wrote: >>> >>>>> >>>>> Thank you for handling this! >>>>> >>>>> Happy hacking, >>>>> -Adam >>>> >>> >>> Hm, Andrew Azores pointed out that HEAD doesn't build without tagsoup >>> installed. It's intended to be >>> an optional dependency AFAICS so that should be looked at. >>> >>> Thanks, >>> -Adam >> yap, small overlook. Thanx for catch >> >> diff -r cedfb2895986 acinclude.m4 >> --- a/acinclude.m4 Mon Jun 24 12:29:46 2013 +0200 >> +++ b/acinclude.m4 Tue Jun 25 10:12:17 2013 +0200 >> @@ -425,7 +425,7 @@ >> fi >> AC_MSG_RESULT(${TAGSOUP_JAR}) >> AC_SUBST(TAGSOUP_JAR) >> - AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != xno]) >> + AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != x]) >> ]) >> >> dnl Generic macro to check for a Java class >> >> >> ok to push? > > OK to push as long as --with-tagsoup=no still works. > :DDD diff -r cedfb2895986 acinclude.m4 --- a/acinclude.m4 Mon Jun 24 12:29:46 2013 +0200 +++ b/acinclude.m4 Tue Jun 25 17:00:54 2013 +0200 @@ -425,7 +425,7 @@ fi AC_MSG_RESULT(${TAGSOUP_JAR}) AC_SUBST(TAGSOUP_JAR) - AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != xno]) + AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != xno -a x$TAGSOUP_JAR != x ]) ]) dnl Generic macro to check for a Java class From adomurad at redhat.com Tue Jun 25 08:02:55 2013 From: adomurad at redhat.com (Adam Domurad) Date: Tue, 25 Jun 2013 11:02:55 -0400 Subject: Fwd: [rfc][icedtea-web] renewed tagsoup In-Reply-To: <51C9B0D4.4070703@redhat.com> References: <51ADE9CB.2090709@redhat.com> <51B5F346.4070106@redhat.com> <51C31D18.40908@redhat.com> <51C33753.5050702@redhat.com> <51C407C1.1050603@redhat.com> <51C8AA60.2000303@redhat.com> <51C9561A.3020307@redhat.com> <51C997C6.4030108@redhat.com> <51C9B0D4.4070703@redhat.com> Message-ID: <51C9B11F.40502@redhat.com> On 06/25/2013 11:01 AM, Jiri Vanek wrote: > On 06/25/2013 03:14 PM, Adam Domurad wrote: >> On 06/25/2013 04:34 AM, Jiri Vanek wrote: >>> On 06/24/2013 10:21 PM, Adam Domurad wrote: >>>> >>>>>> >>>>>> Thank you for handling this! >>>>>> >>>>>> Happy hacking, >>>>>> -Adam >>>>> >>>> >>>> Hm, Andrew Azores pointed out that HEAD doesn't build without tagsoup >>>> installed. It's intended to be >>>> an optional dependency AFAICS so that should be looked at. >>>> >>>> Thanks, >>>> -Adam >>> yap, small overlook. Thanx for catch >>> >>> diff -r cedfb2895986 acinclude.m4 >>> --- a/acinclude.m4 Mon Jun 24 12:29:46 2013 +0200 >>> +++ b/acinclude.m4 Tue Jun 25 10:12:17 2013 +0200 >>> @@ -425,7 +425,7 @@ >>> fi >>> AC_MSG_RESULT(${TAGSOUP_JAR}) >>> AC_SUBST(TAGSOUP_JAR) >>> - AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != xno]) >>> + AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != x]) >>> ]) >>> >>> dnl Generic macro to check for a Java class >>> >>> >>> ok to push? >> >> OK to push as long as --with-tagsoup=no still works. >> > :DDD > > diff -r cedfb2895986 acinclude.m4 > --- a/acinclude.m4 Mon Jun 24 12:29:46 2013 +0200 > +++ b/acinclude.m4 Tue Jun 25 17:00:54 2013 +0200 > @@ -425,7 +425,7 @@ > fi > AC_MSG_RESULT(${TAGSOUP_JAR}) > AC_SUBST(TAGSOUP_JAR) > - AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != xno]) > + AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != xno -a > x$TAGSOUP_JAR != x ]) > ]) > > dnl Generic macro to check for a Java class > > Looks good (assuming everything works). Cheers, -Adam From jvanek at icedtea.classpath.org Tue Jun 25 08:09:27 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Tue, 25 Jun 2013 15:09:27 +0000 Subject: /hg/icedtea-web: acinclude.m4 IT_CHECK_FOR_TAGSOUP is now correc... Message-ID: changeset 7c24f734945f in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=7c24f734945f author: Jiri Vanek date: Tue Jun 25 17:09:11 2013 +0200 acinclude.m4 IT_CHECK_FOR_TAGSOUP is now correctly setting HAVE_TAGSOUP when it is not found diffstat: ChangeLog | 5 +++++ acinclude.m4 | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diffs (24 lines): diff -r cedfb2895986 -r 7c24f734945f ChangeLog --- a/ChangeLog Mon Jun 24 12:29:46 2013 +0200 +++ b/ChangeLog Tue Jun 25 17:09:11 2013 +0200 @@ -1,3 +1,8 @@ +2013-06-25 Jiri Vanek + + * acinclude.m4: (IT_CHECK_FOR_TAGSOUP) is now correctly setting + HAVE_TAGSOUP when it is not found + 2013-06-24 Jiri Vanek JNLP file is now re-downloading only if is local and have href diff -r cedfb2895986 -r 7c24f734945f acinclude.m4 --- a/acinclude.m4 Mon Jun 24 12:29:46 2013 +0200 +++ b/acinclude.m4 Tue Jun 25 17:09:11 2013 +0200 @@ -425,7 +425,7 @@ fi AC_MSG_RESULT(${TAGSOUP_JAR}) AC_SUBST(TAGSOUP_JAR) - AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != xno]) + AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != xno -a x$TAGSOUP_JAR != x ]) ]) dnl Generic macro to check for a Java class From helpcrypto at gmail.com Tue Jun 25 08:36:36 2013 From: helpcrypto at gmail.com (helpcrypto helpcrypto) Date: Tue, 25 Jun 2013 17:36:36 +0200 Subject: Fwd: [OT?] Get current firefox profile In-Reply-To: References: Message-ID: I dont want to surrender... ---------- Forwarded message ---------- From: helpcrypto helpcrypto Date: Tue, Jun 4, 2013 at 3:14 PM Subject: [OT?] Get current firefox profile To: Cc: IcedTea Hi. Any of you know an easy way of getting firefox current profile from my applet? I found, but Component.classes gives permission denied: http://stackoverflow.com/questions/5695230/how-to-get-the-current-firefox-profile-path-from-within-my-applet Thanks! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130625/95810784/attachment.html From adomurad at redhat.com Tue Jun 25 10:54:05 2013 From: adomurad at redhat.com (Adam Domurad) Date: Tue, 25 Jun 2013 13:54:05 -0400 Subject: [rfe][icedtea-web] Fix RH977880, regression in Javascript interfacing code Message-ID: <51C9D93D.5060808@redhat.com> This fixes https://bugzilla.redhat.com/show_bug.cgi?id=977880. There was a regression caused during my refactoring of some JS code that caused .getClass() to be called on a potentially null value. I have looked closely and it doesn't appear there are any other places in this file that could have the problem. Cheers, -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: fix-for-RH977880.patch Type: text/x-patch Size: 947 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130625/065c0342/fix-for-RH977880.patch From bugzilla-daemon at icedtea.classpath.org Tue Jun 25 10:56:28 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 25 Jun 2013 17:56:28 +0000 Subject: [Bug 1487] New: com.sun.xml.messaging.saaj issues in latest release Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1487 Bug ID: 1487 Summary: com.sun.xml.messaging.saaj issues in latest release Classification: Unclassified Product: IcedTea Version: unspecified Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: mwringe at redhat.com CC: unassigned at icedtea.classpath.org Latest OpenJDK update in Fedora breaks application servers when using soap messaging. Notes: 1) only appears to affect the latest version (1.7.0.25) and not previous versions (1.7.0.19) 2) the 1.7.0.25 Oracle JDK works, its only the latest openjdk one which is broken. Environment: - Fedora 18, x86 version of jdk Steps to Reproduce: 1) install the 1.7.0.19 openjdk rpm (tested with http://koji.fedoraproject.org/koji/buildinfo?buildID=424773) 2) download gatein (http://downloads.jboss.org/gatein/Releases/Portal/3.6.0.Beta02/GateIn-3.6.0.Beta02-jbossas-7.zip) 3) start the server (cd bin;./standlone.sh) 4) once the server is started, go to http://localhost:8080/portal/login?username=root&password=gtn&initialURI=/portal/g/:platform:administrators/wsrpConfiguration 5) click one of the refresh buttons for the consumer 6) notice that it refreshes and there are no errors displayed or logged 7) stop the server (ctrl-c) 8) update the openjdk rpm to 1.7.0.25 9) start the server again and try to refresh the consumer. 10) notice the error in the browser and errors in the logs 11) stop the server 12) install the oracle jdk 1.7.0.25 13) start the server again and try to refresh a consumer 14) notice that like the 1.7.0.19 openjdk, it works and there are no errors -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130625/02107bf1/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Jun 25 10:59:14 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 25 Jun 2013 17:59:14 +0000 Subject: [Bug 1487] com.sun.xml.messaging.saaj issues in latest release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1487 --- Comment #1 from Matt Wringe --- Created attachment 897 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=897&action=edit console log -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130625/59f08733/attachment.html From aazores at redhat.com Tue Jun 25 12:47:13 2013 From: aazores at redhat.com (Andrew Azores) Date: Tue, 25 Jun 2013 15:47:13 -0400 Subject: [rfc][icedtea-web] jnlp_href extensions inside HTML applets - PR974 Message-ID: <51C9F3C1.8070307@redhat.com> Changelog: * netx/net/sourceforge/jnlp/PluginBridge.java (PluginBridge, getResources): Constructor stores list of JNLP extensions, getResources returns this list * tests/reproducers/custom/ExtensionJnlpsInApplet/testcases/ExtensionJnlpsInAppletTest.java: tests browser launch of HTML file with embedded JNLP applet referencing extension JNLP * tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpTest.html: same * tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpHelper.jnlp: same * tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpTestApplet.jnlp: same * tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/ExtensionJnlpHelper.java: same * tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/ExtensionJnlpTestApplet.java: same * tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile: same PluginBridge had null parserSettings, which caused a NPE in JNLPFile parse() method later on. I wasn't sure if there was a particular reason why the PluginBridge constructor never called super(), so instead it instantiates a new ParserSettings on its own, with default values. The constructor also stores a list of extension JNLP files, which are then returned later when getResources is called with the param ExtensionDesc.class. The reproducer tests set up a scenario as described in the original bug report; one HTML file which uses jnlp_href tag. This JNLP file has another JNLP file as an extension. Each of these JNLP files references one JAR. One of these JARs contains a helper class which is referenced by a class in the other JAR. Previously this scenario would result in a NoClassDefFoundError for the helper class when a browser was used to load the HTML, although using javaws to launch the JNLP directly worked fine. Thanks, Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: fix.patch Type: text/x-patch Size: 2787 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130625/c7ad7531/fix.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: reproducer.patch Type: text/x-patch Size: 17175 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130625/c7ad7531/reproducer.patch From andrew at icedtea.classpath.org Tue Jun 25 19:45:35 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 26 Jun 2013 02:45:35 +0000 Subject: /hg/release/icedtea7-2.3: Sync to 2.3.10 forest tag, bringing in... Message-ID: changeset 7e0d2c785516 in /hg/release/icedtea7-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=7e0d2c785516 author: Andrew John Hughes date: Wed Jun 26 03:45:13 2013 +0100 Sync to 2.3.10 forest tag, bringing in security updates. 2013-06-25 Andrew John Hughes * Makefile.am: (JDK_UPDATE_VERSION): Bump to 25. (OPENJDK_VERSION): Set to b30. (CORBA_CHANGESET): Update to IcedTea 2.3.10 tag. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * hotspot.map: Update default to 2.3.10 tag. * patches/boot/ecj-stringswitch.patch: Update MethodHandleNatives patch. * patches/boot/tobin.patch: Update following move from sun.awt.X11 to sun.awt. diffstat: ChangeLog | 25 +++ Makefile.am | 28 ++-- hotspot.map | 2 +- patches/boot/ecj-stringswitch.patch | 227 +++++++++++++++++------------------ patches/boot/tobin.patch | 38 +++-- 5 files changed, 172 insertions(+), 148 deletions(-) diffs (500 lines): diff -r a91c52e39914 -r 7e0d2c785516 ChangeLog --- a/ChangeLog Tue May 28 16:42:32 2013 +0100 +++ b/ChangeLog Wed Jun 26 03:45:13 2013 +0100 @@ -1,3 +1,28 @@ +2013-06-25 Andrew John Hughes + + * Makefile.am: + (JDK_UPDATE_VERSION): Bump to 25. + (OPENJDK_VERSION): Set to b30. + (CORBA_CHANGESET): Update to IcedTea 2.3.10 tag. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + * hotspot.map: + Update default to 2.3.10 tag. + * patches/boot/ecj-stringswitch.patch: + Update MethodHandleNatives patch. + * patches/boot/tobin.patch: + Update following move from sun.awt.X11 + to sun.awt. + 2013-05-28 Andrew John Hughes PR1410: Icedtea 2.3.9 fails to build using icedtea 1.12.4 diff -r a91c52e39914 -r 7e0d2c785516 Makefile.am --- a/Makefile.am Tue May 28 16:42:32 2013 +0100 +++ b/Makefile.am Wed Jun 26 03:45:13 2013 +0100 @@ -1,22 +1,22 @@ # Dependencies -OPENJDK_VERSION = b02 -JDK_UPDATE_VERSION = 21 +OPENJDK_VERSION = b30 +JDK_UPDATE_VERSION = 25 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = affff8c7b584 -JAXP_CHANGESET = 26be0c933625 -JAXWS_CHANGESET = ba432018cb80 -JDK_CHANGESET = 073c0458daef -LANGTOOLS_CHANGESET = 0d9ff3ffd433 -OPENJDK_CHANGESET = 73c29b209f76 +CORBA_CHANGESET = 8e581b671511 +JAXP_CHANGESET = 1a02956fcfaf +JAXWS_CHANGESET = c0e829bfbf62 +JDK_CHANGESET = bd392c168d5c +LANGTOOLS_CHANGESET = 8cf15d334ad3 +OPENJDK_CHANGESET = fb1ac57ada6c -CORBA_SHA256SUM = 675d44ab92c3a86a91cbd23bf97ccdb6f3a1c3ac3d5a1191afd36790453270a8 -JAXP_SHA256SUM = 54c106a092f43431133cd6f149f8e615353a9b3c574eade7a444cf97ee92a379 -JAXWS_SHA256SUM = 07a47e77e78bb3bf4df6997eefa078631d7f69260966104d38590b7f499af14f -JDK_SHA256SUM = 2c985f0b30b3f6762d99262d7b0b7dfa241fe5b9e8046c878148ef47ac09c82b -LANGTOOLS_SHA256SUM = 53c6a2e450c3621379c26e3be6a72eebf6cae252dabaa7c79a3d786381e644f6 -OPENJDK_SHA256SUM = 8c9222984aa5f0dad7fc14c7b7d4bed354fb86027592896113301a1e97bdad18 +CORBA_SHA256SUM = 510ca43bc0d208f4cbbe716a1652871f63491f37b3e3902610a42d2e1870fd6c +JAXP_SHA256SUM = acfd7789f0745a79306d339bbc55ad9d05c08b49b5058e7a804323cdced258fe +JAXWS_SHA256SUM = 014d6f206b628d3d532c98420b8ebc6434c446497a55037aae6bc3535a858892 +JDK_SHA256SUM = f6c7d86b1b3cebb1f26f3d2735a3b7466b31d9c9e56950e4f24c6c1da436247c +LANGTOOLS_SHA256SUM = e28ff622e407a915c31ba90d8056b3e08d051c9cd6c107c52b0ef4e246adcd23 +OPENJDK_SHA256SUM = 09fd1d517ed890924e580dd50af7d41e2f137668120e24eca4a7d887648f2335 CACAO_VERSION = a567bcb7f589 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 diff -r a91c52e39914 -r 7e0d2c785516 hotspot.map --- a/hotspot.map Tue May 28 16:42:32 2013 +0100 +++ b/hotspot.map Wed Jun 26 03:45:13 2013 +0100 @@ -1,3 +1,3 @@ # version url changeset sha256sum -default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 332f7e24a493 da6f849e2b8c0e8c46de4171b9f14ec9d97bac76dd56006d9c33323b23f54f98 +default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 4e374ade4066 86c8ef401af20352c934a5a6330f41dc65e59b05e3d7875ff9a3476ad1a996a0 zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot b965a723122e 43a5529b36cf619199e45832dead0c6b1841337b6416b0123b807e7312cb1912 diff -r a91c52e39914 -r 7e0d2c785516 patches/boot/ecj-stringswitch.patch --- a/patches/boot/ecj-stringswitch.patch Tue May 28 16:42:32 2013 +0100 +++ b/patches/boot/ecj-stringswitch.patch Wed Jun 26 03:45:13 2013 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-02-17 18:47:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-02-20 01:19:23.757194433 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-06-21 21:46:14.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-06-25 21:52:46.683943837 +0100 @@ -350,18 +350,15 @@ if (attrCommands != null) { Attribute.Layout lkey = Attribute.keyForLookup(ctype, name); @@ -30,8 +30,8 @@ } // Find canonical instance of the requested attribute. diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-02-17 18:47:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-02-20 01:19:23.757194433 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-06-21 21:46:14.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-06-25 21:52:46.707944219 +0100 @@ -73,16 +73,14 @@ { // Non-standard, undocumented "--unpack" switch enables unpack mode. @@ -89,8 +89,8 @@ if (logFile != null && !logFile.equals("")) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-02-17 18:47:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-02-20 01:19:23.757194433 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-06-21 21:46:14.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-06-25 21:52:46.707944219 +0100 @@ -1107,30 +1107,25 @@ // what is one of { Debug, Compile, Constant, Exceptions, InnerClasses } if (verbose > 0) @@ -142,8 +142,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2013-02-17 18:47:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2013-02-20 01:19:23.757194433 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2013-06-21 21:46:14.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2013-06-25 21:52:46.707944219 +0100 @@ -64,17 +64,23 @@ protected NTLM(String version) throws NTLMException { @@ -180,59 +180,29 @@ fac = SecretKeyFactory.getInstance ("DES"); cipher = Cipher.getInstance ("DES/ECB/NoPadding"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-02-17 18:47:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-02-20 01:35:29.564524781 +0000 -@@ -411,111 +411,106 @@ - static boolean isCallerSensitive(MemberName mem) { - if (!mem.isInvocable()) return false; // fields are not caller sensitive - Class defc = mem.getDeclaringClass(); -- switch (mem.getName()) { +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-06-21 21:46:14.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-06-26 02:23:21.025257579 +0100 +@@ -421,110 +421,105 @@ + // this method is also called by test/sun/reflect/CallerSensitiveFinder + // to validate the hand-maintained list + private static boolean isCallerSensitiveMethod(Class defc, String method) { +- switch (method) { - case "doPrivileged": - case "doPrivilegedWithCombiner": -+ String memName = mem.getName(); -+ if ("doPrivileged".equals(memName) || -+ "doPrivilegedWithCombiner".equals(memName)) { ++ if ("doPrivileged".equals(method) || ++ "doPrivilegedWithCombiner".equals(method)) { return defc == java.security.AccessController.class; - case "checkMemberAccess": -+ } else if ("checkMemberAccess".equals(memName)) { - return canBeCalledVirtual(mem, java.lang.SecurityManager.class); ++ } else if ("checkMemberAccess".equals(method)) { + return defc == java.lang.SecurityManager.class; - case "getUnsafe": -+ } else if ("getUnsafe".equals(memName)) { ++ } else if ("getUnsafe".equals(method)) { return defc == sun.misc.Unsafe.class; - case "lookup": -+ } else if ("lookup".equals(memName)) { ++ } else if ("lookup".equals(method)) { return defc == java.lang.invoke.MethodHandles.class; -- case "findStatic": -- case "findVirtual": -- case "findConstructor": -- case "findSpecial": -- case "findGetter": -- case "findSetter": -- case "findStaticGetter": -- case "findStaticSetter": -- case "bind": -- case "unreflect": -- case "unreflectSpecial": -- case "unreflectConstructor": -- case "unreflectGetter": -- case "unreflectSetter": -+ } else if ("findStatic".equals(memName) || -+ "findVirtual".equals(memName) || -+ "findConstructor".equals(memName) || -+ "findSpecial".equals(memName) || -+ "findGetter".equals(memName) || -+ "findSetter".equals(memName) || -+ "findStaticGetter".equals(memName) || -+ "findStaticSetter".equals(memName) || -+ "bind".equals(memName) || -+ "unreflect".equals(memName) || -+ "unreflectSpecial".equals(memName) || -+ "unreflectConstructor".equals(memName) || -+ "unreflectGetter".equals(memName) || -+ "unreflectSetter".equals(memName)) { - return defc == java.lang.invoke.MethodHandles.Lookup.class; - case "invoke": -+ } else if ("invoke".equals(memName)) { ++ } else if ("invoke".equals(method)) { return defc == java.lang.reflect.Method.class; - case "get": - case "getBoolean": @@ -252,33 +222,37 @@ - case "setLong": - case "setFloat": - case "setDouble": -+ } else if ("get".equals(memName) || -+ "getBoolean".equals(memName) || -+ "getByte".equals(memName) || -+ "getChar".equals(memName) || -+ "getShort".equals(memName) || -+ "getInt".equals(memName) || -+ "getFloat".equals(memName) || -+ "getDouble".equals(memName) || -+ "set".equals(memName) || -+ "setBoolean".equals(memName) || -+ "setByte".equals(memName) || -+ "setChar".equals(memName) || -+ "setShort".equals(memName) || -+ "setInt".equals(memName) || -+ "setLong".equals(memName) || -+ "setFloat".equals(memName) || -+ "setDouble".equals(memName)) { ++ } else if ("get".equals(method) || ++ "getBoolean".equals(method) || ++ "getByte".equals(method) || ++ "getChar".equals(method) || ++ "getShort".equals(method) || ++ "getInt".equals(method) || ++ "getLong".equals(method) || ++ "getFloat".equals(method) || ++ "getDouble".equals(method) || ++ "set".equals(method) || ++ "setBoolean".equals(method) || ++ "setByte".equals(method) || ++ "setChar".equals(method) || ++ "setShort".equals(method) || ++ "setInt".equals(method) || ++ "setLong".equals(method) || ++ "setFloat".equals(method) || ++ "setDouble".equals(method)) { return defc == java.lang.reflect.Field.class; - case "newInstance": -+ } else if ("newInstance".equals(memName)) { ++ } else if ("newInstance".equals(method)) { if (defc == java.lang.reflect.Constructor.class) return true; if (defc == java.lang.Class.class) return true; - break; +- case "getFields": ++ } else if ("getFields".equals(method)) { + return defc == java.lang.Class.class || + defc == javax.sql.rowset.serial.SerialJavaObject.class; - case "forName": - case "getClassLoader": - case "getClasses": -- case "getFields": - case "getMethods": - case "getConstructors": - case "getDeclaredClasses": @@ -291,88 +265,107 @@ - case "getDeclaredField": - case "getDeclaredMethod": - case "getDeclaredConstructor": -+ } else if ("forName".equals(memName) || -+ "getClassLoader".equals(memName) || -+ "getClasses".equals(memName) || -+ "getFields".equals(memName) || -+ "getMethods".equals(memName) || -+ "getConstructors".equals(memName) || -+ "getDeclaredClasses".equals(memName) || -+ "getDeclaredFields".equals(memName) || -+ "getDeclaredMethods".equals(memName) || -+ "getDeclaredConstructors".equals(memName) || -+ "getField".equals(memName) || -+ "getMethod".equals(memName) || -+ "getConstructor".equals(memName) || -+ "getDeclaredField".equals(memName) || -+ "getDeclaredMethod".equals(memName) || -+ "getDeclaredConstructor".equals(memName)) { +- case "getEnclosingClass": +- case "getEnclosingMethod": +- case "getEnclosingConstructor": ++ } else if ("forName".equals(method) || ++ "getClassLoader".equals(method) || ++ "getClasses".equals(method) || ++ "getFields".equals(method) || ++ "getMethods".equals(method) || ++ "getConstructors".equals(method) || ++ "getDeclaredClasses".equals(method) || ++ "getDeclaredFields".equals(method) || ++ "getDeclaredMethods".equals(method) || ++ "getDeclaredConstructors".equals(method) || ++ "getField".equals(method) || ++ "getMethod".equals(method) || ++ "getConstructor".equals(method) || ++ "getDeclaredField".equals(method) || ++ "getDeclaredMethod".equals(method) || ++ "getDeclaredConstructor".equals(method) || ++ "getEnclosingClass".equals(method) || ++ "getEnclosingMethod".equals(method) || ++ "getEnclosingConstructor".equals(method)) { return defc == java.lang.Class.class; - case "getConnection": - case "getDriver": - case "getDrivers": - case "deregisterDriver": -+ } else if ("getConnection".equals(memName) || -+ "getDriver".equals(memName) || -+ "getDrivers".equals(memName) || -+ "deregisterDriver".equals(memName)) { ++ } else if ("getConnection".equals(method) || ++ "getDriver".equals(method) || ++ "getDrivers".equals(method) || ++ "deregisterDriver".equals(method)) { return defc == java.sql.DriverManager.class; +- - case "newUpdater": -+ } else if ("newUpdater".equals(memName)) { ++ } else if ("newUpdater".equals(method)) { if (defc == java.util.concurrent.atomic.AtomicIntegerFieldUpdater.class) return true; if (defc == java.util.concurrent.atomic.AtomicLongFieldUpdater.class) return true; if (defc == java.util.concurrent.atomic.AtomicReferenceFieldUpdater.class) return true; - break; - case "getContextClassLoader": -+ } else if ("getContextClassLoader".equals(memName)) { - return canBeCalledVirtual(mem, java.lang.Thread.class); ++ } else if ("getContextClassLoader".equals(method)) { + return defc == java.lang.Thread.class; - case "getPackage": - case "getPackages": -+ } else if ("getPackage".equals(memName) || -+ "getPackages".equals(memName)) { ++ } else if ("getPackage".equals(method) || ++ "getPackages".equals(method)) { return defc == java.lang.Package.class; - case "getParent": - case "getSystemClassLoader": -+ } else if ("getParent".equals(memName) || -+ "getSystemClassLoader".equals(memName)) { ++ } else if ("getParent".equals(method) || ++ "getSystemClassLoader".equals(method)) { return defc == java.lang.ClassLoader.class; - case "load": - case "loadLibrary": -+ } else if ("load".equals(memName) || -+ "loadLibrary".equals(memName)) { ++ } else if ("load".equals(method) || ++ "loadLibrary".equals(method)) { if (defc == java.lang.Runtime.class) return true; if (defc == java.lang.System.class) return true; - break; - case "getCallerClass": -+ } else if ("getCallerClass".equals(memName)) { ++ } else if ("getCallerClass".equals(method)) { if (defc == sun.reflect.Reflection.class) return true; if (defc == java.lang.System.class) return true; - break; - case "getCallerClassLoader": -+ } else if ("getCallerClassLoader".equals(memName)) { ++ } else if ("getCallerClassLoader".equals(method)) { return defc == java.lang.ClassLoader.class; - case "registerAsParallelCapable": -+ } else if ("registerAsParallelCapable".equals(memName)) { - return canBeCalledVirtual(mem, java.lang.ClassLoader.class); ++ } else if ("registerAsParallelCapable".equals(method)) { + return defc == java.lang.ClassLoader.class; - case "getProxyClass": - case "newProxyInstance": -+ } else if ("getProxyClass".equals(memName) || -+ "newProxyInstance".equals(memName)) { ++ } else if ("getProxyClass".equals(method) || ++ "newProxyInstance".equals(method)) { return defc == java.lang.reflect.Proxy.class; - case "asInterfaceInstance": -+ } else if ("asInterfaceInstance".equals(memName)) { ++ } else if ("asInterfaceInstance".equals(method)) { return defc == java.lang.invoke.MethodHandleProxies.class; - case "getBundle": - case "clearCache": -+ } else if ("getBundle".equals(memName) || -+ "clearCache".equals(memName)) { ++ } else if ("getBundle".equals(method) || ++ "clearCache".equals(method)) { return defc == java.util.ResourceBundle.class; +- case "getType": ++ } else if ("getType".equals(method)) { + return defc == java.io.ObjectStreamField.class; +- case "forClass": ++ } else if ("forClass".equals(method)) { + return defc == java.io.ObjectStreamClass.class; +- case "getLogger": ++ } else if ("getLogger".equals(method)) { + return defc == java.util.logging.Logger.class; +- case "getAnonymousLogger": ++ } else if ("getAnonymousLogger".equals(method)) { + return defc == java.util.logging.Logger.class; } return false; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java 2013-02-17 18:47:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java 2013-02-20 01:19:23.757194433 +0000 -@@ -268,14 +268,16 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java 2013-06-21 21:46:14.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java 2013-06-25 21:52:46.711944282 +0100 +@@ -269,14 +269,16 @@ private static boolean isObjectMethod(Method m) { @@ -393,7 +386,7 @@ return (m.getReturnType() == boolean.class && m.getParameterTypes().length == 1 && m.getParameterTypes()[0] == Object.class); -@@ -286,12 +288,14 @@ +@@ -287,12 +289,14 @@ private static Object callObjectMethod(Object self, Method m, Object[] args) { assert(isObjectMethod(m)) : m; @@ -413,8 +406,8 @@ } return null; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2013-02-17 18:47:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2013-02-20 01:19:23.757194433 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2013-06-21 21:46:14.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2013-06-25 21:52:46.711944282 +0100 @@ -119,24 +119,20 @@ String optStr = (opts.length > 1 && opts[1] != null) ? opts[1].trim() @@ -452,8 +445,8 @@ /* diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2013-02-17 18:47:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2013-02-20 01:19:23.757194433 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2013-06-21 21:46:14.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2013-06-25 21:52:46.711944282 +0100 @@ -378,19 +378,23 @@ GE; // ">=" diff -r a91c52e39914 -r 7e0d2c785516 patches/boot/tobin.patch --- a/patches/boot/tobin.patch Tue May 28 16:42:32 2013 +0100 +++ b/patches/boot/tobin.patch Wed Jun 26 03:45:13 2013 +0100 @@ -1,38 +1,44 @@ -diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/sun/xawt/Makefile openjdk-boot/jdk/make/sun/xawt/Makefile ---- ../openjdk.orig/openjdk-boot/jdk/make/sun/xawt/Makefile 2009-10-30 16:49:39.000000000 +0000 -+++ openjdk-boot/jdk/make/sun/xawt/Makefile 2009-10-30 16:59:16.000000000 +0000 -@@ -294,11 +294,7 @@ +diff -Nru openjdk-boot.orig/jdk/make/sun/awt/Makefile openjdk-boot/jdk/make/sun/awt/Makefile +--- openjdk-boot.orig/jdk/make/sun/awt/Makefile 2013-06-25 16:52:46.810177400 +0100 ++++ openjdk-boot/jdk/make/sun/awt/Makefile 2013-06-25 16:54:43.856035962 +0100 +@@ -245,16 +245,12 @@ + $(ICONPATH)/security-icon-yellow48.png TEMPDIR_CLASSES = $(TEMPDIR)/classes +- ++ + generated.clean: + $(RM) -r $(GEN_DIR)/*.java + $(RM) -r $(TEMPDIR)/.gen_icons --$(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class: ToBin.java +-$(TEMPDIR_CLASSES)/sun/awt/ToBin.class: ToBin.java - @$(prep-target) - $(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $< - --$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class $(ICONS) +-$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/ToBin.class $(ICONS) +$(TEMPDIR)/.gen_icons: $(ICONS) $(prep-target) for i in $(ICONS); do \ filename=`basename $$i`; \ -@@ -308,20 +304,14 @@ - $(ECHO) "package sun.awt.X11;" >> $$classname ; \ - $(ECHO) "public class XAWTIcon32_$$name {" >> $$classname; \ - $(ECHO) "public static int[] $$name = { " >> $$classname; \ +@@ -264,20 +260,14 @@ + $(ECHO) "package sun.awt;" >> $$classname ; \ + $(ECHO) "public class AWTIcon32_$$name {" >> $$classname; \ + $(ECHO) "public final static int[] $$name = { " >> $$classname; \ - $(CAT) $$i | \ - $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ - -Djava.awt.headless=true \ -- sun.awt.X11.ToBin >> $$classname; \ +- sun.awt.ToBin >> $$classname; \ + $(ECHO) "0,0" >> $$classname ; \ $(ECHO) "}; }" >> $$classname; \ - classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \ + classname=$(GEN_DIR)/AWTIcon64_$$name.java; \ $(RM) $$classname; \ - $(ECHO) "package sun.awt.X11;" >> $$classname ; \ - $(ECHO) "public class XAWTIcon64_$$name {" >> $$classname; \ - $(ECHO) "public static long[] $$name = { " >> $$classname; \ + $(ECHO) "package sun.awt;" >> $$classname ; \ + $(ECHO) "public class AWTIcon64_$$name {" >> $$classname; \ + $(ECHO) "public final static long[] $$name = { " >> $$classname; \ - $(CAT) $$i | \ - $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ - -Djava.awt.headless=true \ -- sun.awt.X11.ToBin >> $$classname; \ +- sun.awt.ToBin >> $$classname; \ + $(ECHO) "0,0" >> $$classname ; \ $(ECHO) "}; }" >> $$classname; \ done From bugzilla-daemon at icedtea.classpath.org Wed Jun 26 00:21:03 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 26 Jun 2013 07:21:03 +0000 Subject: [Bug 1482] Property access fails when JNLP is remote, works when local In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1482 --- Comment #1 from Aleksi Kallio --- I have inspected this further and the conclusion about property access being broken was incorrect. Properties can be read and set correctly. It seems that this is log4j specific. java.security.AccessControlException: access denied ("java.io.FilePermission" "/chipster.log" "write") at java.security.AccessControlContext.checkPermission(AccessControlContext.java:366) at java.security.AccessController.checkPermission(AccessController.java:560) at java.lang.SecurityManager.checkPermission(SecurityManager.java:549) at net.sourceforge.jnlp.runtime.JNLPSecurityManager.checkPermission(JNLPSecurityManager.java:284) at java.lang.SecurityManager.checkWrite(SecurityManager.java:979) at java.io.FileOutputStream.(FileOutputStream.java:203) at java.io.FileOutputStream.(FileOutputStream.java:136) at org.apache.log4j.FileAppender.setFile(FileAppender.java:290) at org.apache.log4j.RollingFileAppender.setFile(RollingFileAppender.java:194) at org.apache.log4j.FileAppender.activateOptions(FileAppender.java:164) at org.apache.log4j.config.PropertySetter.activate(PropertySetter.java:257) at org.apache.log4j.config.PropertySetter.setProperties(PropertySetter.java:133) at org.apache.log4j.config.PropertySetter.setProperties(PropertySetter.java:97) at org.apache.log4j.PropertyConfigurator.parseAppender(PropertyConfigurator.java:689) at org.apache.log4j.PropertyConfigurator.parseCategory(PropertyConfigurator.java:647) at org.apache.log4j.PropertyConfigurator.configureRootCategory(PropertyConfigurator.java:544) at org.apache.log4j.PropertyConfigurator.doConfigure(PropertyConfigurator.java:440) at org.apache.log4j.PropertyConfigurator.doConfigure(PropertyConfigurator.java:476) at org.apache.log4j.helpers.OptionConverter.selectAndConfigure(OptionConverter.java:471) at org.apache.log4j.LogManager.(LogManager.java:125) ... 10 more If I try to disable Log4j using its PropertyConfigurator, it works on Oracle JRE, but fails on OpenJDK. I get NoSuchMethodError for PropertyConfigurator.configure(InputStream), which is weird, because the method is there. One possible explanation could be that IcedTea-web picks up some other Log4j implementation in some cases. Our application is one large JAR file (built with FatJar) that contains correct version of Log4j. If this is the reason, the weird part is that having JNLP file local or remote changes what Log4j classes are being loaded. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130626/5f267cea/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Jun 26 00:22:16 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 26 Jun 2013 07:22:16 +0000 Subject: [Bug 1482] Log4j fails when JNLP is remote, works when local In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1482 Aleksi Kallio changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|Property access fails when |Log4j fails when JNLP is |JNLP is remote, works when |remote, works when local |local | -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130626/2995abe2/attachment.html From ptisnovs at icedtea.classpath.org Wed Jun 26 01:44:33 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 26 Jun 2013 08:44:33 +0000 Subject: /hg/gfx-test: Added eight new tests into BitBltAffineIdentityTra... Message-ID: changeset 6d51956c1adb in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=6d51956c1adb author: Pavel Tisnovsky date: Wed Jun 26 10:48:01 2013 +0200 Added eight new tests into BitBltAffineIdentityTransformOp test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java | 149 +++++++++- 2 files changed, 152 insertions(+), 2 deletions(-) diffs (179 lines): diff -r bc102f07b264 -r 6d51956c1adb ChangeLog --- a/ChangeLog Fri Jun 21 12:14:47 2013 +0200 +++ b/ChangeLog Wed Jun 26 10:48:01 2013 +0200 @@ -1,3 +1,8 @@ +2013-06-26 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java: + Added eight new tests into BitBltAffineIdentityTransformOp test suite. + 2013-06-21 Pavel Tisnovsky * src/org/gfxtest/framework/CommonBitmapOperations.java: diff -r bc102f07b264 -r 6d51956c1adb src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java --- a/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java Fri Jun 21 12:14:47 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java Wed Jun 26 10:48:01 2013 +0200 @@ -40,7 +40,14 @@ package org.gfxtest.testsuites; -import org.gfxtest.framework.GfxTest; +import java.awt.Graphics2D; +import java.awt.geom.AffineTransform; +import java.awt.image.AffineTransformOp; + + + +import org.gfxtest.framework.TestImage; +import org.gfxtest.framework.TestResult; import org.gfxtest.framework.annotations.BitBltOperation; import org.gfxtest.framework.annotations.BitBltOperations; import org.gfxtest.framework.annotations.GraphicsPrimitive; @@ -61,8 +68,146 @@ @BitBltOperation(BitBltOperations.BITBLT) @Transformation(Transformations.NONE) @Zoom(1) -public class BitBltAffineIdentityTransformOp extends GfxTest +public class BitBltAffineIdentityTransformOp extends BitBltAffineTransformOp { + private static final AffineTransform IdentifyTransformation = new AffineTransform(); + + private static final AffineTransformOp IdentifyTranspormationOp1; + private static final AffineTransformOp IdentifyTranspormationOp2; + private static final AffineTransformOp IdentifyTranspormationOp3; + + static { + IdentifyTranspormationOp1 = new AffineTransformOp(IdentifyTransformation, AffineTransformOp.TYPE_NEAREST_NEIGHBOR); + IdentifyTranspormationOp2 = new AffineTransformOp(IdentifyTransformation, AffineTransformOp.TYPE_BILINEAR); + IdentifyTranspormationOp3 = new AffineTransformOp(IdentifyTransformation, AffineTransformOp.TYPE_BICUBIC); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType3ByteBGRIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp1); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType3ByteBGRIdentifyTranspormationOp2(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp2); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType3ByteBGRIdentifyTranspormationOp3(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp3); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp1); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp2(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp2); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp3(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp3); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp1); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp2(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp2); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp3(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp3); + } + /** * Entry point to the test suite. * From ptisnovs at icedtea.classpath.org Wed Jun 26 01:55:39 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 26 Jun 2013 08:55:39 +0000 Subject: /hg/rhino-tests: Updated four tests in ScriptExceptionClassTest ... Message-ID: changeset 75e3e48ef286 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=75e3e48ef286 author: Pavel Tisnovsky date: Wed Jun 26 10:59:13 2013 +0200 Updated four tests in ScriptExceptionClassTest for (Open)JDK8 API: getMethod, getMethods, getDeclaredMethod and getDeclaredMethods. diffstat: ChangeLog | 6 + src/org/RhinoTests/ScriptExceptionClassTest.java | 158 +++++++++++++++++++++- 2 files changed, 155 insertions(+), 9 deletions(-) diffs (265 lines): diff -r 91109f10e626 -r 75e3e48ef286 ChangeLog --- a/ChangeLog Fri Jun 21 12:17:48 2013 +0200 +++ b/ChangeLog Wed Jun 26 10:59:13 2013 +0200 @@ -1,3 +1,9 @@ +2013-06-26 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptExceptionClassTest.java: + Updated four tests in ScriptExceptionClassTest for (Open)JDK8 API: + getMethod, getMethods, getDeclaredMethod and getDeclaredMethods. + 2013-06-21 Pavel Tisnovsky * src/org/RhinoTests/SimpleBindingsClassTest.java: diff -r 91109f10e626 -r 75e3e48ef286 src/org/RhinoTests/ScriptExceptionClassTest.java --- a/src/org/RhinoTests/ScriptExceptionClassTest.java Fri Jun 21 12:17:48 2013 +0200 +++ b/src/org/RhinoTests/ScriptExceptionClassTest.java Wed Jun 26 10:59:13 2013 +0200 @@ -699,7 +699,6 @@ "public java.lang.String java.lang.Throwable.toString()", "public java.lang.String javax.script.ScriptException.getFileName()", "public java.lang.String javax.script.ScriptException.getMessage()", - "public java.lang.Throwable java.lang.Throwable.getCause()", "public native int java.lang.Object.hashCode()", "public synchronized java.lang.Throwable java.lang.Throwable.initCause(java.lang.Throwable)", "public synchronized native java.lang.Throwable java.lang.Throwable.fillInStackTrace()", @@ -715,6 +714,30 @@ "public final native void java.lang.Object.notify()", "public final native void java.lang.Object.notifyAll()", "public final native void java.lang.Object.wait(long) throws java.lang.InterruptedException", + "public final void java.lang.Object.wait() throws java.lang.InterruptedException", + "public final void java.lang.Object.wait(long,int) throws java.lang.InterruptedException", + "public int javax.script.ScriptException.getColumnNumber()", + "public int javax.script.ScriptException.getLineNumber()", + "public java.lang.StackTraceElement[] java.lang.Throwable.getStackTrace()", + "public java.lang.String java.lang.Throwable.getLocalizedMessage()", + "public java.lang.String java.lang.Throwable.toString()", + "public java.lang.String javax.script.ScriptException.getFileName()", + "public java.lang.String javax.script.ScriptException.getMessage()", + "public native int java.lang.Object.hashCode()", + "public synchronized java.lang.Throwable java.lang.Throwable.initCause(java.lang.Throwable)", + "public synchronized java.lang.Throwable java.lang.Throwable.fillInStackTrace()", + "public void java.lang.Throwable.printStackTrace()", + "public void java.lang.Throwable.printStackTrace(java.io.PrintStream)", + "public void java.lang.Throwable.printStackTrace(java.io.PrintWriter)", + "public void java.lang.Throwable.setStackTrace(java.lang.StackTraceElement[])", + }; + + final String[] methodsThatShouldExist_jdk8 = { + "public boolean java.lang.Object.equals(java.lang.Object)", + "public final native java.lang.Class java.lang.Object.getClass()", + "public final native void java.lang.Object.notify()", + "public final native void java.lang.Object.notifyAll()", + "public final native void java.lang.Object.wait(long) throws java.lang.InterruptedException", "public final synchronized java.lang.Throwable[] java.lang.Throwable.getSuppressed()", "public final synchronized void java.lang.Throwable.addSuppressed(java.lang.Throwable)", "public final void java.lang.Object.wait() throws java.lang.InterruptedException", @@ -743,7 +766,20 @@ for (Method method : methods) { methodsAsString.add(method.toString()); } - String[] methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + + String[] methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } + // check if all required methods really exists for (String methodThatShouldExists : methodsThatShouldExist) { assertTrue(methodsAsString.contains(methodThatShouldExists), @@ -770,6 +806,13 @@ "public java.lang.String javax.script.ScriptException.getMessage()", }; + final String[] declaredMethodsThatShouldExist_jdk8 = { + "public int javax.script.ScriptException.getColumnNumber()", + "public int javax.script.ScriptException.getLineNumber()", + "public java.lang.String javax.script.ScriptException.getFileName()", + "public java.lang.String javax.script.ScriptException.getMessage()", + }; + // get all declared methods Method[] declaredMethods = this.scriptExceptionClass.getDeclaredMethods(); // and transform the array into a list of method names @@ -777,7 +820,20 @@ for (Method method : declaredMethods) { methodsAsString.add(method.toString()); } - String[] declaredMethodsThatShouldExist = getJavaVersion() < 7 ? declaredMethodsThatShouldExist_jdk6 : declaredMethodsThatShouldExist_jdk7; + + String[] declaredMethodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk6; + break; + case 7: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk7; + break; + case 8: + declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk8; + break; + } + // check if all required methods really exists for (String methodThatShouldExists : declaredMethodsThatShouldExist) { assertTrue(methodsAsString.contains(methodThatShouldExists), @@ -799,7 +855,6 @@ methodsThatShouldExist_jdk6.put("printStackTrace", new Class[] {java.io.PrintStream.class}); methodsThatShouldExist_jdk6.put("printStackTrace", new Class[] {java.io.PrintWriter.class}); methodsThatShouldExist_jdk6.put("fillInStackTrace", new Class[] {}); - methodsThatShouldExist_jdk6.put("getCause", new Class[] {}); methodsThatShouldExist_jdk6.put("initCause", new Class[] {java.lang.Throwable.class}); methodsThatShouldExist_jdk6.put("toString", new Class[] {}); methodsThatShouldExist_jdk6.put("getLocalizedMessage", new Class[] {}); @@ -823,7 +878,6 @@ methodsThatShouldExist_jdk7.put("printStackTrace", new Class[] {java.io.PrintWriter.class}); methodsThatShouldExist_jdk7.put("printStackTrace", new Class[] {java.io.PrintStream.class}); methodsThatShouldExist_jdk7.put("fillInStackTrace", new Class[] {}); - methodsThatShouldExist_jdk7.put("getCause", new Class[] {}); methodsThatShouldExist_jdk7.put("initCause", new Class[] {java.lang.Throwable.class}); methodsThatShouldExist_jdk7.put("toString", new Class[] {}); methodsThatShouldExist_jdk7.put("getLocalizedMessage", new Class[] {}); @@ -840,7 +894,44 @@ methodsThatShouldExist_jdk7.put("notify", new Class[] {}); methodsThatShouldExist_jdk7.put("notifyAll", new Class[] {}); - Map methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + Map methodsThatShouldExist_jdk8 = new TreeMap(); + methodsThatShouldExist_jdk8.put("getColumnNumber", new Class[] {}); + methodsThatShouldExist_jdk8.put("getMessage", new Class[] {}); + methodsThatShouldExist_jdk8.put("getFileName", new Class[] {}); + methodsThatShouldExist_jdk8.put("getLineNumber", new Class[] {}); + methodsThatShouldExist_jdk8.put("printStackTrace", new Class[] {}); + methodsThatShouldExist_jdk8.put("printStackTrace", new Class[] {java.io.PrintWriter.class}); + methodsThatShouldExist_jdk8.put("printStackTrace", new Class[] {java.io.PrintStream.class}); + methodsThatShouldExist_jdk8.put("fillInStackTrace", new Class[] {}); + methodsThatShouldExist_jdk8.put("getCause", new Class[] {}); + methodsThatShouldExist_jdk8.put("initCause", new Class[] {java.lang.Throwable.class}); + methodsThatShouldExist_jdk8.put("toString", new Class[] {}); + methodsThatShouldExist_jdk8.put("getLocalizedMessage", new Class[] {}); + methodsThatShouldExist_jdk8.put("getStackTrace", new Class[] {}); + methodsThatShouldExist_jdk8.put("setStackTrace", new Class[] {Class.forName("[Ljava.lang.StackTraceElement;")}); + methodsThatShouldExist_jdk8.put("addSuppressed", new Class[] {java.lang.Throwable.class}); + methodsThatShouldExist_jdk8.put("getSuppressed", new Class[] {}); + methodsThatShouldExist_jdk8.put("wait", new Class[] {long.class, int.class}); + methodsThatShouldExist_jdk8.put("wait", new Class[] {long.class}); + methodsThatShouldExist_jdk8.put("wait", new Class[] {}); + methodsThatShouldExist_jdk8.put("equals", new Class[] {java.lang.Object.class}); + methodsThatShouldExist_jdk8.put("hashCode", new Class[] {}); + methodsThatShouldExist_jdk8.put("getClass", new Class[] {}); + methodsThatShouldExist_jdk8.put("notify", new Class[] {}); + methodsThatShouldExist_jdk8.put("notifyAll", new Class[] {}); + + Map methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } // check if all required methods really exist for (Map.Entry methodThatShouldExists : methodsThatShouldExist.entrySet()) { @@ -878,7 +969,24 @@ methodsThatShouldExist_jdk7.put("getLineNumber", new Class[] {}); methodsThatShouldExist_jdk7.put("getColumnNumber", new Class[] {}); - Map methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7; + Map methodsThatShouldExist_jdk8 = new TreeMap(); + methodsThatShouldExist_jdk8.put("getColumnNumber", new Class[] {}); + methodsThatShouldExist_jdk8.put("getMessage", new Class[] {}); + methodsThatShouldExist_jdk8.put("getFileName", new Class[] {}); + methodsThatShouldExist_jdk8.put("getLineNumber", new Class[] {}); + + Map methodsThatShouldExist = null; + switch (getJavaVersion()) { + case 6: + methodsThatShouldExist = methodsThatShouldExist_jdk6; + break; + case 7: + methodsThatShouldExist = methodsThatShouldExist_jdk7; + break; + case 8: + methodsThatShouldExist = methodsThatShouldExist_jdk8; + break; + } // check if all required methods really exist for (Map.Entry methodThatShouldExists : methodsThatShouldExist.entrySet()) { @@ -910,6 +1018,9 @@ final String[] annotationsThatShouldExists_jdk7 = { }; + final String[] annotationsThatShouldExists_jdk8 = { + }; + // get all annotations Annotation[] annotations = this.scriptExceptionClass.getAnnotations(); // and transform the array into a list of annotation names @@ -917,7 +1028,20 @@ for (Annotation annotation : annotations) { annotationsAsString.add(annotation.toString()); } - String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + + String[] annotationsThatShouldExists = null; + switch (getJavaVersion()) { + case 6: + annotationsThatShouldExists = annotationsThatShouldExists_jdk6; + break; + case 7: + annotationsThatShouldExists = annotationsThatShouldExists_jdk7; + break; + case 8: + annotationsThatShouldExists = annotationsThatShouldExists_jdk8; + break; + } + // check if all required annotations really exists for (String annotationThatShouldExists : annotationsThatShouldExists) { assertTrue(annotationsAsString.contains(annotationThatShouldExists), @@ -936,6 +1060,9 @@ final String[] annotationsThatShouldExists_jdk7 = { }; + final String[] annotationsThatShouldExists_jdk8 = { + }; + // get all annotations Annotation[] annotations = this.scriptExceptionClass.getDeclaredAnnotations(); // and transform the array into a list of annotation names @@ -943,7 +1070,20 @@ for (Annotation annotation : annotations) { annotationsAsString.add(annotation.toString()); } - String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + + String[] annotationsThatShouldExists = null; + switch (getJavaVersion()) { + case 6: + annotationsThatShouldExists = annotationsThatShouldExists_jdk6; + break; + case 7: + annotationsThatShouldExists = annotationsThatShouldExists_jdk7; + break; + case 8: + annotationsThatShouldExists = annotationsThatShouldExists_jdk8; + break; + } + // check if all required annotations really exists for (String annotationThatShouldExists : annotationsThatShouldExists) { assertTrue(annotationsAsString.contains(annotationThatShouldExists), From andrew at icedtea.classpath.org Wed Jun 26 07:14:48 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 26 Jun 2013 14:14:48 +0000 Subject: /hg/release/icedtea7-2.3: 3 new changesets Message-ID: changeset 2ab5030e8099 in /hg/release/icedtea7-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=2ab5030e8099 author: Andrew John Hughes date: Tue Jun 25 22:46:10 2013 -0500 List security fixes and other changes in u21 & u25. 2013-06-25 Andrew John Hughes * NEWS: Add latest security fixes and other changes brought in when syncing with 7u25. changeset fa6d934a26a4 in /hg/release/icedtea7-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=fa6d934a26a4 author: Andrew John Hughes date: Tue Jun 25 23:05:20 2013 -0500 Add Red Hat bugzilla references. 2013-06-25 Andrew John Hughes * NEWS: Add Red Hat bugzilla references. changeset 26e811fe4d45 in /hg/release/icedtea7-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=26e811fe4d45 author: Andrew John Hughes date: Tue Jun 25 23:25:25 2013 -0500 Clearup duplication of security bugs. 2013-06-25 Andrew John Hughes * NEWS: Cleanup security issue duplication. diffstat: ChangeLog | 13 +++ NEWS | 232 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 213 insertions(+), 32 deletions(-) diffs (438 lines): diff -r 7e0d2c785516 -r 26e811fe4d45 ChangeLog --- a/ChangeLog Wed Jun 26 03:45:13 2013 +0100 +++ b/ChangeLog Tue Jun 25 23:25:25 2013 -0500 @@ -1,3 +1,16 @@ +2013-06-25 Andrew John Hughes + + * NEWS: Cleanup security issue duplication. + +2013-06-25 Andrew John Hughes + + * NEWS: Add Red Hat bugzilla references. + +2013-06-25 Andrew John Hughes + + * NEWS: Add latest security fixes and other + changes brought in when syncing with 7u25. + 2013-06-25 Andrew John Hughes * Makefile.am: diff -r 7e0d2c785516 -r 26e811fe4d45 NEWS --- a/NEWS Wed Jun 26 03:45:13 2013 +0100 +++ b/NEWS Tue Jun 25 23:25:25 2013 -0500 @@ -12,11 +12,208 @@ New in release 2.3.10 (2013-06-XX): +* Security fixes + - S6741606, CVE-2013-2407: Integrate Apache Santuario + - S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls + - S7170730, CVE-2013-2451: Improve Windows network stack support. + - S8000638, CVE-2013-2450: Improve deserialization + - S8000642, CVE-2013-2446: Better handling of objects for transportation + - S8001032: Restrict object access + - S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers + - S8001034, CVE-2013-1500: Memory management improvements + - S8001038, CVE-2013-2444: Resourcefully handle resources + - S8001043: Clarify definition restrictions + - S8001308: Update display of applet windows + - S8001309: Better handling of annotation interfaces + - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost + - S8001330, CVE-2013-2443: Improve on checking order + - S8003703, CVE-2013-2412: Update RMI connection dialog box + - S8004288, CVE-2013-2449: (fs) Files.probeContentType problems + - S8004584: Augment applet contextualization + - S8005007: Better glyph processing + - S8006328, CVE-2013-2448: Improve robustness of sound classes + - S8006611: Improve scripting + - S8007467: Improve robustness of JMX internal APIs + - S8007471: Improve MBean notifications + - S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes + - S8007925: Improve cmsStageAllocLabV2ToV4curves + - S8007926: Improve cmsPipelineDup + - S8007927: Improve cmsAllocProfileSequenceDescription + - S8007929: Improve CurvesAlloc + - S8008120, CVE-2013-2457: Improve JMX class checking + - S8008124, CVE-2013-2453: Better compliance testing + - S8008128: Better API coherence for JMX + - S8008132, CVE-2013-2456: Better serialization support + - S8008585: Better JMX data handling + - S8008593: Better URLClassLoader resource management + - S8008603: Improve provision of JMX providers + - S8008607: Better input checking in JMX + - S8008611: Better handling of annotations in JMX + - S8008615: Improve robustness of JMX internal APIs + - S8008623: Better handling of MBeanServers + - S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606 + - S8008982: Adjust JMX for underlying interface changes + - S8009004: Better implementation of RMI connections + - S8009008: Better manage management-api + - S8009013: Better handling of T2K glyphs + - S8009034: Improve resulting notifications in JMX + - S8009038: Improve JMX notification support + - S8009057, CVE-2013-2448: Improve MIDI event handling + - S8009067: Improve storing keys in KeyStore + - S8009071, CVE-2013-2459: Improve shape handling + - S8009235: Improve handling of TSA data + - S8009424, CVE-2013-2458: Adapt Nashorn to JSR-292 implementation change + - S8009554, CVE-2013-2454: Improve SerialJavaObject.getFields + - S8009654: Improve stability of cmsnamed + - S8010209, CVE-2013-2460: Better provision of factories + - S8011243, CVE-2013-2470: Improve ImagingLib + - S8011248, CVE-2013-2471: Better Component Rasters + - S8011253, CVE-2013-2472: Better Short Component Rasters + - S8011257, CVE-2013-2473: Better Byte Component Rasters + - S8012375, CVE-2013-1571: Improve Javadoc framing + - S8012421: Better positioning of PairPositioning + - S8012438, CVE-2013-2463: Better image validation + - S8012597, CVE-2013-2465: Better image channel verification + - S8012601, CVE-2013-2469: Better validation of image layouts + - S8014281, CVE-2013-2461: Better checking of XML signature + - S8015997: Additional improvement in Javadoc framing * New features - PR1378: Add AArch64 support to Zero * Bug fixes - PR1409: IcedTea 2.3.9 fails to build Zero due to -Werror - PR1410: Icedtea 2.3.9 fails to build using icedtea 1.12.4 +* Backports + - S6720349: (ch) Channels tests depending on hosts inside Sun + - S6736316: Timeout value in java/util/concurrent/locks/Lock/FlakyMutex.java is insufficient + - S6776144: java/lang/ThreadGroup/NullThreadName.java fails with Thread group is not destroyed ,fastdebug LINUX + - S6818464: TEST_BUG: java/util/Timer/KillThread.java failing intermittently + - S6860309: TEST_BUG: Insufficient sleep time in java/lang/Runtime/exec/StreamsSurviveDestroy.java + - S6948101: java/rmi/transport/pinLastArguments/PinLastArguments.java failing intermittently + - S6957683: test/java/util/concurrent/ThreadPoolExecutor/Custom.java failing + - S6963102: Testcase failures sun/tools/jstatd/jstatdExternalRegistry.sh and sun/tools/jstatd/jstatdDefaults.sh + - S6963841: java/util/concurrent/Phaser/Basic.java fails intermittently + - S6965150: TEST_BUG: java/nio/channels/AsynchronousSocketChannel/Basic.java takes too long + - S7030573: test/java/io/FileInputStream/LargeFileAvailable.java fails when there is insufficient disk space + - S7032247: java/net/InetAddress/GetLocalHostWithSM.java fails if hostname resolves to loopback address + - S7044870: java/nio/channels/DatagramChannel/SelectWhenRefused.java failed on SUSE Linux 10 + - S7053526: Upgrade JDK 8 to use Little CMS 2.4 + - S7054918: jdk_security1 test target cleanup + - S7055362: jdk_security2 test target cleanup + - S7055363: jdk_security3 test target cleanup + - S7072120: No mac os x support in several regression tests + - S7073295: TEST_BUG: test/java/lang/instrument/ManifestTest.sh causing havoc (win) + - S7076756: TEST_BUG: com/sun/jdi/BreakpointWithFullGC.sh fails to cleanup in Cygwin + - S7076791: closed/javax/swing/JColorChooser/Test6827032.java failed on windows + - S7077259: [TEST_BUG] [macosx] Test work correctly only when default L&F is Metal + - S7084033: TEST_BUG: test/java/lang/ThreadGroup/Stop.java fails intermittently + - S7089131: test/java/lang/invoke/InvokeGenericTest.java does not compile + - S7102106: TEST_BUG: sun/security/util/Oid/S11N.sh should be modified + - S7104161: test/sun/tools/jinfo/Basic.sh fails on Ubuntu + - S7104594: [macosx] Test closed/javax/swing/JFrame/4962534/bug4962534 expects Metal L&F by default + - S7105929: java/util/concurrent/FutureTask/BlockingTaskExecutor.java fails on solaris sparc + - S7124347: [macosx] "java.lang.InternalError: not implemented yet" on call Graphics2D.drawRenderedImage + - S7129800: [macosx] Regression test OverrideRedirectWindowActivationTest fails due to timing issue + - S7132247: java/rmi/registry/readTest/readTest.sh failing with Cygwin + - S7140868: TEST_BUG: jcmd tests need to use -XX:+UsePerfData + - S7142596: RMI JPRT tests are failing + - S7144833: sun/tools/jcmd/jcmd-Defaults.sh failing intermittently + - S7144861: speed up RMI activation tests + - S7147408: [macosx] Add autodelay to fix a regression test + - S7151434, RH969884: java -jar -XX crashes java launcher + - S7152183: TEST_BUG: java/lang/ProcessBuilder/Basic.java failing intermittently [sol] + - S7152796: TEST_BUG: java/net/Socks/SocksV4Test.java does not terminate + - S7152856: TEST_BUG: sun/net/www/protocol/jar/B4957695.java failing on Windows + - S7154113: jcmd, jps and jstat tests failing when there are unknown Java processes on the system + - S7154114: jstat tests failing on non-english locales + - S7161759: TEST_BUG: java/awt/Frame/WindowDragTest/WindowDragTest.java fails to compile, should be modified + - S7162111: TEST_BUG: change tests run in headless mode [macosx] + - S7162385: TEST_BUG: sun/net/www/protocol/jar/B4957695.java failing again + - S7175775: Disable SA options in jinfo/Basic.java test until SA updated for new hash and String count/offset + - S7178649: TEST BUG: BadKdc3.java needs improvement to ignore the unlikely but possible timeout + - S7183203: ShortRSAKeynnn.sh tests intermittent failure + - S7183753: [TEST] Some colon in the diff for this test + - S7184943: fix failing test com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java + - S7184946: fix failing test com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java + - S7185340: TEST_BUG: java/nio/channels/AsynchronousSocketChannel/Leaky.java failing intermittently [win] + - S7186111: fix bugs in java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup + - S7187882: TEST_BUG: java/rmi/activation/checkusage/CheckUsage.java fails intermittently + - S7193219: JComboBox serialization fails in JDK 1.7 + - S7194032: update tests for upcoming changes for jtreg + - S7194035: update tests for upcoming changes for jtreg + - S7199143: RFE: OCSP revocation checker should provide possibility to specify connection timeout + - S7199637: TEST_BUG: add serialization tests to jdk7u problem list for macosx + - S8000817: Reinstate accidentally removed sleep() from ProcessBuilder/Basic.java + - S8001161: mac: EmbeddedFrame doesn't become active window + - S8001621: Update awk scripts that check output from jps/jcmd + - S8002070: Remove the stack search for a resource bundle for Logger to use + - S8002297: sun/net/www/protocol/http/StackTraceTest.java fails intermittently + - S8002313: TEST_BUG : jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.java should run in headless mode + - S8003597: TEST_BUG: Eliminate dependency on javaweb from closed net tests + - S8003982: new test javax/swing/AncestorNotifier/7193219/bug7193219.java failed on macosx + - S8004317: TestLibrary.getUnusedRandomPort() fails intermittently, but exception not reported + - S8004748: clean up @build tags in RMI tests + - S8004925: java/net/Socks/SocksV4Test.java failing on all platforms + - S8005290: remove -showversion from RMI test library subprocess mechanism + - S8005556: java/net/Socks/SocksV4Test.java is missing @run tag + - S8005646: TEST_BUG: java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup leaves process running + - S8005920: After pressing combination Windows Key and M key, the frame, the instruction and the dialog can't be minimized. + - S8005932: Java 7 on mac os x only provides text clipboard formats + - S8006120: Provide "Server JRE" for 7u train + - S8006417: JComboBox.showPopup(), hidePopup() fails in JRE 1.7 on OS X + - S8006534: CLONE - TestLibrary.getUnusedRandomPort() fails intermittently-doesn't retry enough times + - S8006536: [launcher] removes trailing slashes on arguments + - S8006560: java/net/ipv6tests/B6521014.java fails intermittently + - S8006564: Test sun/security/util/Oid/S11N.sh fails with timeout on Linux 32-bit + - S8006669: sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh fails on mac + - S8007515: TEST_BUG: update ProblemList.txt and TEST.ROOT in jdk7u-dev to match jdk8 + - S8007699: Move some tests from test/sun/security/provider/certpath/X509CertPath to closed repo + - S8008223: java/net/BindException/Test.java fails rarely + - S8008249: Sync ICU into JDK : + - S8008379: TEST_BUG: Fail automatically with java.lang.NullPointerException. + - S8008815: [TEST_BUG] Add back tests to the Problemlist files post the jdk7u -> 7u-cpu test sync up + - S8009165: Fix for 8008817 needs revision + - S8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03 + - S8009463: Regression test test\java\lang\Runtime\exec\ArgWithSpaceAndFinalBackslash.java failing. + - S8009530: ICU Kern table support broken + - S8009610: Blacklist certificate used with malware. + - S8009634: TEST_BUG: sun/misc/Version/Version.java handle 2 digit minor in VM version + - S8009750: javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java should run in other vm mode + - S8009987: (tz) Support tzdata2013b + - S8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail + - S8009999: Test sun/tools/jcmd/jcmd-f.sh failing after JDK-8008820 + - S8010009: [macosx] Unable type into online word games on MacOSX + - S8010118: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive + - S8010166: TEST_BUG: fix for 8009634 overlooks possible version strings (sun/misc/Version/Version.java) + - S8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build + - S8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod + - S8010727: WLS fails to add a logger with "" in its own LogManager subclass instance + - S8010939: Deadlock in LogManager + - S8011139: (reflect) Revise checking in getEnclosingClass + - S8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows + - S8011313: OCSP timeout set to wrong value if com.sun.security.ocsp.timeout not defined + - S8011557: Improve reflection utility classes + - S8011695: [tck-red] Application can not be run, the Security Warning dialog is gray. + - S8011806: 7u25-b05 hotspot fastdebug build failure + - S8011896: Add check for invalid offset for new AccessControlContext isAuthorized field + - S8011990: TEST_BUG: java/util/logging/bundlesearch/ResourceBundleSearchTest.java fails on Windows + - S8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05 + - S8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris + - S8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21 + - S8012330: [macosx] Sometimes the applet showing the modal dialog itself loses the ability to gain focus + - S8012453: (process) Runtime.exec(String) fails if command contains spaces [win] + - S8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer + - S8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07 + - S8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext() + - S8013228: Create new system properties to control allowable OCSP clock skew and CRL connection timeout + - S8013380: Removal of stack walk to find resource bundle breaks Glassfish startup + - S8014205: Most of the Swing dialogs are blank on one win7 MUI + - S8014423: [macosx] The scrollbar's block increment performs incorrectly + - S8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09 + - S8014618, RH868136: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement + - S8014676: Java debugger may fail to run + - S8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10 + - S8014745: Provide a switch to allow stack walk search of resource bundle + - S8014968: OCSP and CRL connection timeout is set to four hours by default New in release 2.3.9 (2013-04-21): @@ -174,7 +371,6 @@ - S8000307: Jre7cert: focusgained does not get called for all focus req when do alt + tab - S8000822: Fork hs23.7 hsx from hs23.6 for jdk7u11 and reinitialize build number - S8001124: jdk7u ProblemList.txt updates (10/2012) - - S8001242: Improve RMI HTTP conformance - S8001808: Create a test for 8000327 - S8001876: Create regtest for 8000283 - S8002068: Build broken: corba code changes unable to use new JDK 7 classes @@ -228,7 +424,6 @@ - S7195919, CVE-2012-5079: (sl) ServiceLoader can throw CCE without needing to create instance - S7196190, CVE-2012-5088: Improve method of handling MethodHandles - S7198296, CVE-2012-5089: Refactor classloader usage - - S7158800: Improve storage of symbol tables - S7158801: Improve VM CompileOnly option - S7158804: Improve config file parsing - S7198606, CVE-2012-4416: Improve VM optimization @@ -298,13 +493,11 @@ - S7027139: getFirstIndex() does not return the first index that has changed - S7027300: Unsynchronized HashMap access causes endless loop - S7043963: AWT workaround missing for Mutter. - - S7049339: AnyBlit is broken with non-rectangular clips. - S7063674: Wrong results from basic comparisons after calls to Long.bitCount(long) - S7071826: Avoid benign race condition in initialization of UUID - S7071907: JDK: Full Debug Symbols - S7074616: java.lang.management.ManagementFactory.getPlatformManagementInterfaces fails - S7074853: TransparentRuler demos Readme should mention the correct jar file name - - S7079902: Refine CORBA data models - S7080109: Dialog.show() lacks doPrivileged() to access system event queue - S7087428: move client tests out of jdk_misc - S7090832: Some locale info are not localized for some languages. @@ -382,12 +575,7 @@ - S7142641: -Xshared:on fails on ARM - S7142847: TEST_BUG: java/nio/file/WatchService/SensitivityModifier.java has incorrect @run tag, runs Basic - S7143353: -Xrunhprof fails in Java 7 due to bad switch - - S7143606: File.createTempFile should be improved for temporary files created by the platform. - - S7143614: SynthLookAndFeel stability improvement - - S7143617: Improve fontmanager layout lookup operations - S7143744: (se) Stabilize KQueue SelectorProvider and make default on MacOSX - - S7143851: Improve IIOP stub and tie generation in RMIC - - S7143872: Improve certificate extension processing - S7144063: [macosx] Swing JMenu mnemonic doesn't work; hint misleading; cross symbol typed - S7144086: TEST_BUG: java/nio/file/WatchService/SensitivityModifier.java failing intermittently - S7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages @@ -454,7 +642,6 @@ - S7152690: Initialization error with charset SJIS_0213 when security manager is enabled - S7152784: new hotspot build - hs23-b19 - S7152800: All tests using the attach API fail with "well-known file is not secure" on Mac OS X - - S7152811: Issues in client compiler - S7152952: [macosx] List rows overlap with enlarged font - S7152954: G1: Native memory leak during full GCs - S7153184: NullPointerException when calling SSLEngineImpl.getSupportedCipherSuites @@ -474,14 +661,10 @@ - S7154516: [macosx] Popup menus have no visible borders - S7154677: new hotspot build - hs23-b20 - S7154724: jdk7u4 test properties missing from jprt.properties - - S7154758: NLS: 7u4 message drop 20 - - S7154770: NLS: 7u4 man page update - S7154809: JDI: update JDI/JDB debugee commandline option parsing - S7154822: forward port fix for Bug 13645891 to JDK8 jcmd (1024 byte file size limit issue) - S7155051: DNS provider may return incorrect results - - S7155419: Remove reference to JRockit and commercial features from java man page - S7155453: [macosx] re-enable jbb tests in JPRT - - S7155757: make jdk7u4 the default jprt release for hs23 - S7156000: Change makefile to reflect refactored classes - S7156191: [macosx] Can't type into applet demos in Pivot - S7156194: [macosx] Can't type non-ASCII characters into applets @@ -495,7 +678,6 @@ - S7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds - S7157365: jruby/bench.bench_timeout crashes with JVM internal error - S7157608: One feature is not recognized. - - S7157609: Issues with loop - S7157610: NullPointerException occurs when parsing XML doc - S7157659: [macosx] Landscape Printing orientation doesn't work - S7157855: jvisualvm.1 not included in binaries @@ -517,8 +699,6 @@ - S7160293: [macosx] FileDialog appears on secondary display - S7160539: JDeveloper crashes on 64-bit Windows - S7160623: [macosx] Editable TextArea/TextField are blocking GUI applications from exit - - S7160677: missing else in fix for 7152811 - - S7160757: Problem with hotspot/runtime_classfile - S7160895: tools/launcher/VersionCheck.java attempts to launch .debuginfo - S7161105: unused classes in jdk7u repository - S7161766: [macosx] javax/swing/JPopupMenu/6694823/bug6694823.java failed on Mac OS X @@ -538,7 +718,6 @@ - S7165060: dtrace tests fail with FDS debug info files - S7165257: Add JFR tests to the JDK code base - S7165598: enable FDS on Solaris X64 when 7165593 is fixed - - S7165628: Issues with java.lang.invoke.MethodHandles.Lookup - S7165725: JAVA6 HTML PARSER CANNOT PARSE MULTIPLE SCRIPT TAGS IN A LINE CORRECTLY - S7165755: OS Information much longer on linux than other platforms - S7166437: [macosx] Support for Window.Type.UTILITY on the Mac @@ -751,7 +930,6 @@ - S6330863: vm/gc/InfiniteList.java fails intermittently due to timeout - S6351654: (tz) java.util.TimeZone.setDefault() should be controlled by a security manager - S6484965: G1: piggy-back liveness accounting phase on marking - - S6484982: G1: process references during evacuation pauses - S6505523: NullPointerException in BasicTreeUI when a node is removed by expansion listener - S6593758: RFE: Enhance GC ergonomics to dynamically choose ParallelGCThreads - S6636110: unaligned stackpointer leads to crash during deoptimization @@ -770,7 +948,6 @@ - S7005808: G1: re-enable ReduceInitialCardMarks for G1 - S7009098: SA cannot open core files larger than 2GB on Linux 32-bit - S7010561: Tab text position with Synth based LaF is different to Java 5/6 - - S7012206: ~20 tools tests failing due to -XX:-UsePerfData default in Java SE Embedded - S7013347: allow crypto functions to be called inline to enhance performance - S7017458: (cal) Multithreaded deserialization of Calendar leads to ClassCastException - S7021322: assert(object_end <= top()) failed: Object crosses promotion LAB boundary @@ -780,7 +957,6 @@ - S7030453: JSR 292 ClassValue.get method is too slow - S7033170: Cipher.getMaxAllowedKeyLength(String) throws NoSuchAlgorithmException - S7045132: sun.security.util.Resources_pt_BR.java translation error - - S7045232: G1: pool names are inconsistent with other collectors (don't have 'Space') - S7046238: new InitialContext(); hangs - S7046929: tools/javac/api/T6397104.java fails - S7047200: keytool safe store @@ -792,7 +968,6 @@ - S7054590: (JSR-292) MethodHandleProxies.asInterfaceInstance() accepts private/protected nested interfaces - S7057935: com/sun/nio/sctp tests should be moved out of jdk_nio and into their own target, jdk_sctp - S7058133: Javah should use the freshly built classes instead of those from the BOOTDIR jdk - - S7059019: G1: add G1 support to the SA - S7059039: EA: don't change non-escaping state of NULL pointer - S7059047: EA: can't find initializing store with several CheckCastPP - S7059899: Stack overflows in Java code cause 64-bit JVMs to exit due to SIGSEGV @@ -823,7 +998,7 @@ - S7081933: Use zeroing elimination optimization for large array - S7081938: JSR292: assert(magic_number_2() == MAGIC_NUMBER_2) failed - S7082294: nsk/regression/b4265661 crashes on windows - - S7082299: AtomicReferenceArray should ensure that array is Object[] + - S7082299: - S7082443: JComboBox not backward compatible (with Java 6) - S7082553: Interpret Thread.setPriority(Thread.MAX_PRIORITY) to mean FX60 on Solaris 10 and 11 - S7083621: Add fontconfig file for OEL6 and rename RH/O EL 5 file so that it is picked up for all 5.x updates @@ -834,7 +1009,6 @@ - S7086595: Error message bug: name of initializer is 'null' - S7086601: Error message bug: cause for method mismatch is 'null' - S7087727: JSR 292: C2 crash if ScavengeRootsInCode=2 when "static final" MethodHandle constants are in use - - S7088367: JavaSound security issue (12865443) - S7088680: G1: Cleanup in the G1CollectorPolicy class - S7088989: Improve the performance for T4 by utilizing the newly provided crypto APIs - S7089790: integrate bsd-port changes @@ -963,7 +1137,6 @@ - S7110440: closed/javax/swing/JScrollBar/4865918/bug4865918.java fails on Aqua L&F - S7110489: C1: 64-bit tiered with ForceUnreachable: assert(reachable(src)) failed: Address should be reachable - S7110586: C2 generates incorrect results - - S7110700: Enhance exception throwing mechanism in ObjectStreamClass - S7110718: -XX:MarkSweepAlwaysCompactCount=0 crashes the JVM - S7110815: closed/javax/swing/JSplitPane/4885629/bug4885629.java unstable on MacOS - S7110824: ctw/jarfiles/GUI3rdParty_jar/ob_mask_DateField crashes VM @@ -977,7 +1150,6 @@ - S7112308: Fix Visual Studio build for precompiled header - S7112413: JVM Crash, possibly GC-related - S7112478: after 7105605 JRuby bench_define_method_methods.rb fails with NPE - - S7112642: Incorrect checking for graphics rendering object - S7112743: G1: Reduce overhead of marking closure during evacuation pauses - S7112854: [macosx] closed/javax/swing/JPopupMenu/Test6827786.java unstable on MacOS - S7112925: closed/javax/swing/JTabbedPane/4624207/bug4624207.java fails on MacOS @@ -1023,7 +1195,6 @@ - S7118095: Add macosx targets to make/jprt.properties file - S7118202: G1: eden size unnecessarily drops to a minimum - S7118280: The gbyc00102 JCK7 test causes an assert in JVM 7.0 fastdebug mode - - S7118283: Better input parameter checking in zip file processing - S7118648: disable compressed oops by default on MacOS X until 7118647 is fixed - S7118773: Fix jdk/test/makefile so it works on the mac - S7118809: rcache deadlock @@ -1155,7 +1326,6 @@ - S7126732: MAC: Require Mac OS X builds/tests for JPRT integrate jobs for HotSpot - S7126832: com.sun.tools.javac.api.ClientCodeWrapper$WrappedJavaFileManager cannot be cast - S7126889: Incorrect SSLEngine debug output - - S7126960: Add property to limit number of request headers to the HTTP Server - S7126979: (props) JCK test java_lang/System/GetProperties.java failing [macosx] - S7126993: JCK test api/java_util/jar/Jarfile jarFile0129 failing [macosx] - S7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary @@ -1388,7 +1558,7 @@ New in release 2.1 (2012-02-14): * Security fixes - - S7082299, CVE-2011-3571: Fix in AtomicReferenceArray + - S7082299, CVE-2011-3571: AtomicReferenceArray should ensure that array is Object[] - S7088367, CVE-2011-3563: Fix issues in java sound - S7110683, CVE-2012-0502: Issues with some KeyboardFocusManager method - S7110687, CVE-2012-0503: Issues with TimeZone class @@ -1451,7 +1621,6 @@ - S7043847: NTML impl of SaslServer throws UnsupportedOperationException from (un)wrap method - S7043987: 3/3 JVMTI FollowReferences is slow - S7044486: open jdk repos have files with incorrect copyright headers, which can end up in src bundles - - S7044738: Loop unroll optimization causes incorrect result - S7045232: G1: pool names are inconsistent with other collectors (don't have 'Space') - S7045330: G1: Simplify/fix the HeapRegionSeq class - S7045514: SPARC assembly code for JSR 292 ricochet frames @@ -1505,7 +1674,6 @@ - S7057297: Project Coin: diamond erroneously accepts in array initializer expressions - S7057459: Regression: Performance degradation with java.beans.XMLEncoder - S7057705: can't generate api docs for JDK7 updates - - S7057857, CVE-2011-3554: insufficient pack200 JAR files uncompress error checks - S7057857: SIGSEGV [libunpack.so] store_Utf8_char(signed char*, unsigned short) in java.util.jar.pack200 - S7057978: improve robustness of c1 ARM back-end wrt non encodable constants - S7058036: FieldsAllocationStyle=2 does not work in 32-bit VM @@ -1708,7 +1876,7 @@ New in release 2.0.1 (2012-02-14): * Security fixes - - S7082299, CVE-2011-3571: Fix in AtomicReferenceArray + - S7082299, CVE-2011-3571: AtomicReferenceArray should ensure that array is Object[] - S7088367, CVE-2011-3563: Fix issues in java sound - S7110683, CVE-2012-0502: Issues with some KeyboardFocusManager method - S7110687, CVE-2012-0503: Issues with TimeZone class From omajid at icedtea.classpath.org Wed Jun 26 07:49:10 2013 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Wed, 26 Jun 2013 14:49:10 +0000 Subject: /hg/release/icedtea6-1.11: Fix patches to work with patch tools ... Message-ID: changeset c5297dd496da in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=c5297dd496da author: Omair Majid date: Wed Jun 26 10:47:13 2013 -0400 Fix patches to work with patch tools that can not handle renames 2013-06-26 Omair Majid * Makefile.am: (SECURITY_PATCHES): Add patches/openjdk/6990754-handle_renames.patch and patches/openjdk/6851834-handle_renames.patch * patches/openjdk/6990754-use_native_memory_for_symboltable.patch: Don't rename files using extended-diff-style. * patches/openjdk/6990754-handle_renames.patch: New file. Contains the rename portion of 6990754 since some patch programs can not handle renames. * patches/openjdk/6851834-restructure.patch: Don't rename files using extended-diff-style. * patches/openjdk/6851834-handle_renames.patch: New file. Contains rename porition of 6851834 since some patch programs can not handle renames. diffstat: ChangeLog | 15 + Makefile.am | 2 + patches/openjdk/6851834-handle_renames.patch | 605 ++++++ patches/openjdk/6851834-restructure.patch | 6 +- patches/openjdk/6990754-handle_renames.patch | 925 ++++++++++ patches/openjdk/6990754-use_native_memory_for_symboltable.patch | 6 +- 6 files changed, 1555 insertions(+), 4 deletions(-) diffs (truncated from 1625 to 500 lines): diff -r f352f5c79104 -r c5297dd496da ChangeLog --- a/ChangeLog Tue Jun 25 15:07:59 2013 +0100 +++ b/ChangeLog Wed Jun 26 10:47:13 2013 -0400 @@ -1,3 +1,18 @@ +2013-06-26 Omair Majid + + * Makefile.am: + (SECURITY_PATCHES): Add patches/openjdk/6990754-handle_renames.patch and + patches/openjdk/6851834-handle_renames.patch + * patches/openjdk/6990754-use_native_memory_for_symboltable.patch: Don't + rename files using extended-diff-style. + * patches/openjdk/6990754-handle_renames.patch: New file. Contains the + rename portion of 6990754 since some patch programs can not handle + renames. + * patches/openjdk/6851834-restructure.patch: Don't rename files using + extended-diff-style. + * patches/openjdk/6851834-handle_renames.patch: New file. Contains rename + porition of 6851834 since some patch programs can not handle renames. + 2013-06-24 Andrew John Hughes * Makefile.am: diff -r f352f5c79104 -r c5297dd496da Makefile.am --- a/Makefile.am Tue Jun 25 15:07:59 2013 +0100 +++ b/Makefile.am Wed Jun 26 10:47:13 2013 -0400 @@ -383,6 +383,7 @@ patches/openjdk/7036747-elfstringtable.patch \ patches/openjdk/7017732-move_static_fields_to_class.patch \ patches/openjdk/6990754-use_native_memory_for_symboltable.patch \ + patches/openjdk/6990754-handle_renames.patch \ patches/openjdk/7008809-report_class_in_arraystoreexception.patch \ patches/openjdk/7086585-flexible_field_injection.patch \ patches/security/20130618/hs_merge-01.patch \ @@ -398,6 +399,7 @@ patches/openjdk/6786688-wcag_table.patch \ patches/openjdk/6961178-doclet_xml.patch \ patches/openjdk/6851834-restructure.patch \ + patches/openjdk/6851834-handle_renames.patch \ patches/openjdk/7006270-regressions.patch \ patches/security/20130618/8012375-javadoc_framing.patch \ patches/security/20130618/8015997-more_javadoc_framing.patch \ diff -r f352f5c79104 -r c5297dd496da patches/openjdk/6851834-handle_renames.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6851834-handle_renames.patch Wed Jun 26 10:47:13 2013 -0400 @@ -0,0 +1,605 @@ +This handles the rename bits of the original 6851834 +diff -ruN openjdk.orig/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java +--- openjdk.orig/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java 1969-12-31 19:00:00.000000000 -0500 ++++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java 2013-06-25 14:55:45.802321034 -0400 +@@ -0,0 +1,298 @@ ++/* ++ * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. Oracle designates this ++ * particular file as subject to the "Classpath" exception as provided ++ * by Oracle in the LICENSE file that accompanied this code. ++ * ++ * This code 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 ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ */ ++ ++package com.sun.tools.doclets.formats.html; ++ ++import java.io.*; ++import javax.tools.FileObject; ++import com.sun.javadoc.*; ++import com.sun.tools.doclets.internal.toolkit.*; ++import com.sun.tools.doclets.internal.toolkit.util.*; ++import com.sun.tools.doclets.formats.html.markup.*; ++ ++/** ++ * Converts Java Source Code to HTML. ++ * ++ * This code is not part of an API. ++ * It is implementation that is subject to change. ++ * Do not use it as an API ++ * ++ * @author Jamie Ho ++ * @author Bhavesh Patel (Modified) ++ * @since 1.4 ++ */ ++public class SourceToHTMLConverter { ++ ++ /** ++ * The number of trailing blank lines at the end of the page. ++ * This is inserted so that anchors at the bottom of small pages ++ * can be reached. ++ */ ++ private static final int NUM_BLANK_LINES = 60; ++ ++ /** ++ * New line to be added to the documentation. ++ */ ++ private static final Content NEW_LINE = new RawHtml(DocletConstants.NL); ++ ++ /** ++ * Relative path from the documentation root to the file that is being ++ * generated. ++ */ ++ private static String relativePath = ""; ++ ++ /** ++ * Source is converted to HTML using static methods below. ++ */ ++ private SourceToHTMLConverter() {} ++ ++ /** ++ * Convert the Classes in the given RootDoc to an HTML. ++ * ++ * @param configuration the configuration. ++ * @param rd the RootDoc to convert. ++ * @param outputdir the name of the directory to output to. ++ */ ++ public static void convertRoot(ConfigurationImpl configuration, RootDoc rd, ++ String outputdir) { ++ if (rd == null || outputdir == null) { ++ return; ++ } ++ PackageDoc[] pds = rd.specifiedPackages(); ++ for (int i = 0; i < pds.length; i++) { ++ convertPackage(configuration, pds[i], outputdir); ++ } ++ ClassDoc[] cds = rd.specifiedClasses(); ++ for (int i = 0; i < cds.length; i++) { ++ convertClass(configuration, cds[i], ++ getPackageOutputDir(outputdir, cds[i].containingPackage())); ++ } ++ } ++ ++ /** ++ * Convert the Classes in the given Package to an HTML. ++ * ++ * @param configuration the configuration. ++ * @param pd the Package to convert. ++ * @param outputdir the name of the directory to output to. ++ */ ++ public static void convertPackage(ConfigurationImpl configuration, PackageDoc pd, ++ String outputdir) { ++ if (pd == null || outputdir == null) { ++ return; ++ } ++ String classOutputdir = getPackageOutputDir(outputdir, pd); ++ ClassDoc[] cds = pd.allClasses(); ++ for (int i = 0; i < cds.length; i++) { ++ convertClass(configuration, cds[i], classOutputdir); ++ } ++ } ++ ++ /** ++ * Return the directory write output to for the given package. ++ * ++ * @param outputDir the directory to output to. ++ * @param pd the Package to generate output for. ++ * @return the package output directory as a String. ++ */ ++ private static String getPackageOutputDir(String outputDir, PackageDoc pd) { ++ return outputDir + File.separator + ++ DirectoryManager.getDirectoryPath(pd) + File.separator; ++ } ++ ++ /** ++ * Convert the given Class to an HTML. ++ * ++ * @param configuration the configuration. ++ * @param cd the class to convert. ++ * @param outputdir the name of the directory to output to. ++ */ ++ public static void convertClass(ConfigurationImpl configuration, ClassDoc cd, ++ String outputdir) { ++ if (cd == null || outputdir == null) { ++ return; ++ } ++ try { ++ SourcePosition sp = cd.position(); ++ if (sp == null) ++ return; ++ Reader r; ++ // temp hack until we can update SourcePosition API. ++ if (sp instanceof com.sun.tools.javadoc.SourcePositionImpl) { ++ FileObject fo = ((com.sun.tools.javadoc.SourcePositionImpl) sp).fileObject(); ++ if (fo == null) ++ return; ++ r = fo.openReader(true); ++ } else { ++ File file = sp.file(); ++ if (file == null) ++ return; ++ r = new FileReader(file); ++ } ++ LineNumberReader reader = new LineNumberReader(r); ++ int lineno = 1; ++ String line; ++ relativePath = DirectoryManager.getRelativePath(DocletConstants.SOURCE_OUTPUT_DIR_NAME) + ++ DirectoryManager.getRelativePath(cd.containingPackage()); ++ Content body = getHeader(); ++ Content pre = new HtmlTree(HtmlTag.PRE); ++ try { ++ while ((line = reader.readLine()) != null) { ++ addLineNo(pre, lineno); ++ addLine(pre, line, configuration.sourcetab, lineno); ++ lineno++; ++ } ++ } finally { ++ reader.close(); ++ } ++ addBlankLines(pre); ++ Content div = HtmlTree.DIV(HtmlStyle.sourceContainer, pre); ++ body.addContent(div); ++ writeToFile(body, outputdir, cd.name(), configuration); ++ } catch (Exception e){ ++ e.printStackTrace(); ++ } ++ } ++ ++ /** ++ * Write the output to the file. ++ * ++ * @param body the documentation content to be written to the file. ++ * @param outputDir the directory to output to. ++ * @param className the name of the class that I am converting to HTML. ++ * @param configuration the Doclet configuration to pass notices to. ++ */ ++ private static void writeToFile(Content body, String outputDir, ++ String className, ConfigurationImpl configuration) throws IOException { ++ Content htmlDocType = DocType.Transitional(); ++ Content head = new HtmlTree(HtmlTag.HEAD); ++ head.addContent(HtmlTree.TITLE(new StringContent( ++ configuration.getText("doclet.Window_Source_title")))); ++ head.addContent(getStyleSheetProperties(configuration)); ++ Content htmlTree = HtmlTree.HTML(configuration.getLocale().getLanguage(), ++ head, body); ++ Content htmlDocument = new HtmlDocument(htmlDocType, htmlTree); ++ File dir = new File(outputDir); ++ dir.mkdirs(); ++ File newFile = new File(dir, className + ".html"); ++ configuration.message.notice("doclet.Generating_0", newFile.getPath()); ++ FileOutputStream fout = new FileOutputStream(newFile); ++ BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(fout)); ++ bw.write(htmlDocument.toString()); ++ bw.close(); ++ fout.close(); ++ } ++ ++ /** ++ * Returns a link to the stylesheet file. ++ * ++ * @param configuration the doclet configuration for the current run of javadoc ++ * @return an HtmlTree for the lINK tag which provides the stylesheet location ++ */ ++ public static HtmlTree getStyleSheetProperties(ConfigurationImpl configuration) { ++ String filename = configuration.stylesheetfile; ++ if (filename.length() > 0) { ++ File stylefile = new File(filename); ++ String parent = stylefile.getParent(); ++ filename = (parent == null)? ++ filename: ++ filename.substring(parent.length() + 1); ++ } else { ++ filename = "stylesheet.css"; ++ } ++ filename = relativePath + filename; ++ HtmlTree link = HtmlTree.LINK("stylesheet", "text/css", filename, "Style"); ++ return link; ++ } ++ ++ /** ++ * Get the header. ++ * ++ * @return the header content for the HTML file ++ */ ++ private static Content getHeader() { ++ return new HtmlTree(HtmlTag.BODY); ++ } ++ ++ /** ++ * Add the line numbers for the source code. ++ * ++ * @param pre the content tree to which the line number will be added ++ * @param lineno The line number ++ */ ++ private static void addLineNo(Content pre, int lineno) { ++ HtmlTree span = new HtmlTree(HtmlTag.SPAN); ++ span.addStyle(HtmlStyle.sourceLineNo); ++ if (lineno < 10) { ++ span.addContent("00" + Integer.toString(lineno)); ++ } else if (lineno < 100) { ++ span.addContent("0" + Integer.toString(lineno)); ++ } else { ++ span.addContent(Integer.toString(lineno)); ++ } ++ pre.addContent(span); ++ } ++ ++ /** ++ * Add a line from source to the HTML file that is generated. ++ * ++ * @param pre the content tree to which the line will be added. ++ * @param line the string to format. ++ * @param tabLength the number of spaces for each tab. ++ * @param currentLineNo the current number. ++ */ ++ private static void addLine(Content pre, String line, int tabLength, ++ int currentLineNo) { ++ if (line != null) { ++ StringBuffer lineBuffer = new StringBuffer(Util.escapeHtmlChars(line)); ++ Util.replaceTabs(tabLength, lineBuffer); ++ pre.addContent(new RawHtml(lineBuffer.toString())); ++ Content anchor = HtmlTree.A_NAME("line." + Integer.toString(currentLineNo)); ++ pre.addContent(anchor); ++ pre.addContent(NEW_LINE); ++ } ++ } ++ ++ /** ++ * Add trailing blank lines at the end of the page. ++ * ++ * @param pre the content tree to which the blank lines will be added. ++ */ ++ private static void addBlankLines(Content pre) { ++ for (int i = 0; i < NUM_BLANK_LINES; i++) { ++ pre.addContent(NEW_LINE); ++ } ++ } ++ ++ /** ++ * Given a Doc, return an anchor name for it. ++ * ++ * @param d the Doc to check. ++ * @return the name of the anchor. ++ */ ++ public static String getAnchorName(Doc d) { ++ return "line." + d.position().line(); ++ } ++} +diff -ruN openjdk.orig/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SourceToHTMLConverter.java openjdk/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SourceToHTMLConverter.java +--- openjdk.orig/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SourceToHTMLConverter.java 2013-06-25 14:55:45.802321034 -0400 ++++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SourceToHTMLConverter.java 1969-12-31 19:00:00.000000000 -0500 +@@ -1,298 +0,0 @@ +-/* +- * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved. +- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +- * +- * This code is free software; you can redistribute it and/or modify it +- * under the terms of the GNU General Public License version 2 only, as +- * published by the Free Software Foundation. Oracle designates this +- * particular file as subject to the "Classpath" exception as provided +- * by Oracle in the LICENSE file that accompanied this code. +- * +- * This code 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 +- * version 2 for more details (a copy is included in the LICENSE file that +- * accompanied this code). +- * +- * You should have received a copy of the GNU General Public License version +- * 2 along with this work; if not, write to the Free Software Foundation, +- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +- * +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. +- */ +- +-package com.sun.tools.doclets.formats.html; +- +-import java.io.*; +-import javax.tools.FileObject; +-import com.sun.javadoc.*; +-import com.sun.tools.doclets.internal.toolkit.*; +-import com.sun.tools.doclets.internal.toolkit.util.*; +-import com.sun.tools.doclets.formats.html.markup.*; +- +-/** +- * Converts Java Source Code to HTML. +- * +- * This code is not part of an API. +- * It is implementation that is subject to change. +- * Do not use it as an API +- * +- * @author Jamie Ho +- * @author Bhavesh Patel (Modified) +- * @since 1.4 +- */ +-public class SourceToHTMLConverter { +- +- /** +- * The number of trailing blank lines at the end of the page. +- * This is inserted so that anchors at the bottom of small pages +- * can be reached. +- */ +- private static final int NUM_BLANK_LINES = 60; +- +- /** +- * New line to be added to the documentation. +- */ +- private static final Content NEW_LINE = new RawHtml(DocletConstants.NL); +- +- /** +- * Relative path from the documentation root to the file that is being +- * generated. +- */ +- private static String relativePath = ""; +- +- /** +- * Source is converted to HTML using static methods below. +- */ +- private SourceToHTMLConverter() {} +- +- /** +- * Convert the Classes in the given RootDoc to an HTML. +- * +- * @param configuration the configuration. +- * @param rd the RootDoc to convert. +- * @param outputdir the name of the directory to output to. +- */ +- public static void convertRoot(ConfigurationImpl configuration, RootDoc rd, +- String outputdir) { +- if (rd == null || outputdir == null) { +- return; +- } +- PackageDoc[] pds = rd.specifiedPackages(); +- for (int i = 0; i < pds.length; i++) { +- convertPackage(configuration, pds[i], outputdir); +- } +- ClassDoc[] cds = rd.specifiedClasses(); +- for (int i = 0; i < cds.length; i++) { +- convertClass(configuration, cds[i], +- getPackageOutputDir(outputdir, cds[i].containingPackage())); +- } +- } +- +- /** +- * Convert the Classes in the given Package to an HTML. +- * +- * @param configuration the configuration. +- * @param pd the Package to convert. +- * @param outputdir the name of the directory to output to. +- */ +- public static void convertPackage(ConfigurationImpl configuration, PackageDoc pd, +- String outputdir) { +- if (pd == null || outputdir == null) { +- return; +- } +- String classOutputdir = getPackageOutputDir(outputdir, pd); +- ClassDoc[] cds = pd.allClasses(); +- for (int i = 0; i < cds.length; i++) { +- convertClass(configuration, cds[i], classOutputdir); +- } +- } +- +- /** +- * Return the directory write output to for the given package. +- * +- * @param outputDir the directory to output to. +- * @param pd the Package to generate output for. +- * @return the package output directory as a String. +- */ +- private static String getPackageOutputDir(String outputDir, PackageDoc pd) { +- return outputDir + File.separator + +- DirectoryManager.getDirectoryPath(pd) + File.separator; +- } +- +- /** +- * Convert the given Class to an HTML. +- * +- * @param configuration the configuration. +- * @param cd the class to convert. +- * @param outputdir the name of the directory to output to. +- */ +- public static void convertClass(ConfigurationImpl configuration, ClassDoc cd, +- String outputdir) { +- if (cd == null || outputdir == null) { +- return; +- } +- try { +- SourcePosition sp = cd.position(); +- if (sp == null) +- return; +- Reader r; +- // temp hack until we can update SourcePosition API. +- if (sp instanceof com.sun.tools.javadoc.SourcePositionImpl) { +- FileObject fo = ((com.sun.tools.javadoc.SourcePositionImpl) sp).fileObject(); +- if (fo == null) +- return; +- r = fo.openReader(true); +- } else { From jvanek at redhat.com Wed Jun 26 09:48:00 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 26 Jun 2013 18:48:00 +0200 Subject: [rfe][icedtea-web] Fix RH977880, regression in Javascript interfacing code In-Reply-To: <51C9D93D.5060808@redhat.com> References: <51C9D93D.5060808@redhat.com> Message-ID: <51CB1B40.4070600@redhat.com> On 06/25/2013 07:54 PM, Adam Domurad wrote: > This fixes https://bugzilla.redhat.com/show_bug.cgi?id=977880. > > There was a regression caused during my refactoring of some JS code that caused .getClass() to be > called on a potentially null value. I have looked closely and it doesn't appear there are any other > places in this file that could have the problem. > > Cheers, > -Adam looks good. Ok head and 1.4 Am I to evil if I would like to see an reproducer? Reprodcuer is not blocker for push... Thank you! J. From omajid at redhat.com Wed Jun 26 10:50:37 2013 From: omajid at redhat.com (Omair Majid) Date: Wed, 26 Jun 2013 13:50:37 -0400 Subject: /hg/release/icedtea6-1.11: Fix patches to work with patch tools ... In-Reply-To: References: Message-ID: <51CB29ED.7080700@redhat.com> On 06/26/2013 10:49 AM, omajid at icedtea.classpath.org wrote: > changeset c5297dd496da in /hg/release/icedtea6-1.11 > details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=c5297dd496da > author: Omair Majid > date: Wed Jun 26 10:47:13 2013 -0400 > > Fix patches to work with patch tools that can not handle renames Quick summary of the fix: some patches previously contained extended-diff-style metadata: > rename from src/share/vm/oops/symbolOop.cpp > rename to src/share/vm/oops/symbol.cpp Some versions (at least) of the GNU patch command can not handle this. This was causing 'make patch' to break on some systems. This changeset fixes the problem by including a second patch to represent the file rename (without obscuring the original patch too much). Thanks, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From omajid at icedtea.classpath.org Wed Jun 26 10:50:46 2013 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Wed, 26 Jun 2013 17:50:46 +0000 Subject: /hg/release/icedtea6-1.11: Drop unnecessary patch for S8009554 Message-ID: changeset a1cb163cb044 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=a1cb163cb044 author: Omair Majid date: Wed Jun 26 13:45:20 2013 -0400 Drop unnecessary patch for S8009554 2013-06-26 Omair Majid Severin Gehwolf * Makefile.am (SECURITY_PATCHES): Drop patches/security/20130618/8009554-serialjavaobject.patch. * patches/security/20130618/8009554-serialjavaobject.patch: Remove. This was adding redundant permission check diffstat: ChangeLog | 8 + Makefile.am | 1 - patches/security/20130618/8009554-serialjavaobject.patch | 78 ---------------- 3 files changed, 8 insertions(+), 79 deletions(-) diffs (108 lines): diff -r c5297dd496da -r a1cb163cb044 ChangeLog --- a/ChangeLog Wed Jun 26 10:47:13 2013 -0400 +++ b/ChangeLog Wed Jun 26 13:45:20 2013 -0400 @@ -1,3 +1,11 @@ +2013-06-26 Omair Majid + Severin Gehwolf + + * Makefile.am (SECURITY_PATCHES): Drop + patches/security/20130618/8009554-serialjavaobject.patch. + * patches/security/20130618/8009554-serialjavaobject.patch: Remove. This + was adding redundant permission checking. + 2013-06-26 Omair Majid * Makefile.am: diff -r c5297dd496da -r a1cb163cb044 Makefile.am --- a/Makefile.am Wed Jun 26 10:47:13 2013 -0400 +++ b/Makefile.am Wed Jun 26 13:45:20 2013 -0400 @@ -363,7 +363,6 @@ patches/security/20130618/8009038-jmx_notification_support_improvement.patch \ patches/security/20130618/8009067-improve_key_storing.patch \ patches/security/20130618/8009235-improve_tsa_data_handling.patch \ - patches/security/20130618/8009554-serialjavaobject.patch \ patches/openjdk/6888167-medialib_memory_leaks.patch \ patches/security/20130618/8011243-improve_imaginglib.patch \ patches/security/20130618/8011248-better_component_rasters.patch \ diff -r c5297dd496da -r a1cb163cb044 patches/security/20130618/8009554-serialjavaobject.patch --- a/patches/security/20130618/8009554-serialjavaobject.patch Wed Jun 26 10:47:13 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,78 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1371556350 18000 -# Node ID 5fcac0fe0ace5584b980a35afb582519f8434617 -# Parent 97f318cdfb834385beb7370348582daebccc8987 -8009554: Improve SerialJavaObject.getFields -Reviewed-by: alanb, skoivu - -diff --git a/src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java b/src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java ---- openjdk/jdk/src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java -+++ openjdk/jdk/src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -30,6 +30,7 @@ - import java.util.Map; - import java.lang.reflect.*; - import javax.sql.rowset.RowSetWarning; -+import sun.reflect.Reflection; - - /** - * A serializable mapping in the Java programming language of an SQL -@@ -136,10 +137,12 @@ - * @return an array of Field objects - * @throws SerialException if an error is encountered accessing - * the serialized object -+ * @see Class#getFields - */ - public Field[] getFields() throws SerialException { - if (fields != null) { - Class c = this.obj.getClass(); -+ checkPackageAccess(c); - //the following has to be commented before mustang integration - //return c.getFields(); - //the following has to be uncommented before mustang integration -@@ -172,4 +175,38 @@ - } - chain.add(e); - } -+ -+ /* -+ * Check if the caller is allowed to access the specified class's package. If access is denied, -+ * throw a SecurityException. -+ * -+ */ -+ private void checkPackageAccess(Class clz) { -+ SecurityManager s = System.getSecurityManager(); -+ if (s != null) { -+ if (sun.reflect.misc.ReflectUtil.needsPackageAccessCheck( -+ getCallerClassLoader(), clz.getClassLoader())) { -+ String name = clz.getName(); -+ int i = name.lastIndexOf('.'); -+ if (i != -1) { -+ s.checkPackageAccess(name.substring(0, i)); -+ } -+ } -+ } -+ } -+ -+ /* Internal method used to get the caller's caller class loader. -+ * Caution is required if you attempt to make changes as this method assumes -+ * the following stack frame count: -+ * 0: Reflection -+ * 1: getCallerClassLoader -+ * 2: checkPackageAccess -+ * 3: getFields -+ * 4: caller of getFields -+ */ -+ private static ClassLoader getCallerClassLoader() { -+ Class cc = Reflection.getCallerClass(4); -+ ClassLoader cl = (cc != null) ? cc.getClassLoader() : null; -+ return cl; -+ } - } From chrisphi at icedtea.classpath.org Wed Jun 26 13:01:24 2013 From: chrisphi at icedtea.classpath.org (chrisphi at icedtea.classpath.org) Date: Wed, 26 Jun 2013 20:01:24 +0000 Subject: /hg/release/icedtea6-1.11: Summary: Backport 20130618 sec fixes ... Message-ID: changeset ea7bce0f610a in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=ea7bce0f610a author: chrisphi date: Wed Jun 26 15:10:59 2013 -0400 Summary: Backport 20130618 sec fixes 7158805 and 8001330 added patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch added patches/security/20130618/8001330-checking_order_improvement-it6.patch changed ChangeLog changed Makefile.am diffstat: ChangeLog | 23 + Makefile.am | 15 +- patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch | 743 ++++++++++ patches/security/20130618/8001330-checking_order_improvement-it6.patch | 500 ++++++ 4 files changed, 1268 insertions(+), 13 deletions(-) diffs (truncated from 1306 to 500 lines): diff -r a1cb163cb044 -r ea7bce0f610a ChangeLog --- a/ChangeLog Wed Jun 26 13:45:20 2013 -0400 +++ b/ChangeLog Wed Jun 26 15:10:59 2013 -0400 @@ -1,3 +1,26 @@ +2013-06-26 Chris Phillips + * Makefile.am (SECURITY_PATCHES): Drop + patches/security/20130618/7158805-nested_subroutine_rewriting.patch + patches/security/20130618/8001330-checking_order_improvement.patch + patches/openjdk/7036747-elfstringtable.patch + patches/openjdk/7017732-move_static_fields_to_class.patch + patches/openjdk/6990754-use_native_memory_for_symboltable.patch + patches/openjdk/6990754-handle_renames.patch + patches/openjdk/7008809-report_class_in_arraystoreexception.patch + patches/openjdk/7086585-flexible_field_injection.patch + patches/security/20130618/hs_merge-01.patch + patches/security/20130618/hs_merge-02.patch + patches/security/20130618/hs_merge-03.patch + patches/openjdk/7014851-unused_parallel_compaction_code.patch + patches/security/20130618/hs_merge-04.patch + Add: + patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch + patches/security/20130618/8001330-checking_order_improvement-it6.patch + * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch: + Backported fix for 7158805. + * patches/security/20130618/8001330-checking_order_improvement-it6.patch: + Backported fix for hs portion of 8001330. + 2013-06-26 Omair Majid Severin Gehwolf diff -r a1cb163cb044 -r ea7bce0f610a Makefile.am --- a/Makefile.am Wed Jun 26 13:45:20 2013 -0400 +++ b/Makefile.am Wed Jun 26 15:10:59 2013 -0400 @@ -377,19 +377,8 @@ patches/security/20130618/diamond_fix.patch \ patches/security/20130618/handle_npe.patch \ patches/security/20130618/javac_issue.patch \ - patches/security/20130618/7158805-nested_subroutine_rewriting.patch \ - patches/security/20130618/8001330-checking_order_improvement.patch \ - patches/openjdk/7036747-elfstringtable.patch \ - patches/openjdk/7017732-move_static_fields_to_class.patch \ - patches/openjdk/6990754-use_native_memory_for_symboltable.patch \ - patches/openjdk/6990754-handle_renames.patch \ - patches/openjdk/7008809-report_class_in_arraystoreexception.patch \ - patches/openjdk/7086585-flexible_field_injection.patch \ - patches/security/20130618/hs_merge-01.patch \ - patches/security/20130618/hs_merge-02.patch \ - patches/security/20130618/hs_merge-03.patch \ - patches/openjdk/7014851-unused_parallel_compaction_code.patch \ - patches/security/20130618/hs_merge-04.patch \ + patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch \ + patches/security/20130618/8001330-checking_order_improvement-it6.patch \ patches/security/20130618/8000642-better_transportation_handling.patch \ patches/openjdk/6786028-wcag_bold_tags.patch \ patches/openjdk/6786682-wcag_lang.patch \ diff -r a1cb163cb044 -r ea7bce0f610a patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch Wed Jun 26 15:10:59 2013 -0400 @@ -0,0 +1,743 @@ +*** openjdk/hotspot/src/share/vm/memory/allocation.cpp 2011-11-14 17:07:35.000000000 -0500 +--- openjdk/hotspot/src/share/vm/memory/allocation.cpp 2013-06-25 14:55:54.749915166 -0400 +*************** +*** 1,5 **** + /* +! * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +--- 1,5 ---- + /* +! * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +*************** +*** 199,205 **** + ChunkPool(size_t size) : _size(size) { _first = NULL; _num_chunks = _num_used = 0; } + + // Allocate a new chunk from the pool (might expand the pool) +! void* allocate(size_t bytes) { + assert(bytes == _size, "bad size"); + void* p = NULL; + { ThreadCritical tc; +--- 199,205 ---- + ChunkPool(size_t size) : _size(size) { _first = NULL; _num_chunks = _num_used = 0; } + + // Allocate a new chunk from the pool (might expand the pool) +! void* allocate(size_t bytes, AllocFailType alloc_failmode) { + assert(bytes == _size, "bad size"); + void* p = NULL; + { ThreadCritical tc; +*************** +*** 207,215 **** + p = get_first(); + if (p == NULL) p = os::malloc(bytes); + } +! if (p == NULL) + vm_exit_out_of_memory(bytes, "ChunkPool::allocate"); +! + return p; + } + +--- 207,215 ---- + p = get_first(); + if (p == NULL) p = os::malloc(bytes); + } +! if (p == NULL && alloc_failmode == AllocFailStrategy::EXIT_OOM) { + vm_exit_out_of_memory(bytes, "ChunkPool::allocate"); +! } + return p; + } + +*************** +*** 300,306 **** + //-------------------------------------------------------------------------------------- + // Chunk implementation + +! void* Chunk::operator new(size_t requested_size, size_t length) { + // requested_size is equal to sizeof(Chunk) but in order for the arena + // allocations to come out aligned as expected the size must be aligned + // to expected arean alignment. +--- 300,306 ---- + //-------------------------------------------------------------------------------------- + // Chunk implementation + +! void* Chunk::operator new(size_t requested_size, AllocFailType alloc_failmode, size_t length) { + // requested_size is equal to sizeof(Chunk) but in order for the arena + // allocations to come out aligned as expected the size must be aligned + // to expected arean alignment. +*************** +*** 308,320 **** + assert(ARENA_ALIGN(requested_size) == aligned_overhead_size(), "Bad alignment"); + size_t bytes = ARENA_ALIGN(requested_size) + length; + switch (length) { +! case Chunk::size: return ChunkPool::large_pool()->allocate(bytes); +! case Chunk::medium_size: return ChunkPool::medium_pool()->allocate(bytes); +! case Chunk::init_size: return ChunkPool::small_pool()->allocate(bytes); + default: { +! void *p = os::malloc(bytes); +! if (p == NULL) + vm_exit_out_of_memory(bytes, "Chunk::new"); + return p; + } + } +--- 308,321 ---- + assert(ARENA_ALIGN(requested_size) == aligned_overhead_size(), "Bad alignment"); + size_t bytes = ARENA_ALIGN(requested_size) + length; + switch (length) { +! case Chunk::size: return ChunkPool::large_pool()->allocate(bytes, alloc_failmode); +! case Chunk::medium_size: return ChunkPool::medium_pool()->allocate(bytes, alloc_failmode); +! case Chunk::init_size: return ChunkPool::small_pool()->allocate(bytes, alloc_failmode); + default: { +! void* p = os::malloc(bytes); +! if (p == NULL && alloc_failmode == AllocFailStrategy::EXIT_OOM) { + vm_exit_out_of_memory(bytes, "Chunk::new"); ++ } + return p; + } + } +*************** +*** 367,380 **** + Arena::Arena(size_t init_size) { + size_t round_size = (sizeof (char *)) - 1; + init_size = (init_size+round_size) & ~round_size; +! _first = _chunk = new (init_size) Chunk(init_size); + _hwm = _chunk->bottom(); // Save the cached hwm, max + _max = _chunk->top(); + set_size_in_bytes(init_size); + } + + Arena::Arena() { +! _first = _chunk = new (Chunk::init_size) Chunk(Chunk::init_size); + _hwm = _chunk->bottom(); // Save the cached hwm, max + _max = _chunk->top(); + set_size_in_bytes(Chunk::init_size); +--- 368,381 ---- + Arena::Arena(size_t init_size) { + size_t round_size = (sizeof (char *)) - 1; + init_size = (init_size+round_size) & ~round_size; +! _first = _chunk = new (AllocFailStrategy::EXIT_OOM, init_size) Chunk(init_size); + _hwm = _chunk->bottom(); // Save the cached hwm, max + _max = _chunk->top(); + set_size_in_bytes(init_size); + } + + Arena::Arena() { +! _first = _chunk = new (AllocFailStrategy::EXIT_OOM, Chunk::init_size) Chunk(Chunk::init_size); + _hwm = _chunk->bottom(); // Save the cached hwm, max + _max = _chunk->top(); + set_size_in_bytes(Chunk::init_size); +*************** +*** 427,441 **** + } + + // Grow a new Chunk +! void* Arena::grow( size_t x ) { + // Get minimal required size. Either real big, or even bigger for giant objs + size_t len = MAX2(x, (size_t) Chunk::size); + + Chunk *k = _chunk; // Get filled-up chunk address +! _chunk = new (len) Chunk(len); + + if (_chunk == NULL) { +! signal_out_of_memory(len * Chunk::aligned_overhead_size(), "Arena::grow"); + } + + if (k) k->set_next(_chunk); // Append new chunk to end of linked list +--- 428,442 ---- + } + + // Grow a new Chunk +! void* Arena::grow(size_t x, AllocFailType alloc_failmode) { + // Get minimal required size. Either real big, or even bigger for giant objs + size_t len = MAX2(x, (size_t) Chunk::size); + + Chunk *k = _chunk; // Get filled-up chunk address +! _chunk = new (alloc_failmode, len) Chunk(len); + + if (_chunk == NULL) { +! return NULL; + } + + if (k) k->set_next(_chunk); // Append new chunk to end of linked list +*************** +*** 451,463 **** + + + // Reallocate storage in Arena. +! void *Arena::Arealloc(void* old_ptr, size_t old_size, size_t new_size) { + assert(new_size >= 0, "bad size"); + if (new_size == 0) return NULL; + #ifdef ASSERT + if (UseMallocOnly) { + // always allocate a new object (otherwise we'll free this one twice) +! char* copy = (char*)Amalloc(new_size); + size_t n = MIN2(old_size, new_size); + if (n > 0) memcpy(copy, old_ptr, n); + Afree(old_ptr,old_size); // Mostly done to keep stats accurate +--- 452,467 ---- + + + // Reallocate storage in Arena. +! void *Arena::Arealloc(void* old_ptr, size_t old_size, size_t new_size, AllocFailType alloc_failmode) { + assert(new_size >= 0, "bad size"); + if (new_size == 0) return NULL; + #ifdef ASSERT + if (UseMallocOnly) { + // always allocate a new object (otherwise we'll free this one twice) +! char* copy = (char*)Amalloc(new_size, alloc_failmode); +! if (copy == NULL) { +! return NULL; +! } + size_t n = MIN2(old_size, new_size); + if (n > 0) memcpy(copy, old_ptr, n); + Afree(old_ptr,old_size); // Mostly done to keep stats accurate +*************** +*** 483,489 **** + } + + // Oops, got to relocate guts +! void *new_ptr = Amalloc(new_size); + memcpy( new_ptr, c_old, old_size ); + Afree(c_old,old_size); // Mostly done to keep stats accurate + return new_ptr; +--- 487,496 ---- + } + + // Oops, got to relocate guts +! void *new_ptr = Amalloc(new_size, alloc_failmode); +! if (new_ptr == NULL) { +! return NULL; +! } + memcpy( new_ptr, c_old, old_size ); + Afree(c_old,old_size); // Mostly done to keep stats accurate + return new_ptr; +*** openjdk/hotspot/src/share/vm/memory/allocation.hpp 2011-11-14 17:07:35.000000000 -0500 +--- openjdk/hotspot/src/share/vm/memory/allocation.hpp 2013-06-25 15:13:06.325141250 -0400 +*************** +*** 1,5 **** + /* +! * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +--- 1,5 ---- + /* +! * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +*************** +*** 34,43 **** +--- 34,51 ---- + #include "opto/c2_globals.hpp" + #endif + ++ #include ++ + #define ARENA_ALIGN_M1 (((size_t)(ARENA_AMALLOC_ALIGNMENT)) - 1) + #define ARENA_ALIGN_MASK (~((size_t)ARENA_ALIGN_M1)) + #define ARENA_ALIGN(x) ((((size_t)(x)) + ARENA_ALIGN_M1) & ARENA_ALIGN_MASK) + ++ class AllocFailStrategy { ++ public: ++ enum AllocFailEnum { EXIT_OOM, RETURN_NULL }; ++ }; ++ typedef AllocFailStrategy::AllocFailEnum AllocFailType; ++ + // All classes in the virtual machine must be subclassed + // by one of the following allocation classes: + // +*************** +*** 152,158 **** + Chunk* _next; // Next Chunk in list + const size_t _len; // Size of this Chunk + public: +! void* operator new(size_t size, size_t length); + void operator delete(void* p); + Chunk(size_t length); + +--- 160,166 ---- + Chunk* _next; // Next Chunk in list + const size_t _len; // Size of this Chunk + public: +! void* operator new(size_t size, AllocFailType alloc_failmode, size_t length); + void operator delete(void* p); + Chunk(size_t length); + +*************** +*** 200,206 **** + Chunk *_first; // First chunk + Chunk *_chunk; // current chunk + char *_hwm, *_max; // High water mark and max in current chunk +! void* grow(size_t x); // Get a new Chunk of at least size x + NOT_PRODUCT(size_t _size_in_bytes;) // Size of arena (used for memory usage tracing) + NOT_PRODUCT(static size_t _bytes_allocated;) // total #bytes allocated since start + friend class AllocStats; +--- 208,215 ---- + Chunk *_first; // First chunk + Chunk *_chunk; // current chunk + char *_hwm, *_max; // High water mark and max in current chunk +! // Get a new Chunk of at least size x +! void* grow(size_t x, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM); + NOT_PRODUCT(size_t _size_in_bytes;) // Size of arena (used for memory usage tracing) + NOT_PRODUCT(static size_t _bytes_allocated;) // total #bytes allocated since start + friend class AllocStats; +*************** +*** 209,218 **** + + void signal_out_of_memory(size_t request, const char* whence) const; + +! void check_for_overflow(size_t request, const char* whence) const { + if (UINTPTR_MAX - request < (uintptr_t)_hwm) { + signal_out_of_memory(request, whence); + } + } + + public: +--- 218,232 ---- + + void signal_out_of_memory(size_t request, const char* whence) const; + +! bool check_for_overflow(size_t request, const char* whence, +! AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) const { + if (UINTPTR_MAX - request < (uintptr_t)_hwm) { ++ if (alloc_failmode == AllocFailStrategy::RETURN_NULL) { ++ return false; ++ } + signal_out_of_memory(request, whence); + } ++ return true; + } + + public: +*************** +*** 224,237 **** + char* hwm() const { return _hwm; } + + // Fast allocate in the arena. Common case is: pointer test + increment. +! void* Amalloc(size_t x) { + assert(is_power_of_2(ARENA_AMALLOC_ALIGNMENT) , "should be a power of 2"); + x = ARENA_ALIGN(x); + debug_only(if (UseMallocOnly) return malloc(x);) +! check_for_overflow(x, "Arena::Amalloc"); + NOT_PRODUCT(_bytes_allocated += x); + if (_hwm + x > _max) { +! return grow(x); + } else { + char *old = _hwm; + _hwm += x; +--- 238,252 ---- + char* hwm() const { return _hwm; } + + // Fast allocate in the arena. Common case is: pointer test + increment. +! void* Amalloc(size_t x, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) { + assert(is_power_of_2(ARENA_AMALLOC_ALIGNMENT) , "should be a power of 2"); + x = ARENA_ALIGN(x); + debug_only(if (UseMallocOnly) return malloc(x);) +! if (!check_for_overflow(x, "Arena::Amalloc", alloc_failmode)) +! return NULL; + NOT_PRODUCT(_bytes_allocated += x); + if (_hwm + x > _max) { +! return grow(x, alloc_failmode); + } else { + char *old = _hwm; + _hwm += x; +*************** +*** 239,251 **** + } + } + // Further assume size is padded out to words +! void *Amalloc_4(size_t x) { + assert( (x&(sizeof(char*)-1)) == 0, "misaligned size" ); + debug_only(if (UseMallocOnly) return malloc(x);) +! check_for_overflow(x, "Arena::Amalloc_4"); + NOT_PRODUCT(_bytes_allocated += x); + if (_hwm + x > _max) { +! return grow(x); + } else { + char *old = _hwm; + _hwm += x; +--- 254,267 ---- + } + } + // Further assume size is padded out to words +! void *Amalloc_4(size_t x, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) { + assert( (x&(sizeof(char*)-1)) == 0, "misaligned size" ); + debug_only(if (UseMallocOnly) return malloc(x);) +! if (!check_for_overflow(x, "Arena::Amalloc_4", alloc_failmode)) +! return NULL; + NOT_PRODUCT(_bytes_allocated += x); + if (_hwm + x > _max) { +! return grow(x, alloc_failmode); + } else { + char *old = _hwm; + _hwm += x; +*************** +*** 255,261 **** + + // Allocate with 'double' alignment. It is 8 bytes on sparc. + // In other cases Amalloc_D() should be the same as Amalloc_4(). +! void* Amalloc_D(size_t x) { + assert( (x&(sizeof(char*)-1)) == 0, "misaligned size" ); + debug_only(if (UseMallocOnly) return malloc(x);) + #if defined(SPARC) && !defined(_LP64) +--- 271,277 ---- + + // Allocate with 'double' alignment. It is 8 bytes on sparc. + // In other cases Amalloc_D() should be the same as Amalloc_4(). +! void* Amalloc_D(size_t x, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) { + assert( (x&(sizeof(char*)-1)) == 0, "misaligned size" ); + debug_only(if (UseMallocOnly) return malloc(x);) + #if defined(SPARC) && !defined(_LP64) +*************** +*** 263,272 **** + size_t delta = (((size_t)_hwm + DALIGN_M1) & ~DALIGN_M1) - (size_t)_hwm; + x += delta; + #endif +! check_for_overflow(x, "Arena::Amalloc_D"); + NOT_PRODUCT(_bytes_allocated += x); + if (_hwm + x > _max) { +! return grow(x); // grow() returns a result aligned >= 8 bytes. + } else { + char *old = _hwm; + _hwm += x; +--- 279,289 ---- + size_t delta = (((size_t)_hwm + DALIGN_M1) & ~DALIGN_M1) - (size_t)_hwm; + x += delta; + #endif +! if (!check_for_overflow(x, "Arena::Amalloc_D", alloc_failmode)) +! return NULL; + NOT_PRODUCT(_bytes_allocated += x); + if (_hwm + x > _max) { +! return grow(x, alloc_failmode); // grow() returns a result aligned >= 8 bytes. + } else { + char *old = _hwm; + _hwm += x; +*************** +*** 286,292 **** + if (((char*)ptr) + size == _hwm) _hwm = (char*)ptr; + } + +! void *Arealloc( void *old_ptr, size_t old_size, size_t new_size ); + + // Move contents of this arena into an empty arena + Arena *move_contents(Arena *empty_arena); +--- 303,310 ---- + if (((char*)ptr) + size == _hwm) _hwm = (char*)ptr; + } + +! void *Arealloc( void *old_ptr, size_t old_size, size_t new_size, +! AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM); + + // Move contents of this arena into an empty arena + Arena *move_contents(Arena *empty_arena); +*************** +*** 328,336 **** + + + //%note allocation_1 From andrew at icedtea.classpath.org Wed Jun 26 21:35:53 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 27 Jun 2013 04:35:53 +0000 Subject: /hg/release/icedtea7-forest-2.2: Added tag icedtea-2.2.9 for cha... Message-ID: changeset 2f0c447f9bc6 in /hg/release/icedtea7-forest-2.2 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2?cmd=changeset;node=2f0c447f9bc6 author: andrew date: Thu Jun 27 05:35:35 2013 +0100 Added tag icedtea-2.2.9 for changeset 0cc24300e6de diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 0cc24300e6de -r 2f0c447f9bc6 .hgtags --- a/.hgtags Wed May 22 17:56:59 2013 +0100 +++ b/.hgtags Thu Jun 27 05:35:35 2013 +0100 @@ -182,3 +182,4 @@ ac5792f240c017780b09a8ac3e5e04b73c4db4ac icedtea-2.2.6 cf1afd9bb9364eff333a7186caa81e958bffbc00 icedtea-2.2.7 1a406488fe3392f5a1d432fa4d5024b71eac89c2 icedtea-2.2.8 +0cc24300e6de085eeffcebc97d648eac44c10bc2 icedtea-2.2.9 From andrew at icedtea.classpath.org Wed Jun 26 21:36:00 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 27 Jun 2013 04:36:00 +0000 Subject: /hg/release/icedtea7-forest-2.2/corba: Added tag icedtea-2.2.9 f... Message-ID: changeset 52b8da38b289 in /hg/release/icedtea7-forest-2.2/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/corba?cmd=changeset;node=52b8da38b289 author: andrew date: Thu Jun 27 05:35:35 2013 +0100 Added tag icedtea-2.2.9 for changeset 4fdf74f61b48 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 4fdf74f61b48 -r 52b8da38b289 .hgtags --- a/.hgtags Wed Jun 12 12:03:45 2013 +0100 +++ b/.hgtags Thu Jun 27 05:35:35 2013 +0100 @@ -186,3 +186,4 @@ 5a9a1b4aecd3e1ad36a139d53222be6c8c09fdf8 icedtea-2.2.6 5fcf70e41383eb93989ddb75de8f592b3ec395ae icedtea-2.2.7 529355376925824e8dfe7fb2365df832816ed40d icedtea-2.2.8 +4fdf74f61b48972a812af9194eb895a093ac4f9a icedtea-2.2.9 From andrew at icedtea.classpath.org Wed Jun 26 21:36:06 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 27 Jun 2013 04:36:06 +0000 Subject: /hg/release/icedtea7-forest-2.2/jaxp: Added tag icedtea-2.2.9 fo... Message-ID: changeset e833b07a0dc5 in /hg/release/icedtea7-forest-2.2/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxp?cmd=changeset;node=e833b07a0dc5 author: andrew date: Thu Jun 27 05:35:36 2013 +0100 Added tag icedtea-2.2.9 for changeset 5ce90e84aa21 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 5ce90e84aa21 -r e833b07a0dc5 .hgtags --- a/.hgtags Wed May 22 17:57:01 2013 +0100 +++ b/.hgtags Thu Jun 27 05:35:36 2013 +0100 @@ -182,3 +182,4 @@ 7d285e628870edf9e3d69b46ea8a7ef2584a6ecb icedtea-2.2.6 988fa5bfeeec56dd27a23fa0baf1ab1a51b9ffa3 icedtea-2.2.7 839055d03a5469a3f4724d3dfc64eac3ec793087 icedtea-2.2.8 +5ce90e84aa21461194e9d4eac1ae5a36e660d60b icedtea-2.2.9 From andrew at icedtea.classpath.org Wed Jun 26 21:36:13 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 27 Jun 2013 04:36:13 +0000 Subject: /hg/release/icedtea7-forest-2.2/jaxws: Added tag icedtea-2.2.9 f... Message-ID: changeset fee1b3fd5220 in /hg/release/icedtea7-forest-2.2/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxws?cmd=changeset;node=fee1b3fd5220 author: andrew date: Thu Jun 27 05:35:37 2013 +0100 Added tag icedtea-2.2.9 for changeset 5942fdde2af6 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 5942fdde2af6 -r fee1b3fd5220 .hgtags --- a/.hgtags Thu Mar 21 11:08:05 2013 -0400 +++ b/.hgtags Thu Jun 27 05:35:37 2013 +0100 @@ -182,3 +182,4 @@ acf0bd2643a58566c259ea9a9a73c446d11cc28c icedtea-2.2.6 1b6e40dd07568ca0f9eb20b8685b11f1b103898e icedtea-2.2.7 c7ac0744f92f0d732b5afa0aad345c344809f196 icedtea-2.2.8 +5942fdde2af679688944d98c466714c2b73590ee icedtea-2.2.9 From andrew at icedtea.classpath.org Wed Jun 26 21:36:19 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 27 Jun 2013 04:36:19 +0000 Subject: /hg/release/icedtea7-forest-2.2/langtools: Added tag icedtea-2.2... Message-ID: changeset e1e019fc70db in /hg/release/icedtea7-forest-2.2/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/langtools?cmd=changeset;node=e1e019fc70db author: andrew date: Thu Jun 27 05:35:39 2013 +0100 Added tag icedtea-2.2.9 for changeset 1c14c3a8ea14 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 1c14c3a8ea14 -r e1e019fc70db .hgtags --- a/.hgtags Wed Jun 05 14:31:54 2013 -0700 +++ b/.hgtags Thu Jun 27 05:35:39 2013 +0100 @@ -183,3 +183,4 @@ de74a816c73afcefc37d9edaacf165d7394f3cf3 icedtea-2.2.6 e89d5b6f21a69b052fda26bc8024bbc9d0a3efc9 icedtea-2.2.7 ae5ba074188dd2b4c458243c6788b57b68ca4f15 icedtea-2.2.8 +1c14c3a8ea14af0519d07ae10e6e20d61fc818cd icedtea-2.2.9 From andrew at icedtea.classpath.org Wed Jun 26 21:36:26 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 27 Jun 2013 04:36:26 +0000 Subject: /hg/release/icedtea7-forest-2.2/hotspot: Added tag icedtea-2.2.9... Message-ID: changeset 09d4dd5ec76d in /hg/release/icedtea7-forest-2.2/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/hotspot?cmd=changeset;node=09d4dd5ec76d author: andrew date: Thu Jun 27 05:35:40 2013 +0100 Added tag icedtea-2.2.9 for changeset 89a7d38e2e31 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 89a7d38e2e31 -r 09d4dd5ec76d .hgtags --- a/.hgtags Wed Jun 12 12:19:38 2013 +0100 +++ b/.hgtags Thu Jun 27 05:35:40 2013 +0100 @@ -293,3 +293,4 @@ d2e4bf94d38d76aa3e1908f9e01f8b8933caf09b icedtea-2.2.6 de365dd264846fcb73fed2afc3cd41652eb44ce1 icedtea-2.2.7 168d05b42b8900de8974b5d5cee9e65d19c9db02 icedtea-2.2.8 +89a7d38e2e31a3d81aaae7a1ea52862a5a71b042 icedtea-2.2.9 From andrew at icedtea.classpath.org Wed Jun 26 21:36:37 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 27 Jun 2013 04:36:37 +0000 Subject: /hg/release/icedtea7-forest-2.2/jdk: 46 new changesets Message-ID: changeset 30a4ffef9e9e in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=30a4ffef9e9e author: andrew date: Wed Jun 26 21:08:50 2013 -0500 7053526: Upgrade JDK 8 to use Little CMS 2.4 Reviewed-by: prr, jgodinez changeset f54b678a09dd in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=f54b678a09dd author: bae date: Wed Dec 05 16:55:05 2012 +0400 7124347: [macosx] java.lang.InternalError: not implemented yet on call Graphics2D.drawRenderedImage Reviewed-by: prr, flar changeset 251f7015007e in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=251f7015007e author: andrew date: Wed Jun 26 22:04:37 2013 -0500 7199143: RFE: OCSP revocation checker should provide possibility to specify connection timeout Summary: Added com.sun.security.ocsp.timeout system property to control timeout Reviewed-by: mullan, vinnie Contributed-by: jason.uh at oracle.com changeset f6e8114c83d8 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=f6e8114c83d8 author: dcherepanov date: Sat Dec 29 17:43:32 2012 +0400 8001161: mac: EmbeddedFrame doesn't become active window Reviewed-by: ant changeset a69393292482 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=a69393292482 author: mcherkas date: Tue Feb 12 16:11:40 2013 +0400 8005932: Java 7 on mac os x only provides text clipboard formats Reviewed-by: alexp, denis changeset 52ebc1a5dc7e in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=52ebc1a5dc7e author: andrew date: Wed Jun 26 22:07:43 2013 -0500 8006120: Provide "Server JRE" for 7u train Reviewed-by: pbhat, cgruszka Contributed-by: amy.y.wang at oracle.com changeset 150f313dd12b in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=150f313dd12b author: andrew date: Wed Jun 26 22:09:11 2013 -0500 8006417: JComboBox.showPopup(), hidePopup() fails in JRE 1.7 on OS X Reviewed-by: art, serb changeset 2e036c4efce0 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=2e036c4efce0 author: ksrini date: Tue Jul 31 06:10:01 2012 -0700 7188114: (launcher) need an alternate command line parser for Windows Reviewed-by: darcy, dholmes, jjh Contributed-by: akhil.arora at oracle.com changeset 97a82121fbcc in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=97a82121fbcc author: andrew date: Wed Jun 26 22:15:08 2013 -0500 8006536: [launcher] removes trailing slashes on arguments Reviewed-by: ksrini, akhil Contributed-by: jviswana at linux.vnet.ibm.com changeset 1d02c49f1945 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=1d02c49f1945 author: andrew date: Wed Jun 26 22:20:19 2013 -0500 8009165: Fix for 8006435 needs revision Summary: The fix for JDK-8006435 added a new ReflectUtil.ensureClassAccess method which is not an appropriate utility method in ReflectUtil. Reviewed-by: alanb, mchung, dfuchs changeset 56477df97a76 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=56477df97a76 author: mullan date: Mon Apr 29 10:20:55 2013 -0400 8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03 Reviewed-by: xuelei changeset 46326d5499d7 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=46326d5499d7 author: uta date: Fri Mar 08 13:47:02 2013 +0400 8009463: Regression test test\java\lang\Runtime\exec\ArgWithSpaceAndFinalBackslash.java failing. Reviewed-by: alanb, ahgross changeset 8f1751ad199f in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=8f1751ad199f author: valeriep date: Mon Mar 11 20:05:37 2013 -0700 8009610: Blacklist certificate used with malware. Summary: updated the black list and the reg test with the new cert. Reviewed-by: weijun changeset 60ebaf6c7893 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=60ebaf6c7893 author: coffeys date: Thu Oct 11 14:28:36 2012 +0100 7198570: (tz) Support tzdata2012f Reviewed-by: peytoia, asaha changeset f9181e6f4d9b in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=f9181e6f4d9b author: coffeys date: Tue Nov 06 10:19:49 2012 +0000 8002225: (tz) Support tzdata2012i Reviewed-by: peytoia, asaha changeset ecf953aa6ea6 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=ecf953aa6ea6 author: peytoia date: Fri Mar 15 20:35:51 2013 +0900 8009987: (tz) Support tzdata2013b Reviewed-by: okutsu changeset dad642e0105e in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=dad642e0105e author: andrew date: Wed Jun 26 22:27:10 2013 -0500 8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail Reviewed-by: dfuchs, dholmes changeset 1d48c0d0a0a2 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=1d48c0d0a0a2 author: pchelko date: Wed Apr 10 14:28:10 2013 +0400 8010009: [macosx] Unable type into online word games on MacOSX Reviewed-by: anthony, dcherepanov, yan changeset ad785fb5f898 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=ad785fb5f898 author: khazra date: Wed Mar 20 13:39:56 2013 -0700 8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build Summary: Eliminate fall-through while setting socket options on Windows Reviewed-by: alanb, chegar changeset 1112bf018977 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=1112bf018977 author: mullan date: Fri May 10 16:28:51 2013 -0400 8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod Reviewed-by: xuelei, hawtin changeset ea53cd66f97d in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=ea53cd66f97d author: mchung date: Tue May 14 08:07:08 2013 -0700 8010727: WLS fails to add a logger with "" in its own LogManager subclass instance Reviewed-by: alanb, jgish changeset 8e95e294f32e in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=8e95e294f32e author: jgish date: Fri Apr 19 16:50:10 2013 -0700 8010939: Deadlock in LogManager Summary: re-order locks to avoid deadlock Reviewed-by: mchung, alanb changeset dede8bbd27b0 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=dede8bbd27b0 author: jfranck date: Thu Apr 18 13:18:28 2013 +0200 8011139: (reflect) Revise checking in getEnclosingClass Reviewed-by: darcy, mchung, ahgross changeset b7372f646b8b in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=b7372f646b8b author: anthony date: Tue Apr 09 12:08:53 2013 +0400 8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows Reviewed-by: art, yan changeset a0a8f7054efa in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=a0a8f7054efa author: andrew date: Wed Jun 26 22:30:32 2013 -0500 8011313: OCSP timeout set to wrong value if com.sun.security.ocsp.timeout not defined Reviewed-by: vinnie changeset 13df44d15f22 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=13df44d15f22 author: ngthomas date: Tue May 21 10:25:40 2013 -0700 8014968: OCSP and CRL connection timeout is set to four hours by default Reviewed-by: mullan changeset e76a01af033c in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=e76a01af033c author: asaha date: Tue Apr 09 12:39:40 2013 -0700 8011806: 7u25-b05 hotspot fastdebug build failure Summary: Backed out changeset 05a8336b1eab Reviewed-by: mullan changeset aa0194c5cec0 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=aa0194c5cec0 author: bae date: Fri Apr 12 14:15:17 2013 +0400 8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05 Reviewed-by: prr, vadim changeset df8e01fa4e26 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=df8e01fa4e26 author: bae date: Mon Apr 15 14:15:21 2013 +0400 8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris Reviewed-by: prr, vadim changeset 5d5752746305 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=5d5752746305 author: dfuchs date: Wed May 01 00:49:21 2013 +0200 8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21 Reviewed-by: alanb, skoivu, smarks, mchung changeset 3d459273c61b in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=3d459273c61b author: alexsch date: Mon Apr 29 16:46:18 2013 +0400 8012330: [macosx] Sometimes the applet showing the modal dialog itself loses the ability to gain focus Reviewed-by: serb, ant changeset 0895957e8e00 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=0895957e8e00 author: uta date: Mon May 13 20:09:20 2013 +0400 8012453: (process) Runtime.exec(String) fails if command contains spaces [win] Reviewed-by: alanb changeset 5f9ebbddde81 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=5f9ebbddde81 author: prr date: Thu Apr 25 21:37:41 2013 -0700 8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer Reviewed-by: bae, srl changeset 2027b41aae30 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=2027b41aae30 author: leonidr date: Mon May 06 16:30:42 2013 +0400 8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07 Summary: Do not mark context as disposed until we've posted all the events Reviewed-by: art changeset 166a090d3fd4 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=166a090d3fd4 author: coffeys date: Wed May 01 21:02:04 2013 +0100 8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext() Reviewed-by: mchung, okutsu changeset 452cb039dfd2 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=452cb039dfd2 author: andrew date: Wed Jun 26 22:37:21 2013 -0500 8013228: Create new system properties to control allowable OCSP clock skew and CRL connection timeout Reviewed-by: vinnie changeset a318a41ecb0b in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=a318a41ecb0b author: andrew date: Wed Jun 26 22:44:03 2013 -0500 8002070: Remove the stack search for a resource bundle for Logger to use Summary: The fragile, vulnerable, stack crawling has been eliminated from findResourceBundle(String) Reviewed-by: mchung changeset 066a89e5a911 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=066a89e5a911 author: jgish date: Tue Apr 16 16:34:14 2013 -0400 8011990: TEST_BUG: java/util/logging/bundlesearch/ResourceBundleSearchTest.java fails on Windows Summary: Fix URL to reliably work on all platforms Reviewed-by: duke changeset 24e391618fb6 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=24e391618fb6 author: andrew date: Wed Jun 26 22:50:47 2013 -0500 8013380: Removal of stack walk to find resource bundle breaks Glassfish startup Summary: Use caller's classloader to load resource as an alternative to thread context classloader and system classloader Reviewed-by: mchung, alanb changeset 0ef49d4854cb in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=0ef49d4854cb author: bae date: Fri May 17 16:07:14 2013 +0400 8014205: Most of the Swing dialogs are blank on one win7 MUI Reviewed-by: prr, vadim changeset 94fea8ab8b70 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=94fea8ab8b70 author: serb date: Tue May 14 20:22:55 2013 +0400 8014423: [macosx] The scrollbar's block increment performs incorrectly Reviewed-by: anthony, art changeset 6f8aa73679d9 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=6f8aa73679d9 author: bae date: Tue May 14 21:05:20 2013 +0400 8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09 Reviewed-by: prr, vadim changeset eba6acf14262 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=eba6acf14262 author: dmeetry date: Fri May 17 19:59:49 2013 +0400 8014676: Java debugger may fail to run Summary: The problem is observed when the binaries for windows are placed under a path which contains a space Reviewed-by: alanb Contributed-by: ivan.gerasimov at oracle.com changeset ddb2c511b339 in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=ddb2c511b339 author: leonidr date: Mon May 20 18:51:34 2013 +0400 8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10 Summary: Removed logging from SunToolkit Reviewed-by: art changeset 25f39684638a in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=25f39684638a author: mchung date: Fri May 17 14:29:51 2013 -0700 8014745: Provide a switch to allow stack walk search of resource bundle Reviewed-by: alanb, jgish changeset fade57de534f in /hg/release/icedtea7-forest-2.2/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk?cmd=changeset;node=fade57de534f author: andrew date: Thu Jun 27 05:35:44 2013 +0100 Added tag icedtea-2.2.9 for changeset 25f39684638a diffstat: .hgtags | 1 + make/common/Defs.gmk | 1 + make/common/Release-macosx.gmk | 11 +- make/common/Release.gmk | 34 +- make/java/java/mapfile-vers | 1 + make/sun/cmm/lcms/FILES_c_unix.gmk | 1 + make/sun/cmm/lcms/FILES_c_windows.gmk | 1 + make/sun/javazic/tzdata/VERSION | 2 +- make/sun/javazic/tzdata/africa | 150 +- make/sun/javazic/tzdata/antarctica | 7 +- make/sun/javazic/tzdata/asia | 231 +- make/sun/javazic/tzdata/australasia | 105 +- make/sun/javazic/tzdata/backward | 1 - make/sun/javazic/tzdata/etcetera | 1 - make/sun/javazic/tzdata/europe | 144 +- make/sun/javazic/tzdata/factory | 1 - make/sun/javazic/tzdata/iso3166.tab | 1 - make/sun/javazic/tzdata/leapseconds | 7 +- make/sun/javazic/tzdata/northamerica | 92 +- make/sun/javazic/tzdata/pacificnew | 1 - make/sun/javazic/tzdata/solar87 | 1 - make/sun/javazic/tzdata/solar88 | 1 - make/sun/javazic/tzdata/solar89 | 1 - make/sun/javazic/tzdata/southamerica | 100 +- make/sun/javazic/tzdata/systemv | 1 - make/sun/javazic/tzdata/zone.tab | 6 +- src/macosx/classes/sun/lwawt/LWScrollBarPeer.java | 4 +- src/macosx/classes/sun/lwawt/LWToolkit.java | 4 +- src/macosx/classes/sun/lwawt/LWWindowPeer.java | 10 +- src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java | 41 +- src/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java | 28 +- src/macosx/classes/sun/lwawt/macosx/CPlatformView.java | 2 +- src/macosx/lib/flavormap.properties | 6 +- src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java | 14 +- src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java | 13 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java | 14 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/ObjectContainer.java | 5 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java | 3 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperties.java | 21 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java | 5 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java | 39 +- src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java | 6 +- src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java | 12 + src/share/classes/com/sun/tools/jdi/AbstractLauncher.java | 2 +- src/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java | 2 +- src/share/classes/java/awt/Toolkit.java | 10 +- src/share/classes/java/awt/image/BufferedImage.java | 56 +- src/share/classes/java/awt/image/Raster.java | 3 +- src/share/classes/java/io/ObjectStreamClass.java | 8 +- src/share/classes/java/io/ObjectStreamField.java | 8 +- src/share/classes/java/lang/Class.java | 24 +- src/share/classes/java/lang/ProcessBuilder.java | 5 +- src/share/classes/java/lang/invoke/MethodHandleNatives.java | 2 + src/share/classes/java/security/AccessControlContext.java | 13 +- src/share/classes/java/security/ProtectionDomain.java | 7 +- src/share/classes/java/util/logging/LogManager.java | 23 +- src/share/classes/java/util/logging/Logger.java | 177 +- src/share/classes/javax/management/StandardEmitterMBean.java | 7 +- src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java | 2 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java | 15 + src/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java | 3 + src/share/classes/sun/awt/AppContext.java | 38 +- src/share/classes/sun/awt/SunToolkit.java | 26 +- src/share/classes/sun/font/ExtendedTextSourceLabel.java | 43 +- src/share/classes/sun/font/GlyphLayout.java | 21 +- src/share/classes/sun/java2d/opengl/OGLBlitLoops.java | 52 + src/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java | 3 +- src/share/classes/sun/misc/SharedSecrets.java | 5 +- src/share/classes/sun/reflect/Reflection.java | 15 + src/share/classes/sun/reflect/misc/ReflectUtil.java | 8 - src/share/classes/sun/security/provider/certpath/CertPathHelper.java | 2 +- src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java | 14 +- src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java | 40 +- src/share/classes/sun/security/provider/certpath/OCSP.java | 28 +- src/share/classes/sun/security/provider/certpath/OCSPResponse.java | 31 +- src/share/classes/sun/security/provider/certpath/URICertStore.java | 31 +- src/share/classes/sun/security/util/UntrustedCertificates.java | 47 + src/share/classes/sun/util/resources/TimeZoneNames.java | 37 +- src/share/classes/sun/util/resources/TimeZoneNames_de.java | 37 +- src/share/classes/sun/util/resources/TimeZoneNames_es.java | 37 +- src/share/classes/sun/util/resources/TimeZoneNames_fr.java | 127 +- src/share/classes/sun/util/resources/TimeZoneNames_it.java | 37 +- src/share/classes/sun/util/resources/TimeZoneNames_ja.java | 37 +- src/share/classes/sun/util/resources/TimeZoneNames_ko.java | 37 +- src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java | 41 +- src/share/classes/sun/util/resources/TimeZoneNames_sv.java | 37 +- src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java | 37 +- src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java | 39 +- src/share/native/sun/awt/medialib/awt_ImagingLib.c | 33 +- src/share/native/sun/font/layout/ContextualSubstSubtables.cpp | 12 + src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp | 2 +- src/share/native/sun/font/layout/ExtensionSubtables.cpp | 6 +- src/share/native/sun/font/layout/ExtensionSubtables.h | 3 +- src/share/native/sun/font/layout/GlyphPosnLookupProc.cpp | 2 +- src/share/native/sun/font/layout/GlyphSubstLookupProc.cpp | 2 +- src/share/native/sun/font/layout/LigatureSubstSubtables.cpp | 4 + src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp | 4 + src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp | 4 + src/share/native/sun/font/layout/MarkToMarkPosnSubtables.cpp | 4 + src/share/native/sun/font/layout/MultipleSubstSubtables.cpp | 4 + src/share/native/sun/font/layout/PairPositioningSubtables.cpp | 5 + src/share/native/sun/font/layout/SinglePositioningSubtables.cpp | 6 + src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp | 6 + src/share/native/sun/font/layout/SunLayoutEngine.cpp | 17 +- src/share/native/sun/java2d/cmm/lcms/cmscam02.c | 42 +- src/share/native/sun/java2d/cmm/lcms/cmscgats.c | 213 +- src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c | 70 +- src/share/native/sun/java2d/cmm/lcms/cmserr.c | 28 +- src/share/native/sun/java2d/cmm/lcms/cmsgamma.c | 78 +- src/share/native/sun/java2d/cmm/lcms/cmsgmt.c | 15 +- src/share/native/sun/java2d/cmm/lcms/cmshalf.c | 564 ++++ src/share/native/sun/java2d/cmm/lcms/cmsintrp.c | 347 +- src/share/native/sun/java2d/cmm/lcms/cmsio0.c | 112 +- src/share/native/sun/java2d/cmm/lcms/cmsio1.c | 287 +- src/share/native/sun/java2d/cmm/lcms/cmslut.c | 222 +- src/share/native/sun/java2d/cmm/lcms/cmsmd5.c | 2 +- src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c | 3 +- src/share/native/sun/java2d/cmm/lcms/cmsnamed.c | 191 +- src/share/native/sun/java2d/cmm/lcms/cmsopt.c | 112 +- src/share/native/sun/java2d/cmm/lcms/cmspack.c | 1392 +++++++-- src/share/native/sun/java2d/cmm/lcms/cmspcs.c | 1 + src/share/native/sun/java2d/cmm/lcms/cmsplugin.c | 17 +- src/share/native/sun/java2d/cmm/lcms/cmsps2.c | 88 +- src/share/native/sun/java2d/cmm/lcms/cmssamp.c | 305 ++- src/share/native/sun/java2d/cmm/lcms/cmssm.c | 14 +- src/share/native/sun/java2d/cmm/lcms/cmstypes.c | 820 +++++- src/share/native/sun/java2d/cmm/lcms/cmsvirt.c | 92 +- src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c | 12 +- src/share/native/sun/java2d/cmm/lcms/cmsxform.c | 371 ++- src/share/native/sun/java2d/cmm/lcms/lcms2.h | 153 +- src/share/native/sun/java2d/cmm/lcms/lcms2_internal.h | 130 +- src/share/native/sun/java2d/cmm/lcms/lcms2_plugin.h | 91 +- src/share/native/sun/reflect/Reflection.c | 6 + src/windows/bin/cmdtoargs.c | 609 ++++ src/windows/classes/java/lang/ProcessImpl.java | 154 +- src/windows/classes/java/net/DualStackPlainSocketImpl.java | 5 +- src/windows/native/sun/windows/awt_Component.cpp | 2 +- test/com/sun/org/apache/xml/internal/security/TruncateHMAC.java | 1 + test/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java | 9 +- test/com/sun/org/apache/xml/internal/security/transforms/MyTransform.java | 23 +- test/java/awt/DataFlavor/MissedHtmlAndRtfBug/AbsoluteComponentCenterCalculator.java | 37 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/DataFlavorSearcher.java | 47 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/InterprocessMessages.java | 28 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html | 27 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java | 205 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MyTransferable.java | 62 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/NextFramePositionCalculator.java | 20 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/SourcePanel.java | 26 + test/java/awt/DataFlavor/MissedHtmlAndRtfBug/TargetPanel.java | 83 + test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.html | 22 + test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.java | 235 + test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/TestApplet.java | 67 + test/java/awt/font/LineBreakMeasurer/AllFontsLBM.java | 78 + test/java/awt/image/mlib/MlibOpsTest.java | 2 +- test/java/lang/Runtime/exec/ExecCommand.java | 163 + test/java/util/logging/DrainFindDeadlockTest.java | 196 + test/java/util/logging/LogManagerInstanceTest.java | 76 + test/java/util/logging/bundlesearch/ClassPathTestBundle_en.properties | 25 + test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java | 163 + test/java/util/logging/bundlesearch/LoadItUp1.java | 49 + test/java/util/logging/bundlesearch/LoadItUp2.java | 62 + test/java/util/logging/bundlesearch/LoadItUp2Invoker.java | 60 + test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java | 297 ++ test/java/util/logging/bundlesearch/TwiceIndirectlyLoadABundle.java | 91 + test/java/util/logging/bundlesearch/resources/CallerSearchableResource_en.properties | 25 + test/java/util/logging/bundlesearch/resources/ContextClassLoaderTestBundle_en.properties | 25 + test/java/util/logging/bundlesearch/resources/StackSearchableResource_en.properties | 25 + test/javax/swing/JComboBox/ShowPopupAfterHidePopupTest/ShowPopupAfterHidePopupTest.java | 78 + test/sun/awt/AppContext/8012933/Test8012933.java | 92 + test/sun/java2d/OpenGL/CustomCompositeTest.java | 266 + 170 files changed, 9783 insertions(+), 1948 deletions(-) diffs (truncated from 19855 to 500 lines): diff -r c13072c37f69 -r fade57de534f .hgtags --- a/.hgtags Tue Jun 18 08:07:48 2013 -0500 +++ b/.hgtags Thu Jun 27 05:35:44 2013 +0100 @@ -198,3 +198,4 @@ 87ea64734ee654cb63e9cccba9dd93510cf4c400 icedtea-2.2.6 40640be5d6a050443c7037ed81a3792e35e07eee icedtea-2.2.7 1a455d17b871c75369b477a1fe464c071f16edc2 icedtea-2.2.8 +25f39684638a843d9368bb4b68eaf170f009bbed icedtea-2.2.9 diff -r c13072c37f69 -r fade57de534f make/common/Defs.gmk --- a/make/common/Defs.gmk Tue Jun 18 08:07:48 2013 -0500 +++ b/make/common/Defs.gmk Thu Jun 27 05:35:44 2013 +0100 @@ -311,6 +311,7 @@ JDK_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2sdk-image JRE_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2re-image +JDK_SERVER_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2sdk-server-image #where the demo source can be found DEMOSRCDIR = $(SHARE_SRC)/demo diff -r c13072c37f69 -r fade57de534f make/common/Release-macosx.gmk --- a/make/common/Release-macosx.gmk Tue Jun 18 08:07:48 2013 -0500 +++ b/make/common/Release-macosx.gmk Thu Jun 27 05:35:44 2013 +0100 @@ -31,6 +31,8 @@ JDK_BUNDLE_DIR = $(ABS_OUTPUTDIR)/j2sdk-bundle/$(THIS_JDK_VERSION).jdk/Contents JRE_BUNDLE_DIR = $(ABS_OUTPUTDIR)/j2re-bundle/$(THIS_JDK_VERSION).jre/Contents +JDK_SERVER_BUNDLE_DIR = $(ABS_OUTPUTDIR)/j2sdk-server-bundle/jdk$(JDK_VERSION).jdk/Contents +JDK_SERVER_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2sdk-server-image MACOSX_SRC = $(JDK_TOPDIR)/src/macosx @@ -70,6 +72,13 @@ $(SED) -e "s/@@ID@@/$(BUNDLE_ID_JDK)/g" -e "s/@@NAME@@/$(BUNDLE_NAME_JDK)/g" -e "s/@@INFO@@/$(BUNDLE_INFO_JDK)/g" -e "s/@@PLATFORM_VERSION@@/$(BUNDLE_PLATFORM_VERSION)/g" -e "s/@@VERSION@@/$(BUNDLE_VERSION)/g" -e "s/@@VENDOR@@/$(BUNDLE_VENDOR)/g" < $(MACOSX_SRC)/bundle/JDK-Info.plist > $(JDK_BUNDLE_DIR)/Info.plist /usr/bin/SetFile -a B $(JDK_BUNDLE_DIR)/../ -EXTRA_IMAGE_TARGETS += jre-bundle-setup jdk-bundle-setup jre-bundle-files jdk-bundle-files +jdk-server-bundle-files: + $(MKDIR) -p $(JDK_SERVER_BUNDLE_DIR)/MacOS + ln -s ../Home/jre/lib/jli/libjli.dylib $(JDK_SERVER_BUNDLE_DIR)/MacOS/ + $(CP) -r $(JDK_IMAGE_DIR) $(JDK_SERVER_BUNDLE_DIR)/Home + $(SED) -e "s/@@ID@@/$(BUNDLE_ID_JDK)/g" -e "s/@@NAME@@/$(BUNDE_NAME_JDK)/g" -e "s/@@INFO@@/$(BUNDLE_INFO_JDK)/g" -e "s/@@PLATFORM_VERSION@@/$(BUNDLE_PLATFORM_VERSION)/g" -e "s/@@VERSION@@/$(BUNDLE_VERSION)/g" -e "s/@@VENDOR@@/$(BUNDLE_VENDOR)/g" < $(MACOSX_SRC)/bundle/JDK-Info.plist > $(JDK_SERVER_BUNDLE_DIR)/Info.plist + /usr/bin/SetFile -a B $(JDK_SERVER_BUNDLE_DIR)/../ + +EXTRA_IMAGE_TARGETS += jre-bundle-setup jdk-bundle-setup jre-bundle-files jdk-bundle-files jdk-server-bundle-files .PHONY: $(EXTRA_JRE_TARGETS) $(EXTRA_IMAGE_TARGETS) diff -r c13072c37f69 -r fade57de534f make/common/Release.gmk --- a/make/common/Release.gmk Tue Jun 18 08:07:48 2013 -0500 +++ b/make/common/Release.gmk Thu Jun 27 05:35:44 2013 +0100 @@ -232,8 +232,8 @@ trim-image-jre trim-image-jdk \ identify-image-jre identify-image-jdk \ process-image-jre process-image-jdk \ -compare-image \ -sec-files sec-files-win jgss-files :: +compare-image \ +sec-files sec-files-win jgss-files server-jdk-image :: @$(ECHO) ">>>Making "$@" @ `$(DATE)` ..." # Order is important here, trim jre after jdk image is created @@ -242,16 +242,17 @@ images:: sanity-images post-sanity-images \ $(INITIAL_IMAGE_JRE) $(EXTRA_JRE_TARGETS) $(INITIAL_IMAGE_JDK) \ trim-image-jre trim-image-jdk \ - identify-image-jre identify-image-jdk \ - process-image-jre process-image-jdk sec-files sec-files-win jgss-files \ - $(EXTRA_IMAGE_TARGETS) + identify-image-jre identify-image-jdk \ + process-image-jre process-image-jdk sec-files sec-files-win \ + jgss-files $(EXTRA_IMAGE_TARGETS) server-jdk-image else images:: sanity-images post-sanity-images \ $(INITIAL_IMAGE_JRE) $(INITIAL_IMAGE_JDK) \ trim-image-jre trim-image-jdk \ identify-image-jre identify-image-jdk \ - process-image-jre process-image-jdk sec-files sec-files-win jgss-files + process-image-jre process-image-jdk sec-files sec-files-win \ + jgss-files server-jdk-image endif # Don't use these @@ -909,6 +910,27 @@ done $(RM) $(JRE_BIN_LIST) +# Duplicate current j2re-image contents to server-j2re-image +# for the server version of jre, before deploy build +server-jdk-image:: +ifeq ($(PLATFORM), macosx) + $(RM) -r $(JDK_SERVER_BUNDLE_DIR)/Home/demo + $(RM) -r $(JDK_SERVER_BUNDLE_DIR)/Home/sample + $(RM) $(JDK_SERVER_BUNDLE_DIR)/Home/bin/jcontrol + $(RM) $(JDK_SERVER_BUNDLE_DIR)/Home/jre/bin/jcontrol + $(RM) $(JDK_SERVER_BUNDLE_DIR)/Home/man/ja_JP.UTF-8/man1/javaws.1 + $(RM) $(JDK_SERVER_BUNDLE_DIR)/Home/man/man1/javaws.1 +else + $(RM) -r $(JDK_SERVER_IMAGE_DIR) + $(CP) -r $(JDK_IMAGE_DIR) $(JDK_SERVER_IMAGE_DIR) + $(RM) -r $(JDK_SERVER_IMAGE_DIR)/demo + $(RM) -r $(JDK_SERVER_IMAGE_DIR)/sample + $(RM) $(JDK_SERVER_IMAGE_DIR)/bin/jcontrol + $(RM) $(JDK_SERVER_IMAGE_DIR)/jre/bin/jcontrol + $(RM) $(JDK_SERVER_IMAGE_DIR)/man/ja_JP.UTF-8/man1/javaws.1 + $(RM) $(JDK_SERVER_IMAGE_DIR)/man/man1/javaws.1 +endif + ###################################################### # JDK Image ###################################################### diff -r c13072c37f69 -r fade57de534f make/java/java/mapfile-vers --- a/make/java/java/mapfile-vers Tue Jun 18 08:07:48 2013 -0500 +++ b/make/java/java/mapfile-vers Thu Jun 27 05:35:44 2013 +0100 @@ -266,6 +266,7 @@ Java_sun_reflect_NativeConstructorAccessorImpl_newInstance0; Java_sun_reflect_NativeMethodAccessorImpl_invoke0; Java_sun_reflect_Reflection_getCallerClass; + Java_sun_reflect_Reflection_getCallerClass0; Java_sun_reflect_Reflection_getClassAccessFlags; Java_sun_misc_Version_getJdkVersionInfo; Java_sun_misc_Version_getJdkSpecialVersion; diff -r c13072c37f69 -r fade57de534f make/sun/cmm/lcms/FILES_c_unix.gmk --- a/make/sun/cmm/lcms/FILES_c_unix.gmk Tue Jun 18 08:07:48 2013 -0500 +++ b/make/sun/cmm/lcms/FILES_c_unix.gmk Thu Jun 27 05:35:44 2013 +0100 @@ -32,6 +32,7 @@ cmserr.c \ cmsgamma.c \ cmsgmt.c \ + cmshalf.c \ cmsintrp.c \ cmsio0.c \ cmsio1.c \ diff -r c13072c37f69 -r fade57de534f make/sun/cmm/lcms/FILES_c_windows.gmk --- a/make/sun/cmm/lcms/FILES_c_windows.gmk Tue Jun 18 08:07:48 2013 -0500 +++ b/make/sun/cmm/lcms/FILES_c_windows.gmk Thu Jun 27 05:35:44 2013 +0100 @@ -30,6 +30,7 @@ cmserr.c \ cmsgamma.c \ cmsgmt.c \ + cmshalf.c \ cmsintrp.c \ cmsio0.c \ cmsio1.c \ diff -r c13072c37f69 -r fade57de534f make/sun/javazic/tzdata/VERSION --- a/make/sun/javazic/tzdata/VERSION Tue Jun 18 08:07:48 2013 -0500 +++ b/make/sun/javazic/tzdata/VERSION Thu Jun 27 05:35:44 2013 +0100 @@ -21,4 +21,4 @@ # or visit www.oracle.com if you need additional information or have any # questions. # -tzdata2012c +tzdata2013b diff -r c13072c37f69 -r fade57de534f make/sun/javazic/tzdata/africa --- a/make/sun/javazic/tzdata/africa Tue Jun 18 08:07:48 2013 -0500 +++ b/make/sun/javazic/tzdata/africa Thu Jun 27 05:35:44 2013 +0100 @@ -22,15 +22,14 @@ # questions. # #
-# @(#)africa	8.35
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
-# tz at elsie.nci.nih.gov for general use in the future).
+# tz at iana.org for general use in the future).
 
-# From Paul Eggert (2006-03-22):
+# From Paul Eggert (2013-02-21):
 #
 # A good source for time zone historical data outside the U.S. is
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
@@ -49,6 +48,10 @@
 # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
 # I found in the UCLA library.
 #
+# For data circa 1899, a common source is:
+# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+# .
+#
 # A reliable and entertaining source about time zones is
 # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
 #
@@ -140,8 +143,12 @@
 			1:00	-	WAT
 
 # Botswana
+# From Paul Eggert (2013-02-21):
+# Milne says they were regulated by the Cape Town Signal in 1899;
+# assume they switched to 2:00 when Cape Town did.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Gaborone	1:43:40 -	LMT	1885
+			1:30	-	SAST	1903 Mar
 			2:00	-	CAT	1943 Sep 19 2:00
 			2:00	1:00	CAST	1944 Mar 19 2:00
 			2:00	-	CAT
@@ -213,6 +220,11 @@
 
 # Egypt
 
+# Milne says Cairo used 2:05:08.9, the local mean time of the Abbasizeh
+# observatory; round to nearest.  Milne also says that the official time for
+# Egypt was mean noon at the Great Pyramid, 2:04:30.5, but apparently this
+# did not apply to Cairo, Alexandria, or Port Said.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Egypt	1940	only	-	Jul	15	0:00	1:00	S
 Rule	Egypt	1940	only	-	Oct	 1	0:00	0	-
@@ -261,7 +273,7 @@
 # I received a mail from an airline which says that the daylight
 # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
 # From Jesper Norgaard Welen (2007-08-15): [The following agree:]
-# http://www.nentjes.info/Bill/bill5.htm 
+# http://www.nentjes.info/Bill/bill5.htm
 # http://www.timeanddate.com/worldclock/city.html?n=53
 # From Steffen Thorsen (2007-09-04): The official information...:
 # http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm
@@ -315,18 +327,18 @@
 # in September.
 
 # From Steffen Thorsen (2009-08-11):
-# We have been able to confirm the August change with the Egyptian Cabinet 
+# We have been able to confirm the August change with the Egyptian Cabinet
 # Information and Decision Support Center:
 # 
 # http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
 # 
-# 
+#
 # The Middle East News Agency
 # 
 # http://www.mena.org.eg/index.aspx
 # 
 # also reports "Egypt starts winter time on August 21"
-# today in article numbered "71, 11/08/2009 12:25 GMT." 
+# today in article numbered "71, 11/08/2009 12:25 GMT."
 # Only the title above is available without a subscription to their service,
 # and can be found by searching for "winter" in their search engine
 # (at least today).
@@ -353,7 +365,7 @@
 Rule	Egypt	2010	only	-	Sep	lastThu	23:00s	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Cairo	2:05:00 -	LMT	1900 Oct
+Zone	Africa/Cairo	2:05:09 -	LMT	1900 Oct
 			2:00	Egypt	EE%sT
 
 # Equatorial Guinea
@@ -448,6 +460,20 @@
 
 # Libya
 
+# From Even Scharning (2012-11-10):
+# Libya set their time one hour back at 02:00 on Saturday November 10.
+# http://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/
+# Here is an official source [in Arabic]: http://ls.ly/fb6Yc
+#
+# Steffen Thorsen forwarded a translation (2012-11-10) in
+# http://mm.icann.org/pipermail/tz/2012-November/018451.html
+#
+# From Tim Parenti (2012-11-11):
+# Treat the 2012-11-10 change as a zone change from UTC+2 to UTC+1.
+# The DST rules planned for 2013 and onward roughly mirror those of Europe
+# (either two days before them or five days after them, so as to fall on
+# lastFri instead of lastSun).
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Libya	1951	only	-	Oct	14	2:00	1:00	S
 Rule	Libya	1952	only	-	Jan	 1	0:00	0	-
@@ -462,17 +488,21 @@
 Rule	Libya	1986	only	-	Oct	 3	0:00	0	-
 Rule	Libya	1987	1989	-	Apr	 1	0:00	1:00	S
 Rule	Libya	1987	1989	-	Oct	 1	0:00	0	-
+Rule	Libya	1997	only	-	Apr	 4	0:00	1:00	S
+Rule	Libya	1997	only	-	Oct	 4	0:00	0	-
+Rule	Libya	2013	max	-	Mar	lastFri	1:00	1:00	S
+Rule	Libya	2013	max	-	Oct	lastFri	2:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Tripoli	0:52:44 -	LMT	1920
 			1:00	Libya	CE%sT	1959
 			2:00	-	EET	1982
 			1:00	Libya	CE%sT	1990 May  4
-# The following entries are from Shanks & Pottenger;
+# The 1996 and 1997 entries are from Shanks & Pottenger;
 # the IATA SSIM data contain some obvious errors.
 			2:00	-	EET	1996 Sep 30
-			1:00	-	CET	1997 Apr  4
-			1:00	1:00	CEST	1997 Oct  4
-			2:00	-	EET
+			1:00	Libya	CE%sT	1997 Oct  4
+			2:00	-	EET	2012 Nov 10 2:00
+			1:00	Libya	CE%sT
 
 # Madagascar
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -505,7 +535,7 @@
 # From Steffen Thorsen (2008-06-25):
 # Mauritius plans to observe DST from 2008-11-01 to 2009-03-31 on a trial
 # basis....
-# It seems that Mauritius observed daylight saving time from 1982-10-10 to 
+# It seems that Mauritius observed daylight saving time from 1982-10-10 to
 # 1983-03-20 as well, but that was not successful....
 # http://www.timeanddate.com/news/time/mauritius-daylight-saving-time.html
 
@@ -529,12 +559,12 @@
 # than previously announced (2008-11-01 to 2009-03-31).  The new start
 # date is 2008-10-26 at 02:00 and the new end date is 2009-03-27 (no time
 # given, but it is probably at either 2 or 3 wall clock time).
-# 
-# A little strange though, since the article says that they moved the date 
-# to align itself with Europe and USA which also change time on that date, 
-# but that means they have not paid attention to what happened in 
-# USA/Canada last year (DST ends first Sunday in November). I also wonder 
-# why that they end on a Friday, instead of aligning with Europe which 
+#
+# A little strange though, since the article says that they moved the date
+# to align itself with Europe and USA which also change time on that date,
+# but that means they have not paid attention to what happened in
+# USA/Canada last year (DST ends first Sunday in November). I also wonder
+# why that they end on a Friday, instead of aligning with Europe which
 # changes two days later.
 
 # From Alex Krivenyshev (2008-07-11):
@@ -593,7 +623,7 @@
 # 
 
 # From Arthur David Olson (2009-07-11):
-# The "mauritius-dst-will-not-repeat" wrapup includes this: 
+# The "mauritius-dst-will-not-repeat" wrapup includes this:
 # "The trial ended on March 29, 2009, when the clocks moved back by one hour
 # at 2am (or 02:00) local time..."
 
@@ -687,8 +717,8 @@
 # XXX--guess that it is only Morocco for now; guess only 2008 for now.
 
 # From Steffen Thorsen (2008-08-27):
-# Morocco will change the clocks back on the midnight between August 31 
-# and September 1. They originally planned to observe DST to near the end 
+# Morocco will change the clocks back on the midnight between August 31
+# and September 1. They originally planned to observe DST to near the end
 # of September:
 #
 # One article about it (in French):
@@ -822,6 +852,58 @@
 # "...à partir du dernier dimance d'avril et non fins mars,
 # comme annoncé précédemment."
 
+# From Milamber Space Network (2012-07-17):
+# The official return to GMT is announced by the Moroccan government:
+# 
+# http://www.mmsp.gov.ma/fr/actualites.aspx?id=288 [in French]
+# 
+#
+# Google translation, lightly edited:
+# Back to the standard time of the Kingdom (GMT)
+# Pursuant to Decree No. 2-12-126 issued on 26 Jumada (I) 1433 (April 18,
+# 2012) and in accordance with the order of Mr. President of the
+# Government No. 3-47-12 issued on 24 Sha'ban (11 July 2012), the Ministry
+# of Public Service and Administration Modernization announces the return
+# of the legal time of the Kingdom (GMT) from Friday, July 20, 2012 until
+# Monday, August 20, 2012.  So the time will be delayed by 60 minutes from
+# 3:00 am Friday, July 20, 2012 and will again be advanced by 60 minutes
+# August 20, 2012 from 2:00 am.
+
+# From Paul Eggert (2013-03-06):
+# Morocco's daylight-saving transitions due to Ramadan seem to be
+# announced a bit in advance.  On 2012-07-11 the Moroccan government
+# announced that year's Ramadan daylight-saving transitions would be
+# 2012-07-20 and 2012-08-20; see
+# .
+#
+# To estimate what the Moroccan government will do in future years,
+# transition dates for 2013 through 2021 were determined by running
+# the following program under GNU Emacs 24.3:
+#
+# (let ((islamic-year 1434))
+#   (while (< islamic-year 1444)
+#     (let ((a
+#	     (calendar-gregorian-from-absolute
+#	      (calendar-islamic-to-absolute (list 9 1 islamic-year))))
+#	    (b
+#	     (calendar-gregorian-from-absolute
+#	      (calendar-islamic-to-absolute (list 10 1 islamic-year)))))
+#	(insert
+#	 (format
+#	  (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 3:00\t0\t-\n"
+#		  "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 2:00\t1:00\tS\n")
+#	  (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
+#	  (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
+#     (setq islamic-year (+ 1 islamic-year))))
+#
+# with the results hand-edited for 2020-2022, when the normal spring-forward
+# date falls during the estimated Ramadan.
+#
+# From 2023 through 2038 Ramadan is not predicted to overlap with
+# daylight saving time.  Starting in 2039 there will be overlap again,
+# but 32-bit time_t values roll around in 2038 so for now do not worry
+# about dates after 2038.
+
 # RULE	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 
 Rule	Morocco	1939	only	-	Sep	12	 0:00	1:00	S
@@ -847,8 +929,28 @@
 Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
 Rule	Morocco	2011	only	-	Apr	 3	 0:00	1:00	S
 Rule	Morocco	2011	only	-	Jul	 31	 0	0	-
-Rule	Morocco	2012	max	-	Apr	 lastSun 2:00	1:00	S
+Rule	Morocco	2012	2019	-	Apr	 lastSun 2:00	1:00	S
 Rule	Morocco	2012	max	-	Sep	 lastSun 3:00	0	-
+Rule	Morocco	2012	only	-	Jul	 20	 3:00	0	-
+Rule	Morocco	2012	only	-	Aug	 20	 2:00	1:00	S
+Rule	Morocco	2013	only	-	Jul	  9	 3:00	0	-
+Rule	Morocco	2013	only	-	Aug	  8	 2:00	1:00	S
+Rule	Morocco	2014	only	-	Jun	 29	 3:00	0	-
+Rule	Morocco	2014	only	-	Jul	 29	 2:00	1:00	S
+Rule	Morocco	2015	only	-	Jun	 18	 3:00	0	-
+Rule	Morocco	2015	only	-	Jul	 18	 2:00	1:00	S
+Rule	Morocco	2016	only	-	Jun	  7	 3:00	0	-
+Rule	Morocco	2016	only	-	Jul	  7	 2:00	1:00	S
+Rule	Morocco	2017	only	-	May	 27	 3:00	0	-
+Rule	Morocco	2017	only	-	Jun	 26	 2:00	1:00	S
+Rule	Morocco	2018	only	-	May	 16	 3:00	0	-
+Rule	Morocco	2018	only	-	Jun	 15	 2:00	1:00	S
+Rule	Morocco	2019	only	-	May	  6	 3:00	0	-
+Rule	Morocco	2019	only	-	Jun	  5	 2:00	1:00	S
+Rule	Morocco	2020	only	-	May	 24	 2:00	1:00	S
+Rule	Morocco	2021	only	-	May	 13	 2:00	1:00	S
+Rule	Morocco	2022	only	-	May	  3	 2:00	1:00	S
+Rule	Morocco	2023	max	-	Apr	 lastSun 2:00	1:00	S
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
@@ -877,7 +979,7 @@
 # Forecasting Riaan van Zyl explained that the far eastern parts of
 # the country are close to 40 minutes earlier in sunrise than the rest
 # of the country.
-# 
+#
 # From Paul Eggert (2007-03-31):
 # Apparently the Caprivi Strip informally observes Botswana time, but
 # we have no details.  In the meantime people there can use Africa/Gaborone.
diff -r c13072c37f69 -r fade57de534f make/sun/javazic/tzdata/antarctica
--- a/make/sun/javazic/tzdata/antarctica	Tue Jun 18 08:07:48 2013 -0500
+++ b/make/sun/javazic/tzdata/antarctica	Thu Jun 27 05:35:44 2013 +0100
@@ -22,7 +22,6 @@
 # questions.
 #
 # 
-# @(#)antarctica	8.10
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -74,10 +73,8 @@
 Rule	ChileAQ	2010	only	-	Apr	Sun>=1	3:00u	0	-
 Rule	ChileAQ	2011	only	-	May	Sun>=2	3:00u	0	-
 Rule	ChileAQ	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
-Rule	ChileAQ	2012	only	-	Apr	Sun>=23	3:00u	0	-
-Rule	ChileAQ	2012	only	-	Sep	Sun>=2	4:00u	1:00	S
-Rule	ChileAQ	2013	max	-	Mar	Sun>=9	3:00u	0	-
-Rule	ChileAQ	2013	max	-	Oct	Sun>=9	4:00u	1:00	S
+Rule	ChileAQ	2012	max	-	Apr	Sun>=23	3:00u	0	-
+Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u	1:00	S
 
 # These rules are stolen from the `australasia' file.
 Rule	AusAQ	1917	only	-	Jan	 1	0:01	1:00	-
diff -r c13072c37f69 -r fade57de534f make/sun/javazic/tzdata/asia
--- a/make/sun/javazic/tzdata/asia	Tue Jun 18 08:07:48 2013 -0500
+++ b/make/sun/javazic/tzdata/asia	Thu Jun 27 05:35:44 2013 +0100
@@ -22,15 +22,14 @@
 # questions.
 #
 # 
-# @(#)asia	8.73
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
-# tz at elsie.nci.nih.gov for general use in the future).
+# tz at iana.org for general use in the future).
 
-# From Paul Eggert (2006-03-22):
+# From Paul Eggert (2013-02-21):
 #
 # A good source for time zone historical data outside the U.S. is
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
@@ -49,6 +48,10 @@
 # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
 # I found in the UCLA library.
 #
+# For data circa 1899, a common source is:
+# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+# .
+#
 # A reliable and entertaining source about time zones is
 # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
 #
@@ -125,7 +128,7 @@
 # From Alexander Krivenyshev (2012-02-10):


From jvanek at icedtea.classpath.org  Thu Jun 27 00:55:39 2013
From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org)
Date: Thu, 27 Jun 2013 07:55:39 +0000
Subject: /hg/icedtea-web: Fixed autogen permissions back to 775
Message-ID: 

changeset 244ea962a635 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=244ea962a635
author: Jiri Vanek 
date: Thu Jun 27 09:55:18 2013 +0200

	Fixed autogen permissions back to 775



From ptisnovs at icedtea.classpath.org  Thu Jun 27 06:09:29 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Thu, 27 Jun 2013 13:09:29 +0000
Subject: /hg/gfx-test: New tests added into BitBltCropImage.
Message-ID: 

changeset ac3310860be8 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=ac3310860be8
author: Pavel Tisnovsky 
date: Thu Jun 27 15:13:01 2013 +0200

	New tests added into BitBltCropImage.


diffstat:

 ChangeLog                                       |    5 +
 src/org/gfxtest/testsuites/BitBltCropImage.java |  942 +++++++++++++----------
 2 files changed, 534 insertions(+), 413 deletions(-)

diffs (truncated from 1035 to 500 lines):

diff -r 6d51956c1adb -r ac3310860be8 ChangeLog
--- a/ChangeLog	Wed Jun 26 10:48:01 2013 +0200
+++ b/ChangeLog	Thu Jun 27 15:13:01 2013 +0200
@@ -1,3 +1,8 @@
+2013-06-27  Pavel Tisnovsky  
+
+	* src/org/gfxtest/testsuites/BitBltCropImage.java:
+	New tests added into BitBltCropImage.
+
 2013-06-26  Pavel Tisnovsky  
 
 	* src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java:
diff -r 6d51956c1adb -r ac3310860be8 src/org/gfxtest/testsuites/BitBltCropImage.java
--- a/src/org/gfxtest/testsuites/BitBltCropImage.java	Wed Jun 26 10:48:01 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltCropImage.java	Thu Jun 27 15:13:01 2013 +0200
@@ -316,405 +316,6 @@
 
     /**
      * Test basic BitBlt operation for checker buffered image with type
-     * TYPE_BYTE_BINARY. No crop is performed to that image.
-     * 
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltCheckerBufferedImageTypeByteBinaryNoCrop(TestImage image, Graphics2D graphics2d)
-    {
-        // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY);
-    }
-
-    /**
-     * Test basic BitBlt operation for checker buffered image with type
-     * TYPE_BYTE_BINARY. Image is cropped so only north-west quarter of it is rendered.
-     * 
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltCheckerBufferedImageTypeByteBinaryCropNW(TestImage image, Graphics2D graphics2d)
-    {
-        // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY,
-                        BitmapCropRegions.CROP_REGION_NW);
-    }
-
-    /**
-     * Test basic BitBlt operation for checker buffered image with type
-     * TYPE_BYTE_BINARY. Image is cropped so only north-east quarter of it is rendered.
-     * 
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltCheckerBufferedImageTypeByteBinaryCropNE(TestImage image, Graphics2D graphics2d)
-    {
-        // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY,
-                        BitmapCropRegions.CROP_REGION_NE);
-    }
-
-    /**
-     * Test basic BitBlt operation for checker buffered image with type
-     * TYPE_BYTE_BINARY. Image is cropped so only south-west quarter of it is rendered.
-     * 
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltCheckerBufferedImageTypeByteBinaryCropSW(TestImage image, Graphics2D graphics2d)
-    {
-        // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY,
-                        BitmapCropRegions.CROP_REGION_SW);
-    }
-
-    /**
-     * Test basic BitBlt operation for checker buffered image with type
-     * TYPE_BYTE_BINARY. Image is cropped so only south-east quarter of it is rendered.
-     * 
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltCheckerBufferedImageTypeByteBinaryCropSE(TestImage image, Graphics2D graphics2d)
-    {
-        // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY,
-                        BitmapCropRegions.CROP_REGION_SE);
-    }
-
-    /**
-     * Test basic BitBlt operation for checker buffered image with type TYPE_INT_RGB.
-     * No crop is performed to that image.
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltCheckerBufferedImageTypeIntRGBNoCrop(TestImage image, Graphics2D graphics2d)
-    {
-        // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_INT_RGB);
-    }
-
-    /**
-     * Test basic BitBlt operation for checker buffered image with type
-     * TYPE_INT_RGB. Image is cropped so only north-west quarter of it is rendered.
-     * 
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltCheckerBufferedImageTypeIntRGBCropNW(TestImage image, Graphics2D graphics2d)
-    {
-        // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_INT_RGB,
-                        BitmapCropRegions.CROP_REGION_NW);
-    }
-
-    /**
-     * Test basic BitBlt operation for checker buffered image with type
-     * TYPE_INT_RGB. Image is cropped so only north-east quarter of it is rendered.
-     * 
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltCheckerBufferedImageTypeIntRGBCropNE(TestImage image, Graphics2D graphics2d)
-    {
-        // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_INT_RGB,
-                        BitmapCropRegions.CROP_REGION_NE);
-    }
-
-    /**
-     * Test basic BitBlt operation for checker buffered image with type
-     * TYPE_INT_RGB. Image is cropped so only south-west quarter of it is rendered.
-     * 
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltCheckerBufferedImageTypeIntRGBCropSW(TestImage image, Graphics2D graphics2d)
-    {
-        // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_INT_RGB,
-                        BitmapCropRegions.CROP_REGION_SW);
-    }
-
-    /**
-     * Test basic BitBlt operation for checker buffered image with type
-     * TYPE_INT_RGB. Image is cropped so only south-east quarter of it is rendered.
-     * 
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltCheckerBufferedImageTypeIntRGBCropSE(TestImage image, Graphics2D graphics2d)
-    {
-        // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_INT_RGB,
-                        BitmapCropRegions.CROP_REGION_SE);
-    }
-
-    /**
-     * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR.
-     * No crop is performed to that image.
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltCheckerBufferedImageType3ByteBGRNoCrop(TestImage image, Graphics2D graphics2d)
-    {
-        // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR);
-    }
-
-    /**
-     * Test basic BitBlt operation for checker buffered image with type
-     * TYPE_3BYTE_BGR. Image is cropped so only north-west quarter of it is rendered.
-     * 
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltCheckerBufferedImageType3ByteBGRCropNW(TestImage image, Graphics2D graphics2d)
-    {
-        // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR,
-                        BitmapCropRegions.CROP_REGION_NW);
-    }
-
-    /**
-     * Test basic BitBlt operation for checker buffered image with type
-     * TYPE_3BYTE_BGR. Image is cropped so only north-east quarter of it is rendered.
-     * 
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltCheckerBufferedImageType3ByteBGRCropNE(TestImage image, Graphics2D graphics2d)
-    {
-        // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR,
-                        BitmapCropRegions.CROP_REGION_NE);
-    }
-
-    /**
-     * Test basic BitBlt operation for checker buffered image with type
-     * TYPE_3BYTE_BGR. Image is cropped so only south-west quarter of it is rendered.
-     * 
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltCheckerBufferedImageType3ByteBGRCropSW(TestImage image, Graphics2D graphics2d)
-    {
-        // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR,
-                        BitmapCropRegions.CROP_REGION_SW);
-    }
-
-    /**
-     * Test basic BitBlt operation for checker buffered image with type
-     * TYPE_3BYTE_BGR. Image is cropped so only south-east quarter of it is rendered.
-     * 
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltCheckerBufferedImageType3ByteBGRCropSE(TestImage image, Graphics2D graphics2d)
-    {
-        // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR,
-                        BitmapCropRegions.CROP_REGION_SE);
-    }
-
-    /**
-     * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR.
-     * No crop is performed to that image.
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltCheckerBufferedImageType4ByteABGRNoCrop(TestImage image, Graphics2D graphics2d)
-    {
-        // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR);
-    }
-
-    /**
-     * Test basic BitBlt operation for checker buffered image with type
-     * TYPE_4BYTE_ABGR. Image is cropped so only north-west quarter of it is rendered.
-     * 
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltCheckerBufferedImageType4ByteABGRCropNW(TestImage image, Graphics2D graphics2d)
-    {
-        // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR,
-                        BitmapCropRegions.CROP_REGION_NW);
-    }
-
-    /**
-     * Test basic BitBlt operation for checker buffered image with type
-     * TYPE_4BYTE_ABGR. Image is cropped so only north-east quarter of it is rendered.
-     * 
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltCheckerBufferedImageType4ByteABGRCropNE(TestImage image, Graphics2D graphics2d)
-    {
-        // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR,
-                        BitmapCropRegions.CROP_REGION_NE);
-    }
-
-    /**
-     * Test basic BitBlt operation for checker buffered image with type
-     * TYPE_4BYTE_ABGR. Image is cropped so only south-west quarter of it is rendered.
-     * 
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltCheckerBufferedImageType4ByteABGRCropSW(TestImage image, Graphics2D graphics2d)
-    {
-        // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR,
-                        BitmapCropRegions.CROP_REGION_SW);
-    }
-
-    /**
-     * Test basic BitBlt operation for checker buffered image with type
-     * TYPE_4BYTE_ABGR. Image is cropped so only south-east quarter of it is rendered.
-     * 
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltCheckerBufferedImageType4ByteABGRCropSE(TestImage image, Graphics2D graphics2d)
-    {
-        // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR,
-                        BitmapCropRegions.CROP_REGION_SE);
-    }
-
-    /**
-     * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR_PRE.
-     * No crop is performed to that image.
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltCheckerBufferedImageType4ByteABGR_preNoCrop(TestImage image, Graphics2D graphics2d)
-    {
-        // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE);
-    }
-
-    /**
-     * Test basic BitBlt operation for checker buffered image with type
-     * TYPE_4BYTE_ABGR_PRE. Image is cropped so only north-west quarter of it is rendered.
-     * 
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltCheckerBufferedImageType4ByteABGR_preCropNW(TestImage image, Graphics2D graphics2d)
-    {
-        // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE,
-                        BitmapCropRegions.CROP_REGION_NW);
-    }
-
-    /**
-     * Test basic BitBlt operation for checker buffered image with type
-     * TYPE_4BYTE_ABGR_PRE. Image is cropped so only north-east quarter of it is rendered.
-     * 
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltCheckerBufferedImageType4ByteABGR_preCropNE(TestImage image, Graphics2D graphics2d)
-    {
-        // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE,
-                        BitmapCropRegions.CROP_REGION_NE);
-    }
-
-    /**
-     * Test basic BitBlt operation for checker buffered image with type
-     * TYPE_4BYTE_ABGR_PRE. Image is cropped so only south-west quarter of it is rendered.
-     * 
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltCheckerBufferedImageType4ByteABGR_preCropSW(TestImage image, Graphics2D graphics2d)
-    {
-        // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE,
-                        BitmapCropRegions.CROP_REGION_SW);
-    }
-
-    /**
-     * Test basic BitBlt operation for checker buffered image with type
      * TYPE_4BYTE_ABGR_PRE. Image is cropped so only south-east quarter of it is rendered.
      * 
      * @param image
@@ -732,7 +333,7 @@
 
     /**
      * Test basic BitBlt operation for checker buffered image with type
-     * TYPE_BYTE_GRAY. No crop is performed to that image.
+     * TYPE_BYTE_BINARY. No crop is performed to that image.
      * 
      * @param image
      *            image used as a destination for BitBlt-type operations
@@ -740,15 +341,15 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltCheckerBufferedImageTypeByteGrayNoCrop(TestImage image, Graphics2D graphics2d)
+    public TestResult testBitBltCheckerBufferedImageTypeByteBinaryNoCrop(TestImage image, Graphics2D graphics2d)
     {
         // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY);
+        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY);
     }
 
     /**
      * Test basic BitBlt operation for checker buffered image with type
-     * TYPE_BYTE_GRAY. Image is cropped so only north-west quarter of it is rendered.
+     * TYPE_BYTE_BINARY. Image is cropped so only north-west quarter of it is rendered.
      * 
      * @param image
      *            image used as a destination for BitBlt-type operations
@@ -756,7 +357,439 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltCheckerBufferedImageTypeByteGrayCropNW(TestImage image, Graphics2D graphics2d)
+    public TestResult testBitBltCheckerBufferedImageTypeByteBinaryCropNW(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform BitBlt test using crop operation.
+        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY,
+                        BitmapCropRegions.CROP_REGION_NW);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type
+     * TYPE_BYTE_BINARY. Image is cropped so only north-east quarter of it is rendered.
+     * 
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteBinaryCropNE(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform BitBlt test using crop operation.
+        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY,
+                        BitmapCropRegions.CROP_REGION_NE);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type
+     * TYPE_BYTE_BINARY. Image is cropped so only south-west quarter of it is rendered.
+     * 
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteBinaryCropSW(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform BitBlt test using crop operation.
+        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY,
+                        BitmapCropRegions.CROP_REGION_SW);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type
+     * TYPE_BYTE_BINARY. Image is cropped so only south-east quarter of it is rendered.
+     * 
+     * @param image


From ptisnovs at icedtea.classpath.org  Thu Jun 27 06:58:18 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Thu, 27 Jun 2013 13:58:18 +0000
Subject: /hg/rhino-tests: Added two new tests getGenericSuperclass() and ...
Message-ID: 

changeset a859b2ca8a2a in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=a859b2ca8a2a
author: Pavel Tisnovsky 
date: Thu Jun 27 16:01:50 2013 +0200

	Added two new tests getGenericSuperclass() and getGenericInterfaces()
	into AbstractScriptEngineClassTest.


diffstat:

 ChangeLog                                             |   6 +
 src/org/RhinoTests/AbstractScriptEngineClassTest.java |  64 +++++++++++++++++++
 2 files changed, 70 insertions(+), 0 deletions(-)

diffs (121 lines):

diff -r 75e3e48ef286 -r a859b2ca8a2a ChangeLog
--- a/ChangeLog	Wed Jun 26 10:59:13 2013 +0200
+++ b/ChangeLog	Thu Jun 27 16:01:50 2013 +0200
@@ -1,3 +1,9 @@
+2013-06-27  Pavel Tisnovsky  
+
+	* src/org/RhinoTests/AbstractScriptEngineClassTest.java:
+	Added two new tests getGenericSuperclass() and getGenericInterfaces()
+	into AbstractScriptEngineClassTest.
+
 2013-06-26  Pavel Tisnovsky  
 
 	* src/org/RhinoTests/ScriptExceptionClassTest.java:
diff -r 75e3e48ef286 -r a859b2ca8a2a src/org/RhinoTests/AbstractScriptEngineClassTest.java
--- a/src/org/RhinoTests/AbstractScriptEngineClassTest.java	Wed Jun 26 10:59:13 2013 +0200
+++ b/src/org/RhinoTests/AbstractScriptEngineClassTest.java	Thu Jun 27 16:01:50 2013 +0200
@@ -52,6 +52,8 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
 
 import javax.script.AbstractScriptEngine;
 import javax.script.ScriptEngineManager;import javax.script.ScriptEngine;
@@ -285,6 +287,7 @@
      */
     protected void testGetConstructors() {
         // map of constructors which should exists
+        @SuppressWarnings("unused")
         Map testedConstructors = null;
         Map testedConstructors_jdk6 = new HashMap();
         Map testedConstructors_jdk7 = new HashMap();
@@ -332,6 +335,7 @@
      */
     protected void testGetDeclaredConstructors() {
         // map of constructors which should exists
+        @SuppressWarnings("unused")
         Map testedConstructors = null;
         Map testedConstructors_jdk6 = new HashMap();
         Map testedConstructors_jdk7 = new HashMap();
@@ -1063,12 +1067,15 @@
     protected void testGetAnnotations() {
         // following annotations should be provided
         final String[] annotationsThatShouldExists_jdk6 = {
+            // this should be really empty
         };
 
         final String[] annotationsThatShouldExists_jdk7 = {
+            // this should be really empty
         };
 
         final String[] annotationsThatShouldExists_jdk8 = {
+            // this should be really empty
         };
 
         // get all annotations
@@ -1223,6 +1230,63 @@
     }
 
     /**
+     * Test for method javax.script.AbstractScriptEngine.getClass().getGenericSuperclass()
+     */
+    protected void testGetGenericSuperclass() {
+        Type genericSuperclass = this.abstractScriptEngineClass.getGenericSuperclass();
+        assertNotNull(genericSuperclass, "getGenericSuperclass() does not return null");
+    }
+
+    /**
+     * Test for method javax.script.AbstractScriptEngine.getClass().getGenericInterfaces()
+     */
+    protected void testGetGenericInterfaces() {
+        // array of interface names that should exists
+        final String[] genericInterfaceNames_jdk6 = {
+            "interface javax.script.ScriptEngine",
+        };
+
+        final String[] genericInterfaceNames_jdk7 = {
+            "interface javax.script.ScriptEngine",
+        };
+
+        final String[] genericInterfaceNames_jdk8 = {
+            "interface javax.script.ScriptEngine",
+        };
+
+        // get the right array of field signatures
+        String[] genericInterfaceNames = null;
+        switch (getJavaVersion()) {
+            case 6:
+                genericInterfaceNames = genericInterfaceNames_jdk6;
+                break;
+            case 7:
+                genericInterfaceNames = genericInterfaceNames_jdk7;
+                break;
+            case 8:
+                genericInterfaceNames = genericInterfaceNames_jdk8;
+                break;
+        }
+
+        // get all generic interfaces
+        Type[] genericInterfaces = this.abstractScriptEngineClass.getGenericInterfaces();
+        assertNotNull(genericInterfaces, "getGenericInterfaces() returns null");
+        assertEquals(1, genericInterfaces.length, "array of wrong size returned by getGenericInterfaces " + genericInterfaces.length);
+
+        // and transform the array into a list of field names
+        List interfacesAsString = new ArrayList();
+        for (Type genericInterface : genericInterfaces) {
+            interfacesAsString.add(genericInterface.toString());
+        }
+
+        // check if all required interfaces really exists
+        for (String interfaceThatShouldExists : genericInterfaceNames) {
+            assertTrue(interfacesAsString.contains(interfaceThatShouldExists),
+                    "interface " + interfaceThatShouldExists + " not found");
+        }
+    }
+
+    /**
      * Test for instanceof operator applied to a class javax.script.AbstractScriptEngine
      */
     @SuppressWarnings("cast")


From andrew at icedtea.classpath.org  Thu Jun 27 18:49:24 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Fri, 28 Jun 2013 01:49:24 +0000
Subject: /hg/release/icedtea7-2.2: 3 new changesets
Message-ID: 

changeset 04d2a30a17cf in /hg/release/icedtea7-2.2
details: http://icedtea.classpath.org/hg/release/icedtea7-2.2?cmd=changeset;node=04d2a30a17cf
author: Andrew John Hughes 
date: Fri Jun 28 02:33:43 2013 +0100

	Include latest security patches.

	2013-06-27  Andrew John Hughes  

		* Makefile.am,
		(HOTSPOT_CHANGESET): Update to IcedTea7 2.2.9 tag,
		bringing in latest security patches.
		(CORBA_CHANGESET): Likewise.
		(JAXP_CHANGESET): Likewise.
		(JAXWS_CHANGESET): Likewise.
		(JDK_CHANGESET): Likewise.
		(LANGTOOLS_CHANGESET): Likewise.
		(OPENJDK_CHANGESET): Likewise.
		(HOTSPOT_SHA256SUM): Likewise.
		(CORBA_SHA256SUM): Likewise.
		(JAXP_SHA256SUM): Likewise.
		(JAXWS_SHA256SUM): Likewise.
		(JDK_SHA256SUM): Likewise.
		(LANGTOOLS_SHA256SUM): Likewise.
		(OPENJDK_SHA256SUM): Likewise.
		* patches/boot/ecj-diamond.patch,
		* patches/boot/ecj-multicatch.patch:
		Add new cases.
		* patches/boot/ecj-stringswitch.patch:
		Update MethodHandleNatives patch, including
		adding new case.
		* patches/boot/tobin.patch:
		Update following move from sun.awt.X11
		to sun.awt.


changeset ad1e410826c5 in /hg/release/icedtea7-2.2
details: http://icedtea.classpath.org/hg/release/icedtea7-2.2?cmd=changeset;node=ad1e410826c5
author: Andrew John Hughes 
date: Fri Jun 28 02:45:55 2013 +0100

	Update NEWS with security fixes & updates from 7u25.

	2013-06-27  Andrew John Hughes  

		* NEWS: Add latest security fixes and other
		changes found in 7u25.


changeset c8f337eac826 in /hg/release/icedtea7-2.2
details: http://icedtea.classpath.org/hg/release/icedtea7-2.2?cmd=changeset;node=c8f337eac826
author: Andrew John Hughes 
date: Fri Jun 28 02:49:03 2013 +0100

	Add Red Hat bugzilla references.

	2013-06-25  Andrew John Hughes  

		* NEWS: Add Red Hat bugzilla references.


diffstat:

 ChangeLog                           |   37 ++++++
 Makefile.am                         |   28 ++--
 NEWS                                |  126 +++++++++++++++++++++
 patches/boot/ecj-diamond.patch      |   60 ++++++++++
 patches/boot/ecj-multicatch.patch   |   51 ++++++++
 patches/boot/ecj-stringswitch.patch |  212 ++++++++++++++++++-----------------
 patches/boot/tobin.patch            |   38 +++--
 7 files changed, 421 insertions(+), 131 deletions(-)

diffs (truncated from 698 to 500 lines):

diff -r 2f50c50bc1d0 -r c8f337eac826 ChangeLog
--- a/ChangeLog	Wed May 01 00:04:40 2013 +0100
+++ b/ChangeLog	Fri Jun 28 02:49:03 2013 +0100
@@ -1,3 +1,40 @@
+2013-06-25  Andrew John Hughes  
+
+	* NEWS: Add Red Hat bugzilla references.
+
+2013-06-27  Andrew John Hughes  
+
+	* NEWS: Add latest security fixes and other
+	changes found in 7u25.
+
+2013-06-27  Andrew John Hughes  
+
+	* Makefile.am,
+	(HOTSPOT_CHANGESET): Update to IcedTea7 2.2.9 tag,
+	bringing in latest security patches.
+	(CORBA_CHANGESET): Likewise.
+	(JAXP_CHANGESET): Likewise.
+	(JAXWS_CHANGESET): Likewise.
+	(JDK_CHANGESET): Likewise.
+	(LANGTOOLS_CHANGESET): Likewise.
+	(OPENJDK_CHANGESET): Likewise.
+	(HOTSPOT_SHA256SUM): Likewise.
+	(CORBA_SHA256SUM): Likewise.
+	(JAXP_SHA256SUM): Likewise.
+	(JAXWS_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	(LANGTOOLS_SHA256SUM): Likewise.
+	(OPENJDK_SHA256SUM): Likewise.
+	* patches/boot/ecj-diamond.patch,
+	* patches/boot/ecj-multicatch.patch:
+	Add new cases.
+	* patches/boot/ecj-stringswitch.patch:
+	Update MethodHandleNatives patch, including
+	adding new case.
+	* patches/boot/tobin.patch:
+	Update following move from sun.awt.X11
+	to sun.awt.
+
 2013-05-01  Andrew John Hughes  
 
 	* configure.ac: Bump to 2.2.9pre.
diff -r 2f50c50bc1d0 -r c8f337eac826 Makefile.am
--- a/Makefile.am	Wed May 01 00:04:40 2013 +0100
+++ b/Makefile.am	Fri Jun 28 02:49:03 2013 +0100
@@ -4,21 +4,21 @@
 JDK_UPDATE_VERSION = 05
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
 
-HOTSPOT_CHANGESET = 168d05b42b89
-CORBA_CHANGESET = 529355376925
-JAXP_CHANGESET = 839055d03a54
-JAXWS_CHANGESET = c7ac0744f92f
-JDK_CHANGESET = 1a455d17b871
-LANGTOOLS_CHANGESET = ae5ba074188d
-OPENJDK_CHANGESET = 1a406488fe33
+HOTSPOT_CHANGESET = 89a7d38e2e31
+CORBA_CHANGESET = 4fdf74f61b48
+JAXP_CHANGESET = 5ce90e84aa21
+JAXWS_CHANGESET = 5942fdde2af6
+JDK_CHANGESET = 25f39684638a
+LANGTOOLS_CHANGESET = 1c14c3a8ea14
+OPENJDK_CHANGESET = 0cc24300e6de
 
-HOTSPOT_SHA256SUM = 873651a61cffe2e37f16bf6e6558e2d72fd7a9a50319fd83e3854710ba9eea65
-CORBA_SHA256SUM = b4f0eca0f37b581ace14f24b5aea2db99321e027c4bc2a044b9c796d45804a07
-JAXP_SHA256SUM = cb1007e7c9bdfc1a12d85dbc31adc2fb33ef4f6e0e36efda95ad3ba80556289b
-JAXWS_SHA256SUM = b12a65e8793065da0f4243f2b1029e9e1c6c15611612aeb5d8c45f1e58a91875
-JDK_SHA256SUM = 829ed69c856e7eb344a15f3f3d06166bc6627a6eb5ceec0ccef6ae742ec3d9e6
-LANGTOOLS_SHA256SUM = 8193a0309874143e10e8002d8c5fcf10aefc012af74d8a3bb4416611dfe9fb7f
-OPENJDK_SHA256SUM = 196845c4edcf0d82ed72661b381c83f2d0e6e0d4b8952e002decd3483280388e
+HOTSPOT_SHA256SUM = 895802e8e5d3661ef9ed7f8530a595c899f056faf73b4cfa7d603777ba8f28f0
+CORBA_SHA256SUM = 01da9cb128138afa48f9d17e800f90d1fea54db876551fe10145f4aaac01b0b3
+JAXP_SHA256SUM = 479516db3d57f1cf6ec67c26229fb70f59499a6794b90cbabb4c47d930d13229
+JAXWS_SHA256SUM = 535c443eb71aead164a9e790f368c8424a51190d25027847820a6705bee3ff72
+JDK_SHA256SUM = 858fa92c115de0aa917622d2e173604f53c3c8bd75119622d1711485c695f430
+LANGTOOLS_SHA256SUM = b6b53a5f89c046abd8f38d0b4626611ca688c1de7cbdc2e52790d9aebd7dacf3
+OPENJDK_SHA256SUM = 070c32f4126887949b2363a4379a367d7fc7f1c0ffa4d782f430c3e39a2961e9
 
 CACAO_VERSION = a567bcb7f589
 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
diff -r 2f50c50bc1d0 -r c8f337eac826 NEWS
--- a/NEWS	Wed May 01 00:04:40 2013 +0100
+++ b/NEWS	Fri Jun 28 02:49:03 2013 +0100
@@ -12,6 +12,132 @@
 
 New in release 2.2.9 (2013-06-XX):
 
+* New features
+  - PR1378: Add AArch64 support to Zero
+* Security fixes
+  - S6741606, CVE-2013-2407: Integrate Apache Santuario
+  - S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls
+  - S7170730, CVE-2013-2451: Improve Windows network stack support.
+  - S8000638, CVE-2013-2450: Improve deserialization
+  - S8000642, CVE-2013-2446: Better handling of objects for transportation
+  - S8001032: Restrict object access
+  - S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers
+  - S8001034, CVE-2013-1500: Memory management improvements
+  - S8001038, CVE-2013-2444: Resourcefully handle resources
+  - S8001043: Clarify definition restrictions
+  - S8001308: Update display of applet windows
+  - S8001309: Better handling of annotation interfaces
+  - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost
+  - S8001330, CVE-2013-2443: Improve on checking order
+  - S8003703, CVE-2013-2412: Update RMI connection dialog box
+  - S8004288, CVE-2013-2449: (fs) Files.probeContentType problems
+  - S8004584: Augment applet contextualization
+  - S8005007: Better glyph processing
+  - S8006328, CVE-2013-2448: Improve robustness of sound classes
+  - S8006611: Improve scripting
+  - S8007467: Improve robustness of JMX internal APIs
+  - S8007471: Improve MBean notifications
+  - S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes
+  - S8007925: Improve cmsStageAllocLabV2ToV4curves
+  - S8007926: Improve cmsPipelineDup
+  - S8007927: Improve cmsAllocProfileSequenceDescription
+  - S8007929: Improve CurvesAlloc
+  - S8008120, CVE-2013-2457: Improve JMX class checking
+  - S8008124, CVE-2013-2453: Better compliance testing
+  - S8008128: Better API coherence for JMX
+  - S8008132, CVE-2013-2456: Better serialization support
+  - S8008585: Better JMX data handling
+  - S8008593: Better URLClassLoader resource management
+  - S8008603: Improve provision of JMX providers
+  - S8008607: Better input checking in JMX
+  - S8008611: Better handling of annotations in JMX
+  - S8008615: Improve robustness of JMX internal APIs
+  - S8008623: Better handling of MBeanServers
+  - S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606
+  - S8008982: Adjust JMX for underlying interface changes
+  - S8009004: Better implementation of RMI connections
+  - S8009008: Better manage management-api
+  - S8009013: Better handling of T2K glyphs
+  - S8009034: Improve resulting notifications in JMX
+  - S8009038: Improve JMX notification support
+  - S8009057, CVE-2013-2448: Improve MIDI event handling
+  - S8009067: Improve storing keys in KeyStore
+  - S8009071, CVE-2013-2459: Improve shape handling
+  - S8009235: Improve handling of TSA data
+  - S8009424, CVE-2013-2458: Adapt Nashorn to JSR-292 implementation change
+  - S8009554, CVE-2013-2454: Improve SerialJavaObject.getFields
+  - S8009654: Improve stability of cmsnamed
+  - S8010209, CVE-2013-2460: Better provision of factories
+  - S8011243, CVE-2013-2470: Improve ImagingLib
+  - S8011248, CVE-2013-2471: Better Component Rasters
+  - S8011253, CVE-2013-2472: Better Short Component Rasters
+  - S8011257, CVE-2013-2473: Better Byte Component Rasters
+  - S8012375, CVE-2013-1571: Improve Javadoc framing
+  - S8012421: Better positioning of PairPositioning
+  - S8012438, CVE-2013-2463: Better image validation
+  - S8012597, CVE-2013-2465: Better image channel verification
+  - S8012601, CVE-2013-2469: Better validation of image layouts
+  - S8014281, CVE-2013-2461: Better checking of XML signature
+  - S8015997: Additional improvement in Javadoc framing
+* Bug fixes
+  - S7053526: Upgrade JDK 8 to use Little CMS 2.4
+  - S7124347: [macosx] java.lang.InternalError: not implemented yet on call Graphics2D.drawRenderedImage
+  - S7142091: [macosx] RFE: Refactoring of peer initialization/disposing
+  - S7142596: RMI JPRT tests are failing
+  - S7150345: [macosx] Can't type into applets
+  - S7151434, RH969884: java -jar -XX crashes java launcher
+  - S7156191: [macosx] Can't type into applet demos in Pivot
+  - S7156194: [macosx] Can't type non-ASCII characters into applets
+  - S7171223: Building ExtensionSubtables.cpp should use -fno-strict-aliasing
+  - S7174718: [macosx] Regression in 7u6 b12: PopupFactory leaks DefaultFrames.
+  - S7188114: (launcher) need an alternate command line parser for Windows
+  - S7195301: XML Signature DOM implementation should not use instanceof to determine type of Node
+  - S7198570: (tz) Support tzdata2012f
+  - S7199143: RFE: OCSP revocation checker should provide possibility to specify connection timeout
+  - S8001161: mac: EmbeddedFrame doesn't become active window
+  - S8002070: Remove the stack search for a resource bundle for Logger to use
+  - S8002225: (tz) Support tzdata2012i
+  - S8005932: Java 7 on mac os x only provides text clipboard formats
+  - S8006120: Provide "Server JRE" for 7u train
+  - S8006417: JComboBox.showPopup(), hidePopup() fails in JRE 1.7 on OS X
+  - S8006536: [launcher]  removes trailing slashes on arguments
+  - S8009165: Fix for 8006435 needs revision
+  - S8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03
+  - S8009463: Regression test test\java\lang\Runtime\exec\ArgWithSpaceAndFinalBackslash.java failing.
+  - S8009610: Blacklist certificate used with malware.
+  - S8009987: (tz) Support tzdata2013b
+  - S8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail
+  - S8010009: [macosx] Unable type into online word games on MacOSX
+  - S8010118: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive
+  - S8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build
+  - S8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod
+  - S8010727: WLS fails to add a logger with "" in its own LogManager subclass instance
+  - S8010939: Deadlock in LogManager
+  - S8011139: (reflect) Revise checking in getEnclosingClass
+  - S8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows
+  - S8011313: OCSP timeout set to wrong value if com.sun.security.ocsp.timeout not defined
+  - S8011557: Improve reflection utility classes
+  - S8011806: 7u25-b05 hotspot fastdebug build failure
+  - S8011990: TEST_BUG: java/util/logging/bundlesearch/ResourceBundleSearchTest.java fails on Windows
+  - S8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05
+  - S8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris
+  - S8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21
+  - S8012330: [macosx] Sometimes the applet showing the modal dialog itself loses the ability to gain focus
+  - S8012453: (process) Runtime.exec(String) fails if command contains spaces [win]
+  - S8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer
+  - S8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07
+  - S8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext()
+  - S8013228: Create new system properties to control allowable OCSP clock skew and CRL connection timeout
+  - S8013380: Removal of stack walk to find resource bundle breaks Glassfish startup
+  - S8014205: Most of the Swing dialogs are blank on one win7 MUI
+  - S8014423: [macosx] The scrollbar's block increment performs incorrectly
+  - S8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09
+  - S8014618, RH868136: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement
+  - S8014676: Java debugger may fail to run
+  - S8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10
+  - S8014745: Provide a switch to allow stack walk search of resource bundle
+  - S8014968: OCSP and CRL connection timeout is set to four hours by default
+
 New in release 2.2.8 (2013-04-30):
 
 * Security fixes
diff -r 2f50c50bc1d0 -r c8f337eac826 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch	Wed May 01 00:04:40 2013 +0100
+++ b/patches/boot/ecj-diamond.patch	Fri Jun 28 02:49:03 2013 +0100
@@ -6215,3 +6215,63 @@
          List threads = new ArrayList();
          for (int i = 0; i < threadCount; i++) {
              RandomCollector r = new RandomCollector();
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java	2013-06-27 16:06:42.289384018 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java	2013-06-27 16:07:06.489768521 +0100
+@@ -1164,7 +1164,7 @@
+             end = end.getSuperclass();
+         }
+ 
+-        HashSet oscNames = new HashSet<>(3);
++        HashSet oscNames = new HashSet(3);
+ 
+         for (ObjectStreamClass d = this; d != null; d = d.superDesc) {
+             if (oscNames.contains(d.name)) {
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java	2013-06-27 16:06:53.297558922 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java	2013-06-27 16:07:32.294178507 +0100
+@@ -106,7 +106,7 @@
+      * Note that this only applies to createFont() from an InputStream object.
+      */
+     private static class TempFileDeletionHook {
+-        private static HashMap files = new HashMap<>();
++        private static HashMap files = new HashMap();
+ 
+         private static Thread t = null;
+         static void init() {
+diff --git a/src/share/classes/com/sun/media/sound/AbstractLine.java b/src/share/classes/com/sun/media/sound/AbstractLine.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java
++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java
+@@ -54,7 +54,7 @@
+      * Contains event dispatcher per thread group.
+      */
+     private static final Map dispatchers =
+-            new WeakHashMap<>();
++      new WeakHashMap();
+ 
+     /**
+      * Constructs a new AbstractLine.
+diff --git a/src/share/classes/com/sun/media/sound/RealTimeSequencer.java b/src/share/classes/com/sun/media/sound/RealTimeSequencer.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java
++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java
+@@ -59,7 +59,7 @@
+      * dispatcher instance with a factory in EventDispatcher
+      */
+     private static final Map dispatchers =
+-            new WeakHashMap<>();
++      new WeakHashMap();
+ 
+     /**
+      * All RealTimeSequencers share this info object.
+diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java
+--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java	2013-06-27 20:05:19.200970932 +0100
++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java	2013-06-27 20:05:33.857203747 +0100
+@@ -113,7 +113,7 @@
+             SocketAddress[] saa)
+     {
+          SecurityManager sm = System.getSecurityManager();
+-         Set set = new HashSet<>(saa.length);
++         Set set = new HashSet(saa.length);
+          for (SocketAddress sa : saa) {
+              set.add(getRevealedLocalAddress(sa, sm));
+          }
diff -r 2f50c50bc1d0 -r c8f337eac826 patches/boot/ecj-multicatch.patch
--- a/patches/boot/ecj-multicatch.patch	Wed May 01 00:04:40 2013 +0100
+++ b/patches/boot/ecj-multicatch.patch	Fri Jun 28 02:49:03 2013 +0100
@@ -205,3 +205,54 @@
              throw new InternalError(e.toString());
          } catch (InvocationTargetException e) {
              Throwable t = e.getCause();
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java	2013-06-27 15:56:57.456088537 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java	2013-06-27 16:02:12.857102777 +0100
+@@ -402,7 +402,13 @@
+                         try {
+                             ServerNotifForwarder.checkMBeanPermission(this.mBeanServer,
+                                                       candidate.getObjectName(),"addNotificationListener");
+-                        } catch (InstanceNotFoundException | SecurityException e) {
++                        } catch (InstanceNotFoundException e) {
++                            if (logger.debugOn()) {
++                                logger.debug("fetchNotifications", "candidate: " + candidate + " skipped. exception " + e);
++                            }
++                            ++nextSeq;
++                            continue;
++                        } catch (SecurityException e) {
+                             if (logger.debugOn()) {
+                                 logger.debug("fetchNotifications", "candidate: " + candidate + " skipped. exception " + e);
+                             }
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java	2013-06-27 15:56:27.295609027 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java	2013-06-27 16:00:59.631938678 +0100
+@@ -1024,10 +1024,10 @@
+                                      dir,
+                                      redirects,
+                                      redirectErrorStream);
+-        } catch (IOException | IllegalArgumentException e) {
++        } catch (IOException e) {
+             String exceptionInfo = ": " + e.getMessage();
+             Throwable cause = e;
+-            if ((e instanceof IOException) && security != null) {
++            if (security != null) {
+                 // Can not disclose the fail reason for read-protected files.
+                 try {
+                     security.checkRead(prog);
+@@ -1039,6 +1039,16 @@
+             // It's much easier for us to create a high-quality error
+             // message than the low-level C code which found the problem.
+             throw new IOException(
++                "Cannot run program \"" + prog + "\""
++                + (dir == null ? "" : " (in directory \"" + dir + "\")")
++                + exceptionInfo,
++                cause);
++        } catch (IllegalArgumentException e) {
++            String exceptionInfo = ": " + e.getMessage();
++            Throwable cause = e;
++            // It's much easier for us to create a high-quality error
++            // message than the low-level C code which found the problem.
++            throw new IOException(
+                 "Cannot run program \"" + prog + "\""
+                 + (dir == null ? "" : " (in directory \"" + dir + "\")")
+                 + exceptionInfo,
diff -r 2f50c50bc1d0 -r c8f337eac826 patches/boot/ecj-stringswitch.patch
--- a/patches/boot/ecj-stringswitch.patch	Wed May 01 00:04:40 2013 +0100
+++ b/patches/boot/ecj-stringswitch.patch	Fri Jun 28 02:49:03 2013 +0100
@@ -302,59 +302,29 @@
  
                  throw new IllegalArgumentException(
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java	2013-01-14 22:25:02.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java	2013-01-15 02:19:34.315049222 +0000
-@@ -411,111 +411,106 @@
-     static boolean isCallerSensitive(MemberName mem) {
-         if (!mem.isInvocable())  return false;  // fields are not caller sensitive
-         Class defc = mem.getDeclaringClass();
--        switch (mem.getName()) {
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java	2013-06-21 21:46:14.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java	2013-06-26 02:23:21.025257579 +0100
+@@ -421,110 +421,105 @@
+     // this method is also called by test/sun/reflect/CallerSensitiveFinder
+     // to validate the hand-maintained list
+     private static boolean isCallerSensitiveMethod(Class defc, String method) {
+-        switch (method) {
 -        case "doPrivileged":
 -        case "doPrivilegedWithCombiner":
-+	String memName = mem.getName();
-+	if ("doPrivileged".equals(memName) ||
-+	    "doPrivilegedWithCombiner".equals(memName)) {
++	if ("doPrivileged".equals(method) ||
++	    "doPrivilegedWithCombiner".equals(method)) {
              return defc == java.security.AccessController.class;
 -        case "checkMemberAccess":
-+	} else if ("checkMemberAccess".equals(memName)) {
-             return canBeCalledVirtual(mem, java.lang.SecurityManager.class);
++	} else if ("checkMemberAccess".equals(method)) {
+             return defc == java.lang.SecurityManager.class;
 -        case "getUnsafe":
-+        } else if ("getUnsafe".equals(memName)) {
++        } else if ("getUnsafe".equals(method)) {
              return defc == sun.misc.Unsafe.class;
 -        case "lookup":
-+	} else if ("lookup".equals(memName)) {
++	} else if ("lookup".equals(method)) {
              return defc == java.lang.invoke.MethodHandles.class;
--        case "findStatic":
--        case "findVirtual":
--        case "findConstructor":
--        case "findSpecial":
--        case "findGetter":
--        case "findSetter":
--        case "findStaticGetter":
--        case "findStaticSetter":
--        case "bind":
--        case "unreflect":
--        case "unreflectSpecial":
--        case "unreflectConstructor":
--        case "unreflectGetter":
--        case "unreflectSetter":
-+	} else if ("findStatic".equals(memName) ||
-+		   "findVirtual".equals(memName) || 
-+		   "findConstructor".equals(memName) ||
-+		   "findSpecial".equals(memName) ||
-+		   "findGetter".equals(memName) ||
-+		   "findSetter".equals(memName) ||
-+		   "findStaticGetter".equals(memName) ||
-+		   "findStaticSetter".equals(memName) ||
-+		   "bind".equals(memName) ||
-+		   "unreflect".equals(memName) ||
-+		   "unreflectSpecial".equals(memName) ||
-+		   "unreflectConstructor".equals(memName) ||
-+		   "unreflectGetter".equals(memName) ||
-+		   "unreflectSetter".equals(memName)) {
-             return defc == java.lang.invoke.MethodHandles.Lookup.class;
 -        case "invoke":
-+        } else if ("invoke".equals(memName)) {
++	} else if ("invoke".equals(method)) {
              return defc == java.lang.reflect.Method.class;
 -        case "get":
 -        case "getBoolean":
@@ -374,33 +344,37 @@
 -        case "setLong":
 -        case "setFloat":
 -        case "setDouble":
-+	} else if ("get".equals(memName) ||
-+		   "getBoolean".equals(memName) ||
-+		   "getByte".equals(memName) ||
-+		   "getChar".equals(memName) ||
-+		   "getShort".equals(memName) ||
-+		   "getInt".equals(memName) ||
-+		   "getFloat".equals(memName) ||
-+		   "getDouble".equals(memName) ||
-+		   "set".equals(memName) ||
-+		   "setBoolean".equals(memName) ||
-+		   "setByte".equals(memName) ||
-+		   "setChar".equals(memName) ||
-+		   "setShort".equals(memName) ||
-+		   "setInt".equals(memName) ||
-+		   "setLong".equals(memName) ||
-+		   "setFloat".equals(memName) ||
-+		   "setDouble".equals(memName)) {
++	} else if ("get".equals(method) ||
++		   "getBoolean".equals(method) ||
++		   "getByte".equals(method) ||
++		   "getChar".equals(method) ||
++		   "getShort".equals(method) ||
++		   "getInt".equals(method) ||
++		   "getLong".equals(method) ||
++		   "getFloat".equals(method) ||
++		   "getDouble".equals(method) ||
++		   "set".equals(method) ||
++		   "setBoolean".equals(method) ||
++		   "setByte".equals(method) ||
++		   "setChar".equals(method) ||
++		   "setShort".equals(method) ||
++		   "setInt".equals(method) ||
++		   "setLong".equals(method) ||
++		   "setFloat".equals(method) ||
++		   "setDouble".equals(method)) {
              return defc == java.lang.reflect.Field.class;
 -        case "newInstance":
-+	} else if ("newInstance".equals(memName)) {
++	} else if ("newInstance".equals(method)) {
              if (defc == java.lang.reflect.Constructor.class)  return true;
              if (defc == java.lang.Class.class)  return true;
 -            break;
+-        case "getFields":
++	} else if ("getFields".equals(method)) {
+             return defc == java.lang.Class.class ||
+                    defc == javax.sql.rowset.serial.SerialJavaObject.class;
 -        case "forName":
 -        case "getClassLoader":
 -        case "getClasses":
--        case "getFields":
 -        case "getMethods":
 -        case "getConstructors":
 -        case "getDeclaredClasses":
@@ -413,81 +387,117 @@
 -        case "getDeclaredField":
 -        case "getDeclaredMethod":
 -        case "getDeclaredConstructor":
-+	} else if ("forName".equals(memName) ||
-+		   "getClassLoader".equals(memName) ||
-+		   "getClasses".equals(memName) ||
-+		   "getFields".equals(memName) ||
-+		   "getMethods".equals(memName) ||
-+		   "getConstructors".equals(memName) ||
-+		   "getDeclaredClasses".equals(memName) ||
-+		   "getDeclaredFields".equals(memName) ||
-+		   "getDeclaredMethods".equals(memName) ||
-+		   "getDeclaredConstructors".equals(memName) ||
-+		   "getField".equals(memName) ||
-+		   "getMethod".equals(memName) ||
-+		   "getConstructor".equals(memName) ||
-+		   "getDeclaredField".equals(memName) ||
-+		   "getDeclaredMethod".equals(memName) ||
-+		   "getDeclaredConstructor".equals(memName)) {
+-        case "getEnclosingClass":
+-        case "getEnclosingMethod":


From andrew at icedtea.classpath.org  Thu Jun 27 19:40:01 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Fri, 28 Jun 2013 02:40:01 +0000
Subject: /hg/release/icedtea7-forest-2.1: Added tag icedtea-2.1.9 for cha...
Message-ID: 

changeset dca886d9c9d4 in /hg/release/icedtea7-forest-2.1
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1?cmd=changeset;node=dca886d9c9d4
author: andrew
date: Fri Jun 28 03:33:45 2013 +0100

	Added tag icedtea-2.1.9 for changeset 34d809e0dba3


diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (8 lines):

diff -r 34d809e0dba3 -r dca886d9c9d4 .hgtags
--- a/.hgtags	Wed May 22 18:20:17 2013 +0100
+++ b/.hgtags	Fri Jun 28 03:33:45 2013 +0100
@@ -155,3 +155,4 @@
 9806157f99d2b58dc7de1c3da946e18da5c0dfab icedtea-2.1.6
 7de37e3bcca60b11bd28b134efa3a4a27d1f39cf icedtea-2.1.7
 c1c64963670441a45826a0f80f7f06a64e78c9f8 icedtea-2.1.8
+34d809e0dba382efe77bb5d47e90d1edd7f36427 icedtea-2.1.9


From andrew at icedtea.classpath.org  Thu Jun 27 19:40:08 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Fri, 28 Jun 2013 02:40:08 +0000
Subject: /hg/release/icedtea7-forest-2.1/corba: Added tag icedtea-2.1.9 f...
Message-ID: 

changeset 49d9271e9121 in /hg/release/icedtea7-forest-2.1/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/corba?cmd=changeset;node=49d9271e9121
author: andrew
date: Fri Jun 28 03:33:46 2013 +0100

	Added tag icedtea-2.1.9 for changeset ce773a499f3a


diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (8 lines):

diff -r ce773a499f3a -r 49d9271e9121 .hgtags
--- a/.hgtags	Wed Jun 12 12:03:45 2013 +0100
+++ b/.hgtags	Fri Jun 28 03:33:46 2013 +0100
@@ -163,3 +163,4 @@
 fb02b0451c095b44ed3b34ad2db682b0967b6b0e icedtea-2.1.6
 4afc0be5b3c625242ab7f9ee23d39f96d911ba14 icedtea-2.1.7
 313f1ee3211867787654cd11bfe873e1abf80f43 icedtea-2.1.8
+ce773a499f3ad7a79ca25b58c7a5bd9241ed90d9 icedtea-2.1.9


From andrew at icedtea.classpath.org  Thu Jun 27 19:40:15 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Fri, 28 Jun 2013 02:40:15 +0000
Subject: /hg/release/icedtea7-forest-2.1/jaxp: Added tag icedtea-2.1.9 fo...
Message-ID: 

changeset 5270a07954dc in /hg/release/icedtea7-forest-2.1/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jaxp?cmd=changeset;node=5270a07954dc
author: andrew
date: Fri Jun 28 03:33:47 2013 +0100

	Added tag icedtea-2.1.9 for changeset 2c3bc21169f9


diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (8 lines):

diff -r 2c3bc21169f9 -r 5270a07954dc .hgtags
--- a/.hgtags	Wed May 22 18:20:18 2013 +0100
+++ b/.hgtags	Fri Jun 28 03:33:47 2013 +0100
@@ -159,3 +159,4 @@
 0000000000000000000000000000000000000000 icedtea-2.1.8
 0000000000000000000000000000000000000000 icedtea-2.1.8
 c04b95aa746c47a6002de7e14549e1ee91a81b03 icedtea-2.1.8
+2c3bc21169f9505be7e624e32b89b92483aef2f9 icedtea-2.1.9


From andrew at icedtea.classpath.org  Thu Jun 27 19:40:21 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Fri, 28 Jun 2013 02:40:21 +0000
Subject: /hg/release/icedtea7-forest-2.1/jaxws: Added tag icedtea-2.1.9 f...
Message-ID: 

changeset c80d235556f4 in /hg/release/icedtea7-forest-2.1/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jaxws?cmd=changeset;node=c80d235556f4
author: andrew
date: Fri Jun 28 03:33:48 2013 +0100

	Added tag icedtea-2.1.9 for changeset 3532f4415fd5


diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (8 lines):

diff -r 3532f4415fd5 -r c80d235556f4 .hgtags
--- a/.hgtags	Thu Mar 21 11:08:05 2013 -0400
+++ b/.hgtags	Fri Jun 28 03:33:48 2013 +0100
@@ -155,3 +155,4 @@
 5c2f1241ceace6ada6233a61a8d6279935cb67bc icedtea-2.1.6
 52bbe659af647277ea7d07b35514dc89b5dc0832 icedtea-2.1.7
 d04602077b14a57717a6aac302afbcb3732afe2a icedtea-2.1.8
+3532f4415fd5df3b5c8e25ad35d980fae5432f25 icedtea-2.1.9


From andrew at icedtea.classpath.org  Thu Jun 27 19:40:27 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Fri, 28 Jun 2013 02:40:27 +0000
Subject: /hg/release/icedtea7-forest-2.1/langtools: Added tag icedtea-2.1...
Message-ID: 

changeset 9069e3a941b0 in /hg/release/icedtea7-forest-2.1/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/langtools?cmd=changeset;node=9069e3a941b0
author: andrew
date: Fri Jun 28 03:33:51 2013 +0100

	Added tag icedtea-2.1.9 for changeset 26a29796b374


diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (8 lines):

diff -r 26a29796b374 -r 9069e3a941b0 .hgtags
--- a/.hgtags	Wed Jun 05 14:31:54 2013 -0700
+++ b/.hgtags	Fri Jun 28 03:33:51 2013 +0100
@@ -155,3 +155,4 @@
 e351b6e580c2d986c2c7367cce2156800266ab75 icedtea-2.1.6
 ac6983a8bd4a559d7f56045415351deccf18f85c icedtea-2.1.7
 c63c8a2164e474d2620f2f4208a250da75ea7745 icedtea-2.1.8
+26a29796b374f14dd63c95e52a138e249d66ef47 icedtea-2.1.9


From andrew at icedtea.classpath.org  Thu Jun 27 19:40:35 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Fri, 28 Jun 2013 02:40:35 +0000
Subject: /hg/release/icedtea7-forest-2.1/hotspot: Added tag icedtea-2.1.9...
Message-ID: 

changeset 4ec48beeb010 in /hg/release/icedtea7-forest-2.1/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot?cmd=changeset;node=4ec48beeb010
author: andrew
date: Fri Jun 28 03:33:52 2013 +0100

	Added tag icedtea-2.1.9 for changeset 8a0d63301cfd


diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (8 lines):

diff -r 8a0d63301cfd -r 4ec48beeb010 .hgtags
--- a/.hgtags	Wed Jun 12 15:22:15 2013 +0100
+++ b/.hgtags	Fri Jun 28 03:33:52 2013 +0100
@@ -230,3 +230,4 @@
 32569b4d36f4f081dcabb2389ae21bdfe29f3ce1 icedtea-2.1.6
 d8b22e079abeeca06fa7dc45b67e7fdf8da265e0 icedtea-2.1.7
 2c49817841014cca32279dc90a61654415a3391c icedtea-2.1.8
+8a0d63301cfd92e1ac89803ac443491b97668de3 icedtea-2.1.9


From andrew at icedtea.classpath.org  Thu Jun 27 19:40:48 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Fri, 28 Jun 2013 02:40:48 +0000
Subject: /hg/release/icedtea7-forest-2.1/jdk: 41 new changesets
Message-ID: 

changeset 03c0d1a001cc in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=03c0d1a001cc
author: andrew
date: Wed Jun 26 21:08:50 2013 -0500

	7053526: Upgrade JDK 8 to use Little CMS 2.4
	Reviewed-by: prr, jgodinez


changeset af2db2941f43 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=af2db2941f43
author: bae
date: Wed Dec 05 16:55:05 2012 +0400

	7124347: [macosx] java.lang.InternalError: not implemented yet on call Graphics2D.drawRenderedImage
	Reviewed-by: prr, flar


changeset 5db08be3f8c2 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=5db08be3f8c2
author: andrew
date: Wed Jun 26 22:04:37 2013 -0500

	7199143: RFE: OCSP revocation checker should provide possibility to specify connection timeout
	Summary: Added com.sun.security.ocsp.timeout system property to control timeout
	Reviewed-by: mullan, vinnie
	Contributed-by: jason.uh at oracle.com


changeset 75cf6b2c4f57 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=75cf6b2c4f57
author: andrew
date: Thu Jun 27 20:55:41 2013 -0500

	8006120: Provide "Server JRE" for 7u train
	Reviewed-by: pbhat, cgruszka
	Contributed-by: amy.y.wang at oracle.com


changeset 4f08c170e2da in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=4f08c170e2da
author: ksrini
date: Tue Jul 31 06:10:01 2012 -0700

	7188114: (launcher) need an alternate command line parser for Windows
	Reviewed-by: darcy, dholmes, jjh
	Contributed-by: akhil.arora at oracle.com


changeset b904ff043716 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=b904ff043716
author: andrew
date: Wed Jun 26 22:15:08 2013 -0500

	8006536: [launcher]  removes trailing slashes on arguments
	Reviewed-by: ksrini, akhil
	Contributed-by: jviswana at linux.vnet.ibm.com


changeset 80fba79ca568 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=80fba79ca568
author: andrew
date: Wed Jun 26 22:20:19 2013 -0500

	8009165: Fix for 8006435 needs revision
	Summary: The fix for JDK-8006435 added a new ReflectUtil.ensureClassAccess method which is not an appropriate utility method in ReflectUtil.
	Reviewed-by: alanb, mchung, dfuchs


changeset 686d810cb9b6 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=686d810cb9b6
author: mullan
date: Mon Apr 29 10:20:55 2013 -0400

	8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03
	Reviewed-by: xuelei


changeset 81f7897e8144 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=81f7897e8144
author: uta
date: Fri Mar 08 13:47:02 2013 +0400

	8009463: Regression test test\java\lang\Runtime\exec\ArgWithSpaceAndFinalBackslash.java failing.
	Reviewed-by: alanb, ahgross


changeset e15562835a5e in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=e15562835a5e
author: valeriep
date: Mon Mar 11 20:05:37 2013 -0700

	8009610: Blacklist certificate used with malware.
	Summary: updated the black list and the reg test with the new cert.
	Reviewed-by: weijun


changeset 5683b3f7f8cc in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=5683b3f7f8cc
author: peytoia
date: Tue Apr 03 18:21:28 2012 +0900

	7158483: (tz) Support tzdata2012c
	Reviewed-by: okutsu


changeset c554456c623f in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=c554456c623f
author: coffeys
date: Thu Oct 11 14:28:36 2012 +0100

	7198570: (tz) Support tzdata2012f
	Reviewed-by: peytoia, asaha


changeset 1f833e421117 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=1f833e421117
author: coffeys
date: Tue Nov 06 10:19:49 2012 +0000

	8002225: (tz) Support tzdata2012i
	Reviewed-by: peytoia, asaha


changeset d0902320c58f in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=d0902320c58f
author: peytoia
date: Fri Mar 15 20:35:51 2013 +0900

	8009987: (tz) Support tzdata2013b
	Reviewed-by: okutsu


changeset 05e5519ffbcc in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=05e5519ffbcc
author: andrew
date: Wed Jun 26 22:27:10 2013 -0500

	8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail
	Reviewed-by: dfuchs, dholmes


changeset 7750666eaf16 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=7750666eaf16
author: khazra
date: Wed Mar 20 13:39:56 2013 -0700

	8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build
	Summary: Eliminate fall-through while setting socket options on Windows
	Reviewed-by: alanb, chegar


changeset 0d497f17e31b in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=0d497f17e31b
author: mullan
date: Fri May 10 16:28:51 2013 -0400

	8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod
	Reviewed-by: xuelei, hawtin


changeset 776ac4b51f15 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=776ac4b51f15
author: mchung
date: Tue May 14 08:07:08 2013 -0700

	8010727: WLS fails to add a logger with "" in its own LogManager subclass instance
	Reviewed-by: alanb, jgish


changeset 871acb7cd95c in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=871acb7cd95c
author: jgish
date: Fri Apr 19 16:50:10 2013 -0700

	8010939: Deadlock in LogManager
	Summary: re-order locks to avoid deadlock
	Reviewed-by: mchung, alanb


changeset 2d3faf217561 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=2d3faf217561
author: jfranck
date: Thu Apr 18 13:18:28 2013 +0200

	8011139: (reflect) Revise checking in getEnclosingClass
	Reviewed-by: darcy, mchung, ahgross


changeset 5e190bcba6be in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=5e190bcba6be
author: anthony
date: Tue Apr 09 12:08:53 2013 +0400

	8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows
	Reviewed-by: art, yan


changeset c655aca607b1 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=c655aca607b1
author: andrew
date: Wed Jun 26 22:30:32 2013 -0500

	8011313: OCSP timeout set to wrong value if com.sun.security.ocsp.timeout not defined
	Reviewed-by: vinnie


changeset 66420635ccfc in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=66420635ccfc
author: ngthomas
date: Tue May 21 10:25:40 2013 -0700

	8014968: OCSP and CRL connection timeout is set to four hours by default
	Reviewed-by: mullan


changeset 94b16322eb0b in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=94b16322eb0b
author: asaha
date: Tue Apr 09 12:39:40 2013 -0700

	8011806: 7u25-b05 hotspot fastdebug build failure
	Summary: Backed out changeset 05a8336b1eab
	Reviewed-by: mullan


changeset 2a78c210f0e2 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=2a78c210f0e2
author: bae
date: Fri Apr 12 14:15:17 2013 +0400

	8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05
	Reviewed-by: prr, vadim


changeset 22decf80e0e8 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=22decf80e0e8
author: bae
date: Mon Apr 15 14:15:21 2013 +0400

	8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris
	Reviewed-by: prr, vadim


changeset 7c75580b144f in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=7c75580b144f
author: dfuchs
date: Wed May 01 00:49:21 2013 +0200

	8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21
	Reviewed-by: alanb, skoivu, smarks, mchung


changeset 80383749fc72 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=80383749fc72
author: uta
date: Mon May 13 20:09:20 2013 +0400

	8012453: (process) Runtime.exec(String) fails if command contains spaces [win]
	Reviewed-by: alanb


changeset 20d3d11e8d9a in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=20d3d11e8d9a
author: prr
date: Thu Apr 25 21:37:41 2013 -0700

	8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer
	Reviewed-by: bae, srl


changeset 55eaa0da2a8f in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=55eaa0da2a8f
author: leonidr
date: Mon May 06 16:30:42 2013 +0400

	8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07
	Summary: Do not mark context as disposed until we've posted all the events
	Reviewed-by: art


changeset 0f93d6b18a16 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=0f93d6b18a16
author: coffeys
date: Wed May 01 21:02:04 2013 +0100

	8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext()
	Reviewed-by: mchung, okutsu


changeset 4e37ba90acda in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=4e37ba90acda
author: andrew
date: Wed Jun 26 22:37:21 2013 -0500

	8013228: Create new system properties to control allowable OCSP clock skew and CRL connection timeout
	Reviewed-by: vinnie


changeset 108fe5a882a7 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=108fe5a882a7
author: andrew
date: Wed Jun 26 22:44:03 2013 -0500

	8002070: Remove the stack search for a resource bundle for Logger to use
	Summary: The fragile, vulnerable, stack crawling has been eliminated from findResourceBundle(String)
	Reviewed-by: mchung


changeset b9dc2f2b4c4d in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=b9dc2f2b4c4d
author: jgish
date: Tue Apr 16 16:34:14 2013 -0400

	8011990: TEST_BUG: java/util/logging/bundlesearch/ResourceBundleSearchTest.java fails on Windows
	Summary: Fix URL to reliably work on all platforms
	Reviewed-by: duke


changeset 8c2f91c4c4b8 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=8c2f91c4c4b8
author: andrew
date: Wed Jun 26 22:50:47 2013 -0500

	8013380: Removal of stack walk to find resource bundle breaks Glassfish startup
	Summary: Use caller's classloader to load resource as an alternative to thread context classloader and system classloader
	Reviewed-by: mchung, alanb


changeset 683f47243310 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=683f47243310
author: bae
date: Fri May 17 16:07:14 2013 +0400

	8014205: Most of the Swing dialogs are blank on one win7 MUI
	Reviewed-by: prr, vadim


changeset 9c9dc3220f0a in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=9c9dc3220f0a
author: bae
date: Tue May 14 21:05:20 2013 +0400

	8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09
	Reviewed-by: prr, vadim


changeset 529e737ece0c in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=529e737ece0c
author: dmeetry
date: Fri May 17 19:59:49 2013 +0400

	8014676: Java debugger may fail to run
	Summary: The problem is observed when the binaries for windows are placed under a path which contains a space
	Reviewed-by: alanb
	Contributed-by: ivan.gerasimov at oracle.com


changeset d2a1f8885e65 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=d2a1f8885e65
author: leonidr
date: Mon May 20 18:51:34 2013 +0400

	8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10
	Summary: Removed logging from SunToolkit
	Reviewed-by: art


changeset 1e74b61253eb in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=1e74b61253eb
author: mchung
date: Fri May 17 14:29:51 2013 -0700

	8014745: Provide a switch to allow stack walk search of resource bundle
	Reviewed-by: alanb, jgish


changeset b1fbc0b7887c in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=b1fbc0b7887c
author: andrew
date: Fri Jun 28 03:39:42 2013 +0100

	Added tag icedtea-2.1.9 for changeset 1e74b61253eb


diffstat:

 .hgtags                                                                                       |     1 +
 make/common/Defs.gmk                                                                          |     1 +
 make/common/Release.gmk                                                                       |    21 +-
 make/java/java/mapfile-vers                                                                   |     1 +
 make/sun/cmm/lcms/FILES_c_unix.gmk                                                            |     1 +
 make/sun/cmm/lcms/FILES_c_windows.gmk                                                         |     1 +
 make/sun/javazic/tzdata/VERSION                                                               |     2 +-
 make/sun/javazic/tzdata/africa                                                                |   182 +-
 make/sun/javazic/tzdata/antarctica                                                            |    18 +-
 make/sun/javazic/tzdata/asia                                                                  |   295 +-
 make/sun/javazic/tzdata/australasia                                                           |   117 +-
 make/sun/javazic/tzdata/backward                                                              |     1 -
 make/sun/javazic/tzdata/etcetera                                                              |     1 -
 make/sun/javazic/tzdata/europe                                                                |   221 +-
 make/sun/javazic/tzdata/factory                                                               |     1 -
 make/sun/javazic/tzdata/iso3166.tab                                                           |     1 -
 make/sun/javazic/tzdata/leapseconds                                                           |    41 +-
 make/sun/javazic/tzdata/northamerica                                                          |   203 +-
 make/sun/javazic/tzdata/pacificnew                                                            |     1 -
 make/sun/javazic/tzdata/solar87                                                               |     1 -
 make/sun/javazic/tzdata/solar88                                                               |     1 -
 make/sun/javazic/tzdata/solar89                                                               |     1 -
 make/sun/javazic/tzdata/southamerica                                                          |   152 +-
 make/sun/javazic/tzdata/systemv                                                               |     1 -
 make/sun/javazic/tzdata/zone.tab                                                              |     9 +-
 src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java                              |    14 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java                  |    13 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java            |    14 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/signature/ObjectContainer.java     |     5 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java           |     3 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperties.java |    21 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java   |     5 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java        |    39 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java   |     6 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java            |    12 +
 src/share/classes/com/sun/tools/jdi/AbstractLauncher.java                                     |     2 +-
 src/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java                               |     2 +-
 src/share/classes/java/awt/Toolkit.java                                                       |    10 +-
 src/share/classes/java/awt/image/BufferedImage.java                                           |    56 +-
 src/share/classes/java/awt/image/Raster.java                                                  |     3 +-
 src/share/classes/java/io/ObjectStreamClass.java                                              |     8 +-
 src/share/classes/java/io/ObjectStreamField.java                                              |     8 +-
 src/share/classes/java/lang/Class.java                                                        |    24 +-
 src/share/classes/java/lang/ProcessBuilder.java                                               |     5 +-
 src/share/classes/java/lang/invoke/MethodHandleNatives.java                                   |     2 +
 src/share/classes/java/security/AccessControlContext.java                                     |    13 +-
 src/share/classes/java/security/ProtectionDomain.java                                         |     7 +-
 src/share/classes/java/util/logging/LogManager.java                                           |    23 +-
 src/share/classes/java/util/logging/Logger.java                                               |   177 +-
 src/share/classes/javax/management/StandardEmitterMBean.java                                  |     7 +-
 src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java                        |     2 +-
 src/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java                       |    15 +
 src/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java                                    |     3 +
 src/share/classes/sun/awt/AppContext.java                                                     |    38 +-
 src/share/classes/sun/awt/SunToolkit.java                                                     |    26 +-
 src/share/classes/sun/font/ExtendedTextSourceLabel.java                                       |    43 +-
 src/share/classes/sun/font/GlyphLayout.java                                                   |    21 +-
 src/share/classes/sun/java2d/opengl/OGLBlitLoops.java                                         |    52 +
 src/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java                                  |     3 +-
 src/share/classes/sun/misc/SharedSecrets.java                                                 |     5 +-
 src/share/classes/sun/reflect/Reflection.java                                                 |    15 +
 src/share/classes/sun/reflect/misc/ReflectUtil.java                                           |     8 -
 src/share/classes/sun/security/provider/certpath/CertPathHelper.java                          |     2 +-
 src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java                    |    14 +-
 src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java                |    40 +-
 src/share/classes/sun/security/provider/certpath/OCSP.java                                    |    28 +-
 src/share/classes/sun/security/provider/certpath/OCSPResponse.java                            |    31 +-
 src/share/classes/sun/security/provider/certpath/URICertStore.java                            |    31 +-
 src/share/classes/sun/security/util/UntrustedCertificates.java                                |    47 +
 src/share/classes/sun/util/resources/TimeZoneNames.java                                       |    46 +-
 src/share/classes/sun/util/resources/TimeZoneNames_de.java                                    |    46 +-
 src/share/classes/sun/util/resources/TimeZoneNames_es.java                                    |    46 +-
 src/share/classes/sun/util/resources/TimeZoneNames_fr.java                                    |   136 +-
 src/share/classes/sun/util/resources/TimeZoneNames_it.java                                    |    46 +-
 src/share/classes/sun/util/resources/TimeZoneNames_ja.java                                    |    46 +-
 src/share/classes/sun/util/resources/TimeZoneNames_ko.java                                    |    46 +-
 src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java                                 |    50 +-
 src/share/classes/sun/util/resources/TimeZoneNames_sv.java                                    |    46 +-
 src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java                                 |    46 +-
 src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java                                 |    48 +-
 src/share/native/sun/awt/medialib/awt_ImagingLib.c                                            |    33 +-
 src/share/native/sun/font/layout/ContextualSubstSubtables.cpp                                 |    12 +
 src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp                               |     2 +-
 src/share/native/sun/font/layout/ExtensionSubtables.cpp                                       |     6 +-
 src/share/native/sun/font/layout/ExtensionSubtables.h                                         |     3 +-
 src/share/native/sun/font/layout/GlyphPosnLookupProc.cpp                                      |     2 +-
 src/share/native/sun/font/layout/GlyphSubstLookupProc.cpp                                     |     2 +-
 src/share/native/sun/font/layout/LigatureSubstSubtables.cpp                                   |     4 +
 src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp                                  |     4 +
 src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp                              |     4 +
 src/share/native/sun/font/layout/MarkToMarkPosnSubtables.cpp                                  |     4 +
 src/share/native/sun/font/layout/MultipleSubstSubtables.cpp                                   |     4 +
 src/share/native/sun/font/layout/PairPositioningSubtables.cpp                                 |     5 +
 src/share/native/sun/font/layout/SinglePositioningSubtables.cpp                               |     6 +
 src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp                              |     6 +
 src/share/native/sun/font/layout/SunLayoutEngine.cpp                                          |    17 +-
 src/share/native/sun/java2d/cmm/lcms/cmscam02.c                                               |    42 +-
 src/share/native/sun/java2d/cmm/lcms/cmscgats.c                                               |   213 +-
 src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c                                               |    70 +-
 src/share/native/sun/java2d/cmm/lcms/cmserr.c                                                 |    28 +-
 src/share/native/sun/java2d/cmm/lcms/cmsgamma.c                                               |    78 +-
 src/share/native/sun/java2d/cmm/lcms/cmsgmt.c                                                 |    15 +-
 src/share/native/sun/java2d/cmm/lcms/cmshalf.c                                                |   564 ++++
 src/share/native/sun/java2d/cmm/lcms/cmsintrp.c                                               |   347 +-
 src/share/native/sun/java2d/cmm/lcms/cmsio0.c                                                 |   112 +-
 src/share/native/sun/java2d/cmm/lcms/cmsio1.c                                                 |   287 +-
 src/share/native/sun/java2d/cmm/lcms/cmslut.c                                                 |   222 +-
 src/share/native/sun/java2d/cmm/lcms/cmsmd5.c                                                 |     2 +-
 src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c                                                |     3 +-
 src/share/native/sun/java2d/cmm/lcms/cmsnamed.c                                               |   191 +-
 src/share/native/sun/java2d/cmm/lcms/cmsopt.c                                                 |   112 +-
 src/share/native/sun/java2d/cmm/lcms/cmspack.c                                                |  1392 +++++++--
 src/share/native/sun/java2d/cmm/lcms/cmspcs.c                                                 |     1 +
 src/share/native/sun/java2d/cmm/lcms/cmsplugin.c                                              |    17 +-
 src/share/native/sun/java2d/cmm/lcms/cmsps2.c                                                 |    88 +-
 src/share/native/sun/java2d/cmm/lcms/cmssamp.c                                                |   305 ++-
 src/share/native/sun/java2d/cmm/lcms/cmssm.c                                                  |    14 +-
 src/share/native/sun/java2d/cmm/lcms/cmstypes.c                                               |   820 +++++-
 src/share/native/sun/java2d/cmm/lcms/cmsvirt.c                                                |    92 +-
 src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c                                               |    12 +-
 src/share/native/sun/java2d/cmm/lcms/cmsxform.c                                               |   371 ++-
 src/share/native/sun/java2d/cmm/lcms/lcms2.h                                                  |   153 +-
 src/share/native/sun/java2d/cmm/lcms/lcms2_internal.h                                         |   130 +-
 src/share/native/sun/java2d/cmm/lcms/lcms2_plugin.h                                           |    91 +-
 src/share/native/sun/reflect/Reflection.c                                                     |     6 +
 src/windows/bin/cmdtoargs.c                                                                   |   609 ++++
 src/windows/classes/java/lang/ProcessImpl.java                                                |   154 +-
 src/windows/classes/java/net/DualStackPlainSocketImpl.java                                    |     5 +-
 src/windows/native/sun/windows/awt_Component.cpp                                              |     2 +-
 test/com/sun/org/apache/xml/internal/security/TruncateHMAC.java                               |     1 +
 test/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java                 |     9 +-
 test/com/sun/org/apache/xml/internal/security/transforms/MyTransform.java                     |    23 +-
 test/java/awt/font/LineBreakMeasurer/AllFontsLBM.java                                         |    78 +
 test/java/awt/image/mlib/MlibOpsTest.java                                                     |     2 +-
 test/java/lang/Runtime/exec/ExecCommand.java                                                  |   163 +
 test/java/util/logging/DrainFindDeadlockTest.java                                             |   196 +
 test/java/util/logging/LogManagerInstanceTest.java                                            |    76 +
 test/java/util/logging/bundlesearch/ClassPathTestBundle_en.properties                         |    25 +
 test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java                                |   163 +
 test/java/util/logging/bundlesearch/LoadItUp1.java                                            |    49 +
 test/java/util/logging/bundlesearch/LoadItUp2.java                                            |    62 +
 test/java/util/logging/bundlesearch/LoadItUp2Invoker.java                                     |    60 +
 test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java                             |   297 ++
 test/java/util/logging/bundlesearch/TwiceIndirectlyLoadABundle.java                           |    91 +
 test/java/util/logging/bundlesearch/resources/CallerSearchableResource_en.properties          |    25 +
 test/java/util/logging/bundlesearch/resources/ContextClassLoaderTestBundle_en.properties      |    25 +
 test/java/util/logging/bundlesearch/resources/StackSearchableResource_en.properties           |    25 +
 test/sun/awt/AppContext/8012933/Test8012933.java                                              |    92 +
 test/sun/java2d/OpenGL/CustomCompositeTest.java                                               |   266 +
 149 files changed, 9210 insertions(+), 1960 deletions(-)

diffs (truncated from 19602 to 500 lines):

diff -r 4a67dd684bc2 -r b1fbc0b7887c .hgtags
--- a/.hgtags	Tue Jun 18 08:07:48 2013 -0500
+++ b/.hgtags	Fri Jun 28 03:39:42 2013 +0100
@@ -167,3 +167,4 @@
 31e42bc321027abccb9fb8135f13d63bea0fa762 icedtea-2.1.6
 2989f7467d8345a2fc32416223fd6eafe96037f2 icedtea-2.1.7
 acaa2de9f547c4e6936e4297428599f0b0d4d64b icedtea-2.1.8
+1e74b61253eb8c0d8d70512ab84ba16366e02c68 icedtea-2.1.9
diff -r 4a67dd684bc2 -r b1fbc0b7887c make/common/Defs.gmk
--- a/make/common/Defs.gmk	Tue Jun 18 08:07:48 2013 -0500
+++ b/make/common/Defs.gmk	Fri Jun 28 03:39:42 2013 +0100
@@ -296,6 +296,7 @@
 
 JDK_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2sdk-image
 JRE_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2re-image
+JDK_SERVER_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2sdk-server-image
 
 #where the demo source can be found
 DEMOSRCDIR          = $(SHARE_SRC)/demo
diff -r 4a67dd684bc2 -r b1fbc0b7887c make/common/Release.gmk
--- a/make/common/Release.gmk	Tue Jun 18 08:07:48 2013 -0500
+++ b/make/common/Release.gmk	Fri Jun 28 03:39:42 2013 +0100
@@ -226,16 +226,17 @@
 trim-image-jre trim-image-jdk \
 identify-image-jre identify-image-jdk \
 process-image-jre process-image-jdk \
-compare-image \
-sec-files sec-files-win jgss-files ::
+compare-image  \
+sec-files sec-files-win jgss-files server-jdk-image ::
 	@$(ECHO) ">>>Making "$@" @ `$(DATE)` ..."
 
 # Order is important here, trim jre after jdk image is created
 images:: sanity-images post-sanity-images  \
 	 $(INITIAL_IMAGE_JRE) $(INITIAL_IMAGE_JDK) \
 	 trim-image-jre trim-image-jdk \
-         identify-image-jre identify-image-jdk \
-	 process-image-jre process-image-jdk sec-files sec-files-win jgss-files 
+	 identify-image-jre identify-image-jdk \
+	 process-image-jre process-image-jdk sec-files sec-files-win \
+	jgss-files server-jdk-image 
 
 # Don't use these
 image-jre:: initial-image-jre trim-image-jre identify-image-jre process-image-jre
@@ -850,6 +851,18 @@
 	done
 	$(RM) $(JRE_BIN_LIST)
 
+# Duplicate current j2re-image contents to server-j2re-image 
+# for the server version of jre, before deploy build
+server-jdk-image::
+	$(RM) -r $(JDK_SERVER_IMAGE_DIR)
+	$(CP) -r $(JDK_IMAGE_DIR) $(JDK_SERVER_IMAGE_DIR)
+	$(RM) -r $(JDK_SERVER_IMAGE_DIR)/demo
+	$(RM) -r $(JDK_SERVER_IMAGE_DIR)/sample
+	$(RM) $(JDK_SERVER_IMAGE_DIR)/bin/jcontrol
+	$(RM) $(JDK_SERVER_IMAGE_DIR)/jre/bin/jcontrol
+	$(RM) $(JDK_SERVER_IMAGE_DIR)/man/ja_JP.UTF-8/man1/javaws.1
+	$(RM) $(JDK_SERVER_IMAGE_DIR)/man/man1/javaws.1
+
 ######################################################
 # JDK Image
 ######################################################
diff -r 4a67dd684bc2 -r b1fbc0b7887c make/java/java/mapfile-vers
--- a/make/java/java/mapfile-vers	Tue Jun 18 08:07:48 2013 -0500
+++ b/make/java/java/mapfile-vers	Fri Jun 28 03:39:42 2013 +0100
@@ -266,6 +266,7 @@
 		Java_sun_reflect_NativeConstructorAccessorImpl_newInstance0;
 		Java_sun_reflect_NativeMethodAccessorImpl_invoke0;
 		Java_sun_reflect_Reflection_getCallerClass;
+		Java_sun_reflect_Reflection_getCallerClass0;
 		Java_sun_reflect_Reflection_getClassAccessFlags;
                 Java_sun_misc_Version_getJdkVersionInfo;
                 Java_sun_misc_Version_getJdkSpecialVersion;
diff -r 4a67dd684bc2 -r b1fbc0b7887c make/sun/cmm/lcms/FILES_c_unix.gmk
--- a/make/sun/cmm/lcms/FILES_c_unix.gmk	Tue Jun 18 08:07:48 2013 -0500
+++ b/make/sun/cmm/lcms/FILES_c_unix.gmk	Fri Jun 28 03:39:42 2013 +0100
@@ -32,6 +32,7 @@
     cmserr.c \
     cmsgamma.c \
     cmsgmt.c \
+    cmshalf.c \
     cmsintrp.c \
     cmsio0.c \
     cmsio1.c \
diff -r 4a67dd684bc2 -r b1fbc0b7887c make/sun/cmm/lcms/FILES_c_windows.gmk
--- a/make/sun/cmm/lcms/FILES_c_windows.gmk	Tue Jun 18 08:07:48 2013 -0500
+++ b/make/sun/cmm/lcms/FILES_c_windows.gmk	Fri Jun 28 03:39:42 2013 +0100
@@ -30,6 +30,7 @@
     cmserr.c \
     cmsgamma.c \
     cmsgmt.c \
+    cmshalf.c \
     cmsintrp.c \
     cmsio0.c \
     cmsio1.c \
diff -r 4a67dd684bc2 -r b1fbc0b7887c make/sun/javazic/tzdata/VERSION
--- a/make/sun/javazic/tzdata/VERSION	Tue Jun 18 08:07:48 2013 -0500
+++ b/make/sun/javazic/tzdata/VERSION	Fri Jun 28 03:39:42 2013 +0100
@@ -21,4 +21,4 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-tzdata2011l
+tzdata2013b
diff -r 4a67dd684bc2 -r b1fbc0b7887c make/sun/javazic/tzdata/africa
--- a/make/sun/javazic/tzdata/africa	Tue Jun 18 08:07:48 2013 -0500
+++ b/make/sun/javazic/tzdata/africa	Fri Jun 28 03:39:42 2013 +0100
@@ -22,15 +22,14 @@
 # questions.
 #
 # 
-# @(#)africa	8.33
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
-# tz at elsie.nci.nih.gov for general use in the future).
+# tz at iana.org for general use in the future).
 
-# From Paul Eggert (2006-03-22):
+# From Paul Eggert (2013-02-21):
 #
 # A good source for time zone historical data outside the U.S. is
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
@@ -49,6 +48,10 @@
 # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
 # I found in the UCLA library.
 #
+# For data circa 1899, a common source is:
+# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+# .
+#
 # A reliable and entertaining source about time zones is
 # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
 #
@@ -140,8 +143,12 @@
 			1:00	-	WAT
 
 # Botswana
+# From Paul Eggert (2013-02-21):
+# Milne says they were regulated by the Cape Town Signal in 1899;
+# assume they switched to 2:00 when Cape Town did.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Gaborone	1:43:40 -	LMT	1885
+			1:30	-	SAST	1903 Mar
 			2:00	-	CAT	1943 Sep 19 2:00
 			2:00	1:00	CAST	1944 Mar 19 2:00
 			2:00	-	CAT
@@ -213,6 +220,11 @@
 
 # Egypt
 
+# Milne says Cairo used 2:05:08.9, the local mean time of the Abbasizeh
+# observatory; round to nearest.  Milne also says that the official time for
+# Egypt was mean noon at the Great Pyramid, 2:04:30.5, but apparently this
+# did not apply to Cairo, Alexandria, or Port Said.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Egypt	1940	only	-	Jul	15	0:00	1:00	S
 Rule	Egypt	1940	only	-	Oct	 1	0:00	0	-
@@ -261,7 +273,7 @@
 # I received a mail from an airline which says that the daylight
 # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
 # From Jesper Norgaard Welen (2007-08-15): [The following agree:]
-# http://www.nentjes.info/Bill/bill5.htm 
+# http://www.nentjes.info/Bill/bill5.htm
 # http://www.timeanddate.com/worldclock/city.html?n=53
 # From Steffen Thorsen (2007-09-04): The official information...:
 # http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm
@@ -315,18 +327,18 @@
 # in September.
 
 # From Steffen Thorsen (2009-08-11):
-# We have been able to confirm the August change with the Egyptian Cabinet 
+# We have been able to confirm the August change with the Egyptian Cabinet
 # Information and Decision Support Center:
 # 
 # http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
 # 
-# 
+#
 # The Middle East News Agency
 # 
 # http://www.mena.org.eg/index.aspx
 # 
 # also reports "Egypt starts winter time on August 21"
-# today in article numbered "71, 11/08/2009 12:25 GMT." 
+# today in article numbered "71, 11/08/2009 12:25 GMT."
 # Only the title above is available without a subscription to their service,
 # and can be found by searching for "winter" in their search engine
 # (at least today).
@@ -353,7 +365,7 @@
 Rule	Egypt	2010	only	-	Sep	lastThu	23:00s	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Cairo	2:05:00 -	LMT	1900 Oct
+Zone	Africa/Cairo	2:05:09 -	LMT	1900 Oct
 			2:00	Egypt	EE%sT
 
 # Equatorial Guinea
@@ -448,6 +460,20 @@
 
 # Libya
 
+# From Even Scharning (2012-11-10):
+# Libya set their time one hour back at 02:00 on Saturday November 10.
+# http://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/
+# Here is an official source [in Arabic]: http://ls.ly/fb6Yc
+#
+# Steffen Thorsen forwarded a translation (2012-11-10) in
+# http://mm.icann.org/pipermail/tz/2012-November/018451.html
+#
+# From Tim Parenti (2012-11-11):
+# Treat the 2012-11-10 change as a zone change from UTC+2 to UTC+1.
+# The DST rules planned for 2013 and onward roughly mirror those of Europe
+# (either two days before them or five days after them, so as to fall on
+# lastFri instead of lastSun).
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Libya	1951	only	-	Oct	14	2:00	1:00	S
 Rule	Libya	1952	only	-	Jan	 1	0:00	0	-
@@ -462,17 +488,21 @@
 Rule	Libya	1986	only	-	Oct	 3	0:00	0	-
 Rule	Libya	1987	1989	-	Apr	 1	0:00	1:00	S
 Rule	Libya	1987	1989	-	Oct	 1	0:00	0	-
+Rule	Libya	1997	only	-	Apr	 4	0:00	1:00	S
+Rule	Libya	1997	only	-	Oct	 4	0:00	0	-
+Rule	Libya	2013	max	-	Mar	lastFri	1:00	1:00	S
+Rule	Libya	2013	max	-	Oct	lastFri	2:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Tripoli	0:52:44 -	LMT	1920
 			1:00	Libya	CE%sT	1959
 			2:00	-	EET	1982
 			1:00	Libya	CE%sT	1990 May  4
-# The following entries are from Shanks & Pottenger;
+# The 1996 and 1997 entries are from Shanks & Pottenger;
 # the IATA SSIM data contain some obvious errors.
 			2:00	-	EET	1996 Sep 30
-			1:00	-	CET	1997 Apr  4
-			1:00	1:00	CEST	1997 Oct  4
-			2:00	-	EET
+			1:00	Libya	CE%sT	1997 Oct  4
+			2:00	-	EET	2012 Nov 10 2:00
+			1:00	Libya	CE%sT
 
 # Madagascar
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -505,7 +535,7 @@
 # From Steffen Thorsen (2008-06-25):
 # Mauritius plans to observe DST from 2008-11-01 to 2009-03-31 on a trial
 # basis....
-# It seems that Mauritius observed daylight saving time from 1982-10-10 to 
+# It seems that Mauritius observed daylight saving time from 1982-10-10 to
 # 1983-03-20 as well, but that was not successful....
 # http://www.timeanddate.com/news/time/mauritius-daylight-saving-time.html
 
@@ -529,12 +559,12 @@
 # than previously announced (2008-11-01 to 2009-03-31).  The new start
 # date is 2008-10-26 at 02:00 and the new end date is 2009-03-27 (no time
 # given, but it is probably at either 2 or 3 wall clock time).
-# 
-# A little strange though, since the article says that they moved the date 
-# to align itself with Europe and USA which also change time on that date, 
-# but that means they have not paid attention to what happened in 
-# USA/Canada last year (DST ends first Sunday in November). I also wonder 
-# why that they end on a Friday, instead of aligning with Europe which 
+#
+# A little strange though, since the article says that they moved the date
+# to align itself with Europe and USA which also change time on that date,
+# but that means they have not paid attention to what happened in
+# USA/Canada last year (DST ends first Sunday in November). I also wonder
+# why that they end on a Friday, instead of aligning with Europe which
 # changes two days later.
 
 # From Alex Krivenyshev (2008-07-11):
@@ -593,7 +623,7 @@
 # 
 
 # From Arthur David Olson (2009-07-11):
-# The "mauritius-dst-will-not-repeat" wrapup includes this: 
+# The "mauritius-dst-will-not-repeat" wrapup includes this:
 # "The trial ended on March 29, 2009, when the clocks moved back by one hour
 # at 2am (or 02:00) local time..."
 
@@ -687,8 +717,8 @@
 # XXX--guess that it is only Morocco for now; guess only 2008 for now.
 
 # From Steffen Thorsen (2008-08-27):
-# Morocco will change the clocks back on the midnight between August 31 
-# and September 1. They originally planned to observe DST to near the end 
+# Morocco will change the clocks back on the midnight between August 31
+# and September 1. They originally planned to observe DST to near the end
 # of September:
 #
 # One article about it (in French):
@@ -791,6 +821,89 @@
 # wall clock time (i.e. 11pm UTC), but that's what I would assume. It has
 # also been like that in the past.
 
+# From Alexander Krivenyshev (2012-03-09):
+# According to Infomédiaire web site from Morocco (infomediaire.ma),
+# on March 9, 2012, (in French) Heure légale:
+# Le Maroc adopte officiellement l'heure d'été
+# 
+# http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9
+# 
+# Governing Council adopted draft decree, that Morocco DST starts on
+# the last Sunday of March (March 25, 2012) and ends on
+# last Sunday of September (September 30, 2012)
+# except the month of Ramadan.
+# or (brief)
+# 
+# http://www.worldtimezone.com/dst_news/dst_news_morocco06.html
+# 
+
+# From Arthur David Olson (2012-03-10):
+# The infomediaire.ma source indicates that the system is to be in
+# effect every year. It gives 03H00 as the "fall back" time of day;
+# it lacks a "spring forward" time of day; assume 2:00 XXX.
+# Wait on specifying the Ramadan exception for details about
+# start date, start time of day, end date, and end time of day XXX.
+
+# From Christophe Tropamer (2012-03-16):
+# Seen Morocco change again:
+# 
+# http://www.le2uminutes.com/actualite.php
+# 
+# "...à partir du dernier dimance d'avril et non fins mars,
+# comme annoncé précédemment."
+
+# From Milamber Space Network (2012-07-17):
+# The official return to GMT is announced by the Moroccan government:
+# 
+# http://www.mmsp.gov.ma/fr/actualites.aspx?id=288 [in French]
+# 
+#
+# Google translation, lightly edited:
+# Back to the standard time of the Kingdom (GMT)
+# Pursuant to Decree No. 2-12-126 issued on 26 Jumada (I) 1433 (April 18,
+# 2012) and in accordance with the order of Mr. President of the
+# Government No. 3-47-12 issued on 24 Sha'ban (11 July 2012), the Ministry
+# of Public Service and Administration Modernization announces the return
+# of the legal time of the Kingdom (GMT) from Friday, July 20, 2012 until
+# Monday, August 20, 2012.  So the time will be delayed by 60 minutes from
+# 3:00 am Friday, July 20, 2012 and will again be advanced by 60 minutes
+# August 20, 2012 from 2:00 am.
+
+# From Paul Eggert (2013-03-06):
+# Morocco's daylight-saving transitions due to Ramadan seem to be
+# announced a bit in advance.  On 2012-07-11 the Moroccan government
+# announced that year's Ramadan daylight-saving transitions would be
+# 2012-07-20 and 2012-08-20; see
+# .
+#
+# To estimate what the Moroccan government will do in future years,
+# transition dates for 2013 through 2021 were determined by running
+# the following program under GNU Emacs 24.3:
+#
+# (let ((islamic-year 1434))
+#   (while (< islamic-year 1444)
+#     (let ((a
+#	     (calendar-gregorian-from-absolute
+#	      (calendar-islamic-to-absolute (list 9 1 islamic-year))))
+#	    (b
+#	     (calendar-gregorian-from-absolute
+#	      (calendar-islamic-to-absolute (list 10 1 islamic-year)))))
+#	(insert
+#	 (format
+#	  (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 3:00\t0\t-\n"
+#		  "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 2:00\t1:00\tS\n")
+#	  (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
+#	  (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
+#     (setq islamic-year (+ 1 islamic-year))))
+#
+# with the results hand-edited for 2020-2022, when the normal spring-forward
+# date falls during the estimated Ramadan.
+#
+# From 2023 through 2038 Ramadan is not predicted to overlap with
+# daylight saving time.  Starting in 2039 there will be overlap again,
+# but 32-bit time_t values roll around in 2038 so for now do not worry
+# about dates after 2038.
+
 # RULE	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 
 Rule	Morocco	1939	only	-	Sep	12	 0:00	1:00	S
@@ -816,6 +929,29 @@
 Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
 Rule	Morocco	2011	only	-	Apr	 3	 0:00	1:00	S
 Rule	Morocco	2011	only	-	Jul	 31	 0	0	-
+Rule	Morocco	2012	2019	-	Apr	 lastSun 2:00	1:00	S
+Rule	Morocco	2012	max	-	Sep	 lastSun 3:00	0	-
+Rule	Morocco	2012	only	-	Jul	 20	 3:00	0	-
+Rule	Morocco	2012	only	-	Aug	 20	 2:00	1:00	S
+Rule	Morocco	2013	only	-	Jul	  9	 3:00	0	-
+Rule	Morocco	2013	only	-	Aug	  8	 2:00	1:00	S
+Rule	Morocco	2014	only	-	Jun	 29	 3:00	0	-
+Rule	Morocco	2014	only	-	Jul	 29	 2:00	1:00	S
+Rule	Morocco	2015	only	-	Jun	 18	 3:00	0	-
+Rule	Morocco	2015	only	-	Jul	 18	 2:00	1:00	S
+Rule	Morocco	2016	only	-	Jun	  7	 3:00	0	-
+Rule	Morocco	2016	only	-	Jul	  7	 2:00	1:00	S
+Rule	Morocco	2017	only	-	May	 27	 3:00	0	-
+Rule	Morocco	2017	only	-	Jun	 26	 2:00	1:00	S
+Rule	Morocco	2018	only	-	May	 16	 3:00	0	-
+Rule	Morocco	2018	only	-	Jun	 15	 2:00	1:00	S
+Rule	Morocco	2019	only	-	May	  6	 3:00	0	-
+Rule	Morocco	2019	only	-	Jun	  5	 2:00	1:00	S
+Rule	Morocco	2020	only	-	May	 24	 2:00	1:00	S
+Rule	Morocco	2021	only	-	May	 13	 2:00	1:00	S
+Rule	Morocco	2022	only	-	May	  3	 2:00	1:00	S
+Rule	Morocco	2023	max	-	Apr	 lastSun 2:00	1:00	S
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
 			 0:00	Morocco	WE%sT	1984 Mar 16
@@ -843,7 +979,7 @@
 # Forecasting Riaan van Zyl explained that the far eastern parts of
 # the country are close to 40 minutes earlier in sunrise than the rest
 # of the country.
-# 
+#
 # From Paul Eggert (2007-03-31):
 # Apparently the Caprivi Strip informally observes Botswana time, but
 # we have no details.  In the meantime people there can use Africa/Gaborone.
diff -r 4a67dd684bc2 -r b1fbc0b7887c make/sun/javazic/tzdata/antarctica
--- a/make/sun/javazic/tzdata/antarctica	Tue Jun 18 08:07:48 2013 -0500
+++ b/make/sun/javazic/tzdata/antarctica	Fri Jun 28 03:39:42 2013 +0100
@@ -22,7 +22,6 @@
 # questions.
 #
 # 
-# @(#)antarctica	8.9
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -65,8 +64,17 @@
 Rule	ChileAQ	1998	only	-	Mar	Sun>=9	3:00u	0	-
 Rule	ChileAQ	1998	only	-	Sep	27	4:00u	1:00	S
 Rule	ChileAQ	1999	only	-	Apr	 4	3:00u	0	-
-Rule	ChileAQ	1999	max	-	Oct	Sun>=9	4:00u	1:00	S
-Rule	ChileAQ	2000	max	-	Mar	Sun>=9	3:00u	0	-
+Rule	ChileAQ	1999	2010	-	Oct	Sun>=9	4:00u	1:00	S
+Rule	ChileAQ	2000	2007	-	Mar	Sun>=9	3:00u	0	-
+# N.B.: the end of March 29 in Chile is March 30 in Universal time,
+# which is used below in specifying the transition.
+Rule	ChileAQ	2008	only	-	Mar	30	3:00u	0	-
+Rule	ChileAQ	2009	only	-	Mar	Sun>=9	3:00u	0	-
+Rule	ChileAQ	2010	only	-	Apr	Sun>=1	3:00u	0	-
+Rule	ChileAQ	2011	only	-	May	Sun>=2	3:00u	0	-
+Rule	ChileAQ	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
+Rule	ChileAQ	2012	max	-	Apr	Sun>=23	3:00u	0	-
+Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u	1:00	S
 
 # These rules are stolen from the `australasia' file.
 Rule	AusAQ	1917	only	-	Jan	 1	0:01	1:00	-
@@ -165,12 +173,16 @@
 						# Western (Aus) Standard Time
 			11:00	-	CAST	2010 Mar 5 2:00
 						# Casey Time
+			8:00	-	WST	2011 Oct 28 2:00
+			11:00	-	CAST	2012 Feb 21 17:00u
 			8:00	-	WST
 Zone Antarctica/Davis	0	-	zzz	1957 Jan 13
 			7:00	-	DAVT	1964 Nov # Davis Time
 			0	-	zzz	1969 Feb
 			7:00	-	DAVT	2009 Oct 18 2:00
 			5:00	-	DAVT	2010 Mar 10 20:00u
+			7:00	-	DAVT	2011 Oct 28 2:00
+			5:00	-	DAVT	2012 Feb 21 20:00u
 			7:00	-	DAVT
 Zone Antarctica/Mawson	0	-	zzz	1954 Feb 13
 			6:00	-	MAWT	2009 Oct 18 2:00
diff -r 4a67dd684bc2 -r b1fbc0b7887c make/sun/javazic/tzdata/asia
--- a/make/sun/javazic/tzdata/asia	Tue Jun 18 08:07:48 2013 -0500
+++ b/make/sun/javazic/tzdata/asia	Fri Jun 28 03:39:42 2013 +0100
@@ -21,15 +21,15 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-# @(#)asia	8.68
+# 
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
-# tz at elsie.nci.nih.gov for general use in the future).
+# tz at iana.org for general use in the future).
 
-# From Paul Eggert (2006-03-22):
+# From Paul Eggert (2013-02-21):
 #
 # A good source for time zone historical data outside the U.S. is
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
@@ -48,6 +48,10 @@
 # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
 # I found in the UCLA library.
 #


From andrew at icedtea.classpath.org  Thu Jun 27 22:45:38 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Fri, 28 Jun 2013 05:45:38 +0000
Subject: /hg/release/icedtea7-2.1: 3 new changesets
Message-ID: 

changeset 3c893cdacaca in /hg/release/icedtea7-2.1
details: http://icedtea.classpath.org/hg/release/icedtea7-2.1?cmd=changeset;node=3c893cdacaca
author: Andrew John Hughes 
date: Fri Jun 28 06:29:04 2013 +0100

	Bring in latest security patches and backports from u25.

	2013-06-27  Andrew John Hughes  

		* Makefile.am,
		(HOTSPOT_CHANGESET): Update to IcedTea7 2.1.9 tag,
		bringing in latest security patches.
		(CORBA_CHANGESET): Likewise.
		(JAXWS_CHANGESET): Likewise.
		(JDK_CHANGESET): Likewise.
		(LANGTOOLS_CHANGESET): Likewise.
		(HOTSPOT_SHA256SUM): Likewise.
		(CORBA_SHA256SUM): Likewise.
		(JAXWS_SHA256SUM): Likewise.
		(JDK_SHA256SUM): Likewise.
		(LANGTOOLS_SHA256SUM): Likewise.
		* patches/boot/ecj-diamond.patch,
		* patches/boot/ecj-multicatch.patch:
		Add new cases.
		* patches/boot/ecj-stringswitch.patch:
		Update MethodHandleNatives patch, including
		adding new case.
		* patches/boot/tobin.patch:
		Update following move from sun.awt.X11
		to sun.awt.


changeset 9dc11e85ebfe in /hg/release/icedtea7-2.1
details: http://icedtea.classpath.org/hg/release/icedtea7-2.1?cmd=changeset;node=9dc11e85ebfe
author: Andrew John Hughes 
date: Fri Jun 28 06:43:49 2013 +0100

	Add latest security fixes and other updates to NEWS.

	2013-06-27  Andrew John Hughes  

		* NEWS: Add latest security fixes and other
		changes found in 7u25.


changeset 7e0b337628c1 in /hg/release/icedtea7-2.1
details: http://icedtea.classpath.org/hg/release/icedtea7-2.1?cmd=changeset;node=7e0b337628c1
author: Andrew John Hughes 
date: Fri Jun 28 06:45:21 2013 +0100

	Add Red Hat bugzilla references to NEWS.

	2013-06-25  Andrew John Hughes  

		* NEWS: Add Red Hat bugzilla references.


diffstat:

 ChangeLog                           |   33 +++++
 Makefile.am                         |   20 +-
 NEWS                                |  116 +++++++++++++++++++-
 patches/boot/ecj-diamond.patch      |   60 ++++++++++
 patches/boot/ecj-multicatch.patch   |   51 ++++++++
 patches/boot/ecj-stringswitch.patch |  209 ++++++++++++++++++-----------------
 patches/boot/tobin.patch            |   38 +++--
 7 files changed, 399 insertions(+), 128 deletions(-)

diffs (truncated from 681 to 500 lines):

diff -r 578209f3f761 -r 7e0b337628c1 ChangeLog
--- a/ChangeLog	Tue May 28 12:05:24 2013 +0100
+++ b/ChangeLog	Fri Jun 28 06:45:21 2013 +0100
@@ -1,3 +1,36 @@
+2013-06-25  Andrew John Hughes  
+
+	* NEWS: Add Red Hat bugzilla references.
+
+2013-06-27  Andrew John Hughes  
+
+	* NEWS: Add latest security fixes and other
+	changes found in 7u25.
+
+2013-06-27  Andrew John Hughes  
+
+	* Makefile.am,
+	(HOTSPOT_CHANGESET): Update to IcedTea7 2.1.9 tag,
+	bringing in latest security patches.
+	(CORBA_CHANGESET): Likewise.
+	(JAXWS_CHANGESET): Likewise.
+	(JDK_CHANGESET): Likewise.
+	(LANGTOOLS_CHANGESET): Likewise.
+	(HOTSPOT_SHA256SUM): Likewise.
+	(CORBA_SHA256SUM): Likewise.
+	(JAXWS_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	(LANGTOOLS_SHA256SUM): Likewise.
+	* patches/boot/ecj-diamond.patch,
+	* patches/boot/ecj-multicatch.patch:
+	Add new cases.
+	* patches/boot/ecj-stringswitch.patch:
+	Update MethodHandleNatives patch, including
+	adding new case.
+	* patches/boot/tobin.patch:
+	Update following move from sun.awt.X11
+	to sun.awt.
+
 2013-05-10  Andrew John Hughes  
 
 	* Makefile.am,
diff -r 578209f3f761 -r 7e0b337628c1 Makefile.am
--- a/Makefile.am	Tue May 28 12:05:24 2013 +0100
+++ b/Makefile.am	Fri Jun 28 06:45:21 2013 +0100
@@ -4,20 +4,20 @@
 JDK_UPDATE_VERSION = 03
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
 
-HOTSPOT_CHANGESET = b965a723122e
-CORBA_CHANGESET = 2302bd5191fe
+HOTSPOT_CHANGESET = 0d81d5904952
+CORBA_CHANGESET = ce773a499f3a
 JAXP_CHANGESET = 2c3bc21169f9
-JAXWS_CHANGESET = 3b68ea3b56d8
-JDK_CHANGESET = 2c423d0b1965
-LANGTOOLS_CHANGESET = 9a3628594576
+JAXWS_CHANGESET = 3532f4415fd5
+JDK_CHANGESET = 1e74b61253eb
+LANGTOOLS_CHANGESET = 26a29796b374
 OPENJDK_CHANGESET = 34d809e0dba3
 
-HOTSPOT_SHA256SUM = 43a5529b36cf619199e45832dead0c6b1841337b6416b0123b807e7312cb1912
-CORBA_SHA256SUM = 13691bea9f5b448da3e18307b3ec7d1e7fb984b5d590fcf8e350101fa67106df
+HOTSPOT_SHA256SUM = a5a609a3600f474a2333b3f3c3dda735d18f8b8d67e8bdeb33f70d14abc0cdfc
+CORBA_SHA256SUM = f1d65cade883bca6b30d720aac482bf6a00513f90b4f97729b91ce5a95416c5f
 JAXP_SHA256SUM = 244aab62b946361e6442b63acc91fd209829946daed2dc1ee0c1c3e256bf9c29
-JAXWS_SHA256SUM = 96ff4f30736a5d329cf236a6c53d9d1f30c251bd59a698cfcbe36d8803782fd0
-JDK_SHA256SUM = b5c8a00886725a7cc6c764b3d44ff1382f5942c8a4f8a3e2046e4af971fcfae2
-LANGTOOLS_SHA256SUM = e6bf6b4dae96b4b2517aa1847dc21b91d0cd0048f6b47479ab8e50263bf8e519
+JAXWS_SHA256SUM = f0508540402a4bf4e95418bf52267430723fbc7ed383bd70e37b56d5efb8ac1d
+JDK_SHA256SUM = 391589f95d105a7237d4394b3d8fb8a02adbce27463dbf8631222c492505e24f
+LANGTOOLS_SHA256SUM = 3172d59a6bc307a9429665cdcb8026f098ccf7c160e448f0f2df0e0353375f87
 OPENJDK_SHA256SUM = f213703df7c2331826c1b8e35fed7079d1b21fe6b8210fdb108f8bacc42e714f
 
 CACAO_VERSION = a567bcb7f589
diff -r 578209f3f761 -r 7e0b337628c1 NEWS
--- a/NEWS	Tue May 28 12:05:24 2013 +0100
+++ b/NEWS	Fri Jun 28 06:45:21 2013 +0100
@@ -10,12 +10,126 @@
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
-New in release 2.1.9 (2013-06-02):
+New in release 2.1.9 (2013-06-XX):
 
+* New features
+  - PR1378: Add AArch64 support to Zero
+* Security fixes
+  - S6741606, CVE-2013-2407: Integrate Apache Santuario
+  - S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls
+  - S7170730, CVE-2013-2451: Improve Windows network stack support.
+  - S8000638, CVE-2013-2450: Improve deserialization
+  - S8000642, CVE-2013-2446: Better handling of objects for transportation
+  - S8001032: Restrict object access
+  - S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers
+  - S8001034, CVE-2013-1500: Memory management improvements
+  - S8001038, CVE-2013-2444: Resourcefully handle resources
+  - S8001043: Clarify definition restrictions
+  - S8001308: Update display of applet windows
+  - S8001309: Better handling of annotation interfaces
+  - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost
+  - S8003703, CVE-2013-2412: Update RMI connection dialog box
+  - S8004288, CVE-2013-2449: (fs) Files.probeContentType problems
+  - S8004584: Augment applet contextualization
+  - S8005007: Better glyph processing
+  - S8006328, CVE-2013-2448: Improve robustness of sound classes
+  - S8006611: Improve scripting
+  - S8007467: Improve robustness of JMX internal APIs
+  - S8007471: Improve MBean notifications
+  - S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes
+  - S8007925: Improve cmsStageAllocLabV2ToV4curves
+  - S8007926: Improve cmsPipelineDup
+  - S8007927: Improve cmsAllocProfileSequenceDescription
+  - S8007929: Improve CurvesAlloc
+  - S8008120, CVE-2013-2457: Improve JMX class checking
+  - S8008124, CVE-2013-2453: Better compliance testing
+  - S8008128: Better API coherence for JMX
+  - S8008132, CVE-2013-2456: Better serialization support
+  - S8008585: Better JMX data handling
+  - S8008593: Better URLClassLoader resource management
+  - S8008603: Improve provision of JMX providers
+  - S8008607: Better input checking in JMX
+  - S8008611: Better handling of annotations in JMX
+  - S8008615: Improve robustness of JMX internal APIs
+  - S8008623: Better handling of MBeanServers
+  - S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606
+  - S8008982: Adjust JMX for underlying interface changes
+  - S8009004: Better implementation of RMI connections
+  - S8009008: Better manage management-api
+  - S8009013: Better handling of T2K glyphs
+  - S8009034: Improve resulting notifications in JMX
+  - S8009038: Improve JMX notification support
+  - S8009057, CVE-2013-2448: Improve MIDI event handling
+  - S8009067: Improve storing keys in KeyStore
+  - S8009071, CVE-2013-2459: Improve shape handling
+  - S8009235: Improve handling of TSA data
+  - S8009424, CVE-2013-2458: Adapt Nashorn to JSR-292 implementation change
+  - S8009554, CVE-2013-2454: Improve SerialJavaObject.getFields
+  - S8009654: Improve stability of cmsnamed
+  - S8010209, CVE-2013-2460: Better provision of factories
+  - S8011243, CVE-2013-2470: Improve ImagingLib
+  - S8011248, CVE-2013-2471: Better Component Rasters
+  - S8011253, CVE-2013-2472: Better Short Component Rasters
+  - S8011257, CVE-2013-2473: Better Byte Component Rasters
+  - S8012375, CVE-2013-1571: Improve Javadoc framing
+  - S8012421: Better positioning of PairPositioning
+  - S8012438, CVE-2013-2463: Better image validation
+  - S8012597, CVE-2013-2465: Better image channel verification
+  - S8012601, CVE-2013-2469: Better validation of image layouts
+  - S8014281, CVE-2013-2461: Better checking of XML signature
+  - S8015997: Additional improvement in Javadoc framing
 * Backports
   - S7171223, RH967436: Building ExtensionSubtables.cpp should use -fno-strict-aliasing
+  - S7053526: Upgrade JDK 8 to use Little CMS 2.4
+  - S7077803: java.lang.InternalError in java.lang.invoke.MethodHandleNatives.init
+  - S7124347: [macosx] java.lang.InternalError: not implemented yet on call Graphics2D.drawRenderedImage
+  - S7142596: RMI JPRT tests are failing
+  - S7151434, RH969884: java -jar -XX crashes java launcher
+  - S7158483: (tz) Support tzdata2012c
+  - S7188114: (launcher) need an alternate command line parser for Windows
+  - S7195301: XML Signature DOM implementation should not use instanceof to determine type of Node
+  - S7198570: (tz) Support tzdata2012f
+  - S7199143: RFE: OCSP revocation checker should provide possibility to specify connection timeout
+  - S8002070: Remove the stack search for a resource bundle for Logger to use
+  - S8002225: (tz) Support tzdata2012i
+  - S8006120: Provide "Server JRE" for 7u train
+  - S8006536: [launcher]  removes trailing slashes on arguments
+  - S8009165: Fix for 8006435 needs revision
+  - S8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03
+  - S8009463: Regression test test\java\lang\Runtime\exec\ArgWithSpaceAndFinalBackslash.java failing.
+  - S8009610: Blacklist certificate used with malware.
+  - S8009987: (tz) Support tzdata2013b
+  - S8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail
+  - S8010118: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive
+  - S8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build
+  - S8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod
+  - S8010727: WLS fails to add a logger with "" in its own LogManager subclass instance
+  - S8010939: Deadlock in LogManager
+  - S8011139: (reflect) Revise checking in getEnclosingClass
+  - S8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows
+  - S8011313: OCSP timeout set to wrong value if com.sun.security.ocsp.timeout not defined
+  - S8011557: Improve reflection utility classes
+  - S8011806: 7u25-b05 hotspot fastdebug build failure
+  - S8011990: TEST_BUG: java/util/logging/bundlesearch/ResourceBundleSearchTest.java fails on Windows
+  - S8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05
+  - S8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris
+  - S8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21
+  - S8012453: (process) Runtime.exec(String) fails if command contains spaces [win]
+  - S8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer
+  - S8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07
+  - S8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext()
+  - S8013228: Create new system properties to control allowable OCSP clock skew and CRL connection timeout
+  - S8013380: Removal of stack walk to find resource bundle breaks Glassfish startup
+  - S8014205: Most of the Swing dialogs are blank on one win7 MUI
+  - S8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09
+  - S8014618, RH868136: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement
+  - S8014676: Java debugger may fail to run
+  - S8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10
+  - S8014745: Provide a switch to allow stack walk search of resource bundle
+  - S8014968: OCSP and CRL connection timeout is set to four hours by default
 * Bug fixes
   - PR1095, PR1409: Allow -Werror to be turned off (HotSpot repository only).
+  - PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on armel
 
 New in release 2.1.8 (2013-05-02):
 
diff -r 578209f3f761 -r 7e0b337628c1 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch	Tue May 28 12:05:24 2013 +0100
+++ b/patches/boot/ecj-diamond.patch	Fri Jun 28 06:45:21 2013 +0100
@@ -6081,3 +6081,63 @@
  
      /**
       * Checks if a certificate is untrusted.
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java	2013-06-27 16:06:42.289384018 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java	2013-06-27 16:07:06.489768521 +0100
+@@ -1164,7 +1164,7 @@
+             end = end.getSuperclass();
+         }
+ 
+-        HashSet oscNames = new HashSet<>(3);
++        HashSet oscNames = new HashSet(3);
+ 
+         for (ObjectStreamClass d = this; d != null; d = d.superDesc) {
+             if (oscNames.contains(d.name)) {
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java	2013-06-27 16:06:53.297558922 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java	2013-06-27 16:07:32.294178507 +0100
+@@ -106,7 +106,7 @@
+      * Note that this only applies to createFont() from an InputStream object.
+      */
+     private static class TempFileDeletionHook {
+-        private static HashMap files = new HashMap<>();
++        private static HashMap files = new HashMap();
+ 
+         private static Thread t = null;
+         static void init() {
+diff --git a/src/share/classes/com/sun/media/sound/AbstractLine.java b/src/share/classes/com/sun/media/sound/AbstractLine.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java
++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java
+@@ -54,7 +54,7 @@
+      * Contains event dispatcher per thread group.
+      */
+     private static final Map dispatchers =
+-            new WeakHashMap<>();
++      new WeakHashMap();
+ 
+     /**
+      * Constructs a new AbstractLine.
+diff --git a/src/share/classes/com/sun/media/sound/RealTimeSequencer.java b/src/share/classes/com/sun/media/sound/RealTimeSequencer.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java
++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java
+@@ -59,7 +59,7 @@
+      * dispatcher instance with a factory in EventDispatcher
+      */
+     private static final Map dispatchers =
+-            new WeakHashMap<>();
++      new WeakHashMap();
+ 
+     /**
+      * All RealTimeSequencers share this info object.
+diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java
+--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java	2013-06-27 20:05:19.200970932 +0100
++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java	2013-06-27 20:05:33.857203747 +0100
+@@ -113,7 +113,7 @@
+             SocketAddress[] saa)
+     {
+          SecurityManager sm = System.getSecurityManager();
+-         Set set = new HashSet<>(saa.length);
++         Set set = new HashSet(saa.length);
+          for (SocketAddress sa : saa) {
+              set.add(getRevealedLocalAddress(sa, sm));
+          }
diff -r 578209f3f761 -r 7e0b337628c1 patches/boot/ecj-multicatch.patch
--- a/patches/boot/ecj-multicatch.patch	Tue May 28 12:05:24 2013 +0100
+++ b/patches/boot/ecj-multicatch.patch	Fri Jun 28 06:45:21 2013 +0100
@@ -145,3 +145,54 @@
              throw new RuntimeException(
                          "Incorrect untrusted certificate: " + alias, e);
          }
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java	2013-06-27 15:56:57.456088537 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java	2013-06-27 16:02:12.857102777 +0100
+@@ -402,7 +402,13 @@
+                         try {
+                             ServerNotifForwarder.checkMBeanPermission(this.mBeanServer,
+                                                       candidate.getObjectName(),"addNotificationListener");
+-                        } catch (InstanceNotFoundException | SecurityException e) {
++                        } catch (InstanceNotFoundException e) {
++                            if (logger.debugOn()) {
++                                logger.debug("fetchNotifications", "candidate: " + candidate + " skipped. exception " + e);
++                            }
++                            ++nextSeq;
++                            continue;
++                        } catch (SecurityException e) {
+                             if (logger.debugOn()) {
+                                 logger.debug("fetchNotifications", "candidate: " + candidate + " skipped. exception " + e);
+                             }
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java	2013-06-27 15:56:27.295609027 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java	2013-06-27 16:00:59.631938678 +0100
+@@ -1024,10 +1024,10 @@
+                                      dir,
+                                      redirects,
+                                      redirectErrorStream);
+-        } catch (IOException | IllegalArgumentException e) {
++        } catch (IOException e) {
+             String exceptionInfo = ": " + e.getMessage();
+             Throwable cause = e;
+-            if ((e instanceof IOException) && security != null) {
++            if (security != null) {
+                 // Can not disclose the fail reason for read-protected files.
+                 try {
+                     security.checkRead(prog);
+@@ -1039,6 +1039,16 @@
+             // It's much easier for us to create a high-quality error
+             // message than the low-level C code which found the problem.
+             throw new IOException(
++                "Cannot run program \"" + prog + "\""
++                + (dir == null ? "" : " (in directory \"" + dir + "\")")
++                + exceptionInfo,
++                cause);
++        } catch (IllegalArgumentException e) {
++            String exceptionInfo = ": " + e.getMessage();
++            Throwable cause = e;
++            // It's much easier for us to create a high-quality error
++            // message than the low-level C code which found the problem.
++            throw new IOException(
+                 "Cannot run program \"" + prog + "\""
+                 + (dir == null ? "" : " (in directory \"" + dir + "\")")
+                 + exceptionInfo,
diff -r 578209f3f761 -r 7e0b337628c1 patches/boot/ecj-stringswitch.patch
--- a/patches/boot/ecj-stringswitch.patch	Tue May 28 12:05:24 2013 +0100
+++ b/patches/boot/ecj-stringswitch.patch	Fri Jun 28 06:45:21 2013 +0100
@@ -302,59 +302,29 @@
  
                  throw new IllegalArgumentException(
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java	2013-01-14 22:25:02.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java	2013-01-15 02:19:34.315049222 +0000
-@@ -411,111 +411,106 @@
-     static boolean isCallerSensitive(MemberName mem) {
-         if (!mem.isInvocable())  return false;  // fields are not caller sensitive
-         Class defc = mem.getDeclaringClass();
--        switch (mem.getName()) {
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java	2013-06-21 21:46:14.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java	2013-06-26 02:23:21.025257579 +0100
+@@ -421,110 +421,105 @@
+     // this method is also called by test/sun/reflect/CallerSensitiveFinder
+     // to validate the hand-maintained list
+     private static boolean isCallerSensitiveMethod(Class defc, String method) {
+-        switch (method) {
 -        case "doPrivileged":
 -        case "doPrivilegedWithCombiner":
-+	String memName = mem.getName();
-+	if ("doPrivileged".equals(memName) ||
-+	    "doPrivilegedWithCombiner".equals(memName)) {
++	if ("doPrivileged".equals(method) ||
++	    "doPrivilegedWithCombiner".equals(method)) {
              return defc == java.security.AccessController.class;
 -        case "checkMemberAccess":
-+	} else if ("checkMemberAccess".equals(memName)) {
-             return canBeCalledVirtual(mem, java.lang.SecurityManager.class);
++	} else if ("checkMemberAccess".equals(method)) {
+             return defc == java.lang.SecurityManager.class;
 -        case "getUnsafe":
-+        } else if ("getUnsafe".equals(memName)) {
++        } else if ("getUnsafe".equals(method)) {
              return defc == sun.misc.Unsafe.class;
 -        case "lookup":
-+	} else if ("lookup".equals(memName)) {
++	} else if ("lookup".equals(method)) {
              return defc == java.lang.invoke.MethodHandles.class;
--        case "findStatic":
--        case "findVirtual":
--        case "findConstructor":
--        case "findSpecial":
--        case "findGetter":
--        case "findSetter":
--        case "findStaticGetter":
--        case "findStaticSetter":
--        case "bind":
--        case "unreflect":
--        case "unreflectSpecial":
--        case "unreflectConstructor":
--        case "unreflectGetter":
--        case "unreflectSetter":
-+	} else if ("findStatic".equals(memName) ||
-+		   "findVirtual".equals(memName) || 
-+		   "findConstructor".equals(memName) ||
-+		   "findSpecial".equals(memName) ||
-+		   "findGetter".equals(memName) ||
-+		   "findSetter".equals(memName) ||
-+		   "findStaticGetter".equals(memName) ||
-+		   "findStaticSetter".equals(memName) ||
-+		   "bind".equals(memName) ||
-+		   "unreflect".equals(memName) ||
-+		   "unreflectSpecial".equals(memName) ||
-+		   "unreflectConstructor".equals(memName) ||
-+		   "unreflectGetter".equals(memName) ||
-+		   "unreflectSetter".equals(memName)) {
-             return defc == java.lang.invoke.MethodHandles.Lookup.class;
 -        case "invoke":
-+        } else if ("invoke".equals(memName)) {
++	} else if ("invoke".equals(method)) {
              return defc == java.lang.reflect.Method.class;
 -        case "get":
 -        case "getBoolean":
@@ -374,33 +344,37 @@
 -        case "setLong":
 -        case "setFloat":
 -        case "setDouble":
-+	} else if ("get".equals(memName) ||
-+		   "getBoolean".equals(memName) ||
-+		   "getByte".equals(memName) ||
-+		   "getChar".equals(memName) ||
-+		   "getShort".equals(memName) ||
-+		   "getInt".equals(memName) ||
-+		   "getFloat".equals(memName) ||
-+		   "getDouble".equals(memName) ||
-+		   "set".equals(memName) ||
-+		   "setBoolean".equals(memName) ||
-+		   "setByte".equals(memName) ||
-+		   "setChar".equals(memName) ||
-+		   "setShort".equals(memName) ||
-+		   "setInt".equals(memName) ||
-+		   "setLong".equals(memName) ||
-+		   "setFloat".equals(memName) ||
-+		   "setDouble".equals(memName)) {
++	} else if ("get".equals(method) ||
++		   "getBoolean".equals(method) ||
++		   "getByte".equals(method) ||
++		   "getChar".equals(method) ||
++		   "getShort".equals(method) ||
++		   "getInt".equals(method) ||
++		   "getLong".equals(method) ||
++		   "getFloat".equals(method) ||
++		   "getDouble".equals(method) ||
++		   "set".equals(method) ||
++		   "setBoolean".equals(method) ||
++		   "setByte".equals(method) ||
++		   "setChar".equals(method) ||
++		   "setShort".equals(method) ||
++		   "setInt".equals(method) ||
++		   "setLong".equals(method) ||
++		   "setFloat".equals(method) ||
++		   "setDouble".equals(method)) {
              return defc == java.lang.reflect.Field.class;
 -        case "newInstance":
-+	} else if ("newInstance".equals(memName)) {
++	} else if ("newInstance".equals(method)) {
              if (defc == java.lang.reflect.Constructor.class)  return true;
              if (defc == java.lang.Class.class)  return true;
 -            break;
+-        case "getFields":
++	} else if ("getFields".equals(method)) {
+             return defc == java.lang.Class.class ||
+                    defc == javax.sql.rowset.serial.SerialJavaObject.class;
 -        case "forName":
 -        case "getClassLoader":
 -        case "getClasses":
--        case "getFields":
 -        case "getMethods":
 -        case "getConstructors":
 -        case "getDeclaredClasses":
@@ -413,81 +387,114 @@
 -        case "getDeclaredField":
 -        case "getDeclaredMethod":
 -        case "getDeclaredConstructor":
-+	} else if ("forName".equals(memName) ||
-+		   "getClassLoader".equals(memName) ||
-+		   "getClasses".equals(memName) ||
-+		   "getFields".equals(memName) ||
-+		   "getMethods".equals(memName) ||
-+		   "getConstructors".equals(memName) ||
-+		   "getDeclaredClasses".equals(memName) ||
-+		   "getDeclaredFields".equals(memName) ||
-+		   "getDeclaredMethods".equals(memName) ||
-+		   "getDeclaredConstructors".equals(memName) ||
-+		   "getField".equals(memName) ||
-+		   "getMethod".equals(memName) ||
-+		   "getConstructor".equals(memName) ||
-+		   "getDeclaredField".equals(memName) ||
-+		   "getDeclaredMethod".equals(memName) ||
-+		   "getDeclaredConstructor".equals(memName)) {
+-        case "getEnclosingClass":
+-        case "getEnclosingMethod":
+-        case "getEnclosingConstructor":
++	} else if ("forName".equals(method) ||
++		   "getClassLoader".equals(method) ||
++		   "getClasses".equals(method) ||
++		   "getFields".equals(method) ||
++		   "getMethods".equals(method) ||
++		   "getConstructors".equals(method) ||
++		   "getDeclaredClasses".equals(method) ||
++		   "getDeclaredFields".equals(method) ||
++		   "getDeclaredMethods".equals(method) ||
++		   "getDeclaredConstructors".equals(method) ||
++		   "getField".equals(method) ||
++		   "getMethod".equals(method) ||
++		   "getConstructor".equals(method) ||


From andrew at icedtea.classpath.org  Thu Jun 27 22:46:04 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Fri, 28 Jun 2013 05:46:04 +0000
Subject: /hg/release/icedtea7-forest-2.1/hotspot: 2 new changesets
Message-ID: 

changeset f6369c9027ee in /hg/release/icedtea7-forest-2.1/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot?cmd=changeset;node=f6369c9027ee
author: andrew
date: Fri Jun 28 06:11:59 2013 +0100

	Removed tag icedtea-2.1.9


changeset 276c9267b136 in /hg/release/icedtea7-forest-2.1/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot?cmd=changeset;node=276c9267b136
author: andrew
date: Fri Jun 28 06:12:06 2013 +0100

	Added tag icedtea-2.1.9 for changeset 0d81d5904952


diffstat:

 .hgtags |  4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diffs (11 lines):

diff -r 4ec48beeb010 -r 276c9267b136 .hgtags
--- a/.hgtags	Fri Jun 28 03:33:52 2013 +0100
+++ b/.hgtags	Fri Jun 28 06:12:06 2013 +0100
@@ -231,3 +231,7 @@
 d8b22e079abeeca06fa7dc45b67e7fdf8da265e0 icedtea-2.1.7
 2c49817841014cca32279dc90a61654415a3391c icedtea-2.1.8
 8a0d63301cfd92e1ac89803ac443491b97668de3 icedtea-2.1.9
+8a0d63301cfd92e1ac89803ac443491b97668de3 icedtea-2.1.9
+0000000000000000000000000000000000000000 icedtea-2.1.9
+0000000000000000000000000000000000000000 icedtea-2.1.9
+0d81d590495238043ece3cb0782368f0e54a65d6 icedtea-2.1.9


From andrew at icedtea.classpath.org  Thu Jun 27 23:20:50 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Fri, 28 Jun 2013 06:20:50 +0000
Subject: /hg/release/icedtea7-2.3: Update Zero to HotSpot from imminent 2...
Message-ID: 

changeset 066d3181805f in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=066d3181805f
author: Andrew John Hughes 
date: Fri Jun 28 07:20:34 2013 +0100

	Update Zero to HotSpot from imminent 2.1.9 release.

	2013-06-28  Andrew John Hughes  

	        * NEWS: Mention that 8001330 is not in Zero.
	        * hotspot.map: Update Zero to 2.1.9.
	        * patches/boot/ecj-diamond.patch,
	        * patches/boot/ecj-multicatch.patch,
	        * patches/boot/ecj-stringswitch.patch:
	        Add new cases.


diffstat:

 ChangeLog                           |   9 +++++
 NEWS                                |   2 +-
 hotspot.map                         |   2 +-
 patches/boot/ecj-diamond.patch      |  60 +++++++++++++++++++++++++++++++++++++
 patches/boot/ecj-multicatch.patch   |  51 +++++++++++++++++++++++++++++++
 patches/boot/ecj-stringswitch.patch |  14 ++++++++
 6 files changed, 136 insertions(+), 2 deletions(-)

diffs (185 lines):

diff -r 26e811fe4d45 -r 066d3181805f ChangeLog
--- a/ChangeLog	Tue Jun 25 23:25:25 2013 -0500
+++ b/ChangeLog	Fri Jun 28 07:20:34 2013 +0100
@@ -1,3 +1,12 @@
+2013-06-28  Andrew John Hughes  
+
+	* NEWS: Mention that 8001330 is not in Zero.
+	* hotspot.map: Update Zero to 2.1.9.
+	* patches/boot/ecj-diamond.patch,
+	* patches/boot/ecj-multicatch.patch,
+	* patches/boot/ecj-stringswitch.patch:
+	Add new cases.
+
 2013-06-25  Andrew John Hughes  
 
 	* NEWS: Cleanup security issue duplication.
diff -r 26e811fe4d45 -r 066d3181805f NEWS
--- a/NEWS	Tue Jun 25 23:25:25 2013 -0500
+++ b/NEWS	Fri Jun 28 07:20:34 2013 +0100
@@ -26,7 +26,7 @@
   - S8001308: Update display of applet windows
   - S8001309: Better handling of annotation interfaces
   - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost
-  - S8001330, CVE-2013-2443: Improve on checking order
+  - S8001330, CVE-2013-2443: Improve on checking order (non-Zero builds only)
   - S8003703, CVE-2013-2412: Update RMI connection dialog box
   - S8004288, CVE-2013-2449: (fs) Files.probeContentType problems
   - S8004584: Augment applet contextualization
diff -r 26e811fe4d45 -r 066d3181805f hotspot.map
--- a/hotspot.map	Tue Jun 25 23:25:25 2013 -0500
+++ b/hotspot.map	Fri Jun 28 07:20:34 2013 +0100
@@ -1,3 +1,3 @@
 # version url changeset sha256sum
 default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 4e374ade4066 86c8ef401af20352c934a5a6330f41dc65e59b05e3d7875ff9a3476ad1a996a0
-zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot b965a723122e 43a5529b36cf619199e45832dead0c6b1841337b6416b0123b807e7312cb1912
+zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot 0d81d5904952 a5a609a3600f474a2333b3f3c3dda735d18f8b8d67e8bdeb33f70d14abc0cdfc
diff -r 26e811fe4d45 -r 066d3181805f patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch	Tue Jun 25 23:25:25 2013 -0500
+++ b/patches/boot/ecj-diamond.patch	Fri Jun 28 07:20:34 2013 +0100
@@ -6327,3 +6327,63 @@
          List threads = new ArrayList();
          for (int i = 0; i < threadCount; i++) {
              RandomCollector r = new RandomCollector();
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java	2013-06-27 16:06:42.289384018 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java	2013-06-27 16:07:06.489768521 +0100
+@@ -1164,7 +1164,7 @@
+             end = end.getSuperclass();
+         }
+ 
+-        HashSet oscNames = new HashSet<>(3);
++        HashSet oscNames = new HashSet(3);
+ 
+         for (ObjectStreamClass d = this; d != null; d = d.superDesc) {
+             if (oscNames.contains(d.name)) {
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java	2013-06-27 16:06:53.297558922 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java	2013-06-27 16:07:32.294178507 +0100
+@@ -106,7 +106,7 @@
+      * Note that this only applies to createFont() from an InputStream object.
+      */
+     private static class TempFileDeletionHook {
+-        private static HashMap files = new HashMap<>();
++        private static HashMap files = new HashMap();
+ 
+         private static Thread t = null;
+         static void init() {
+diff --git a/src/share/classes/com/sun/media/sound/AbstractLine.java b/src/share/classes/com/sun/media/sound/AbstractLine.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java
++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java
+@@ -54,7 +54,7 @@
+      * Contains event dispatcher per thread group.
+      */
+     private static final Map dispatchers =
+-            new WeakHashMap<>();
++      new WeakHashMap();
+ 
+     /**
+      * Constructs a new AbstractLine.
+diff --git a/src/share/classes/com/sun/media/sound/RealTimeSequencer.java b/src/share/classes/com/sun/media/sound/RealTimeSequencer.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java
++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java
+@@ -59,7 +59,7 @@
+      * dispatcher instance with a factory in EventDispatcher
+      */
+     private static final Map dispatchers =
+-            new WeakHashMap<>();
++      new WeakHashMap();
+ 
+     /**
+      * All RealTimeSequencers share this info object.
+diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java
+--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java	2013-06-27 20:05:19.200970932 +0100
++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java	2013-06-27 20:05:33.857203747 +0100
+@@ -113,7 +113,7 @@
+             SocketAddress[] saa)
+     {
+          SecurityManager sm = System.getSecurityManager();
+-         Set set = new HashSet<>(saa.length);
++         Set set = new HashSet(saa.length);
+          for (SocketAddress sa : saa) {
+              set.add(getRevealedLocalAddress(sa, sm));
+          }
diff -r 26e811fe4d45 -r 066d3181805f patches/boot/ecj-multicatch.patch
--- a/patches/boot/ecj-multicatch.patch	Tue Jun 25 23:25:25 2013 -0500
+++ b/patches/boot/ecj-multicatch.patch	Fri Jun 28 07:20:34 2013 +0100
@@ -233,3 +233,54 @@
              throw new InternalError(e.toString());
          } catch (InvocationTargetException e) {
              Throwable t = e.getCause();
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java	2013-06-27 15:56:57.456088537 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java	2013-06-27 16:02:12.857102777 +0100
+@@ -402,7 +402,13 @@
+                         try {
+                             ServerNotifForwarder.checkMBeanPermission(this.mBeanServer,
+                                                       candidate.getObjectName(),"addNotificationListener");
+-                        } catch (InstanceNotFoundException | SecurityException e) {
++                        } catch (InstanceNotFoundException e) {
++                            if (logger.debugOn()) {
++                                logger.debug("fetchNotifications", "candidate: " + candidate + " skipped. exception " + e);
++                            }
++                            ++nextSeq;
++                            continue;
++                        } catch (SecurityException e) {
+                             if (logger.debugOn()) {
+                                 logger.debug("fetchNotifications", "candidate: " + candidate + " skipped. exception " + e);
+                             }
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java	2013-06-27 15:56:27.295609027 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java	2013-06-27 16:00:59.631938678 +0100
+@@ -1024,10 +1024,10 @@
+                                      dir,
+                                      redirects,
+                                      redirectErrorStream);
+-        } catch (IOException | IllegalArgumentException e) {
++        } catch (IOException e) {
+             String exceptionInfo = ": " + e.getMessage();
+             Throwable cause = e;
+-            if ((e instanceof IOException) && security != null) {
++            if (security != null) {
+                 // Can not disclose the fail reason for read-protected files.
+                 try {
+                     security.checkRead(prog);
+@@ -1039,6 +1039,16 @@
+             // It's much easier for us to create a high-quality error
+             // message than the low-level C code which found the problem.
+             throw new IOException(
++                "Cannot run program \"" + prog + "\""
++                + (dir == null ? "" : " (in directory \"" + dir + "\")")
++                + exceptionInfo,
++                cause);
++        } catch (IllegalArgumentException e) {
++            String exceptionInfo = ": " + e.getMessage();
++            Throwable cause = e;
++            // It's much easier for us to create a high-quality error
++            // message than the low-level C code which found the problem.
++            throw new IOException(
+                 "Cannot run program \"" + prog + "\""
+                 + (dir == null ? "" : " (in directory \"" + dir + "\")")
+                 + exceptionInfo,
diff -r 26e811fe4d45 -r 066d3181805f patches/boot/ecj-stringswitch.patch
--- a/patches/boot/ecj-stringswitch.patch	Tue Jun 25 23:25:25 2013 -0500
+++ b/patches/boot/ecj-stringswitch.patch	Fri Jun 28 07:20:34 2013 +0100
@@ -362,6 +362,20 @@
              return defc == java.util.logging.Logger.class;
          }
          return false;
+@@ -528,10 +528,10 @@
+     private static boolean canBeCalledVirtual(MemberName mem) {
+         assert(mem.isInvocable());
+         Class defc = mem.getDeclaringClass();
+-        switch (mem.getName()) {
+-        case "checkMemberAccess":
++	String memName = mem.getName();
++	if ("checkMemberAccess".equals(memName)) {
+             return canBeCalledVirtual(mem, java.lang.SecurityManager.class);
+-        case "getContextClassLoader":
++        } else if ("getContextClassLoader".equals(memName)) {
+             return canBeCalledVirtual(mem, java.lang.Thread.class);
+         }
+         return false;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java
 --- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java	2013-06-21 21:46:14.000000000 +0100
 +++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java	2013-06-25 21:52:46.711944282 +0100


From ptisnovs at icedtea.classpath.org  Fri Jun 28 01:50:01 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Fri, 28 Jun 2013 08:50:01 +0000
Subject: /hg/rhino-tests: Added two new tests getGenericSuperclass() and ...
Message-ID: 

changeset 0ab476c8dfd1 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=0ab476c8dfd1
author: Pavel Tisnovsky 
date: Fri Jun 28 10:53:30 2013 +0200

	Added two new tests getGenericSuperclass() and getGenericInterfaces()
	into SimpleScriptContextClassTest.


diffstat:

 ChangeLog                                            |   6 +
 src/org/RhinoTests/SimpleScriptContextClassTest.java |  64 ++++++++++++++++++++
 2 files changed, 70 insertions(+), 0 deletions(-)

diffs (121 lines):

diff -r a859b2ca8a2a -r 0ab476c8dfd1 ChangeLog
--- a/ChangeLog	Thu Jun 27 16:01:50 2013 +0200
+++ b/ChangeLog	Fri Jun 28 10:53:30 2013 +0200
@@ -1,3 +1,9 @@
+2013-06-28  Pavel Tisnovsky  
+
+	* src/org/RhinoTests/SimpleScriptContextClassTest.java:
+	Added two new tests getGenericSuperclass() and getGenericInterfaces()
+	into SimpleScriptContextClassTest.
+
 2013-06-27  Pavel Tisnovsky  
 
 	* src/org/RhinoTests/AbstractScriptEngineClassTest.java:
diff -r a859b2ca8a2a -r 0ab476c8dfd1 src/org/RhinoTests/SimpleScriptContextClassTest.java
--- a/src/org/RhinoTests/SimpleScriptContextClassTest.java	Thu Jun 27 16:01:50 2013 +0200
+++ b/src/org/RhinoTests/SimpleScriptContextClassTest.java	Fri Jun 28 10:53:30 2013 +0200
@@ -52,6 +52,8 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
 
 import javax.script.SimpleScriptContext;
 import javax.script.ScriptContext;
@@ -291,6 +293,7 @@
      */
     protected void testGetConstructors() {
         // map of constructors which should exists
+        @SuppressWarnings("unused")
         Map testedConstructors = null;
         Map testedConstructors_jdk6 = new HashMap();
         Map testedConstructors_jdk7 = new HashMap();
@@ -333,6 +336,7 @@
      */
     protected void testGetDeclaredConstructors() {
         // map of constructors which should exists
+        @SuppressWarnings("unused")
         Map testedConstructors = null;
         Map testedConstructors_jdk6 = new HashMap();
         Map testedConstructors_jdk7 = new HashMap();
@@ -1071,12 +1075,15 @@
     protected void testGetAnnotations() {
         // following annotations should be provided
         final String[] annotationsThatShouldExists_jdk6 = {
+            // this should be really empty
         };
 
         final String[] annotationsThatShouldExists_jdk7 = {
+            // this should be really empty
         };
 
         final String[] annotationsThatShouldExists_jdk8 = {
+            // this should be really empty
         };
 
         // get all annotations
@@ -1231,6 +1238,63 @@
     }
 
     /**
+     * Test for method javax.script.SimpleScriptContext.getClass().getGenericSuperclass()
+     */
+    protected void testGetGenericSuperclass() {
+        Type genericSuperclass = this.simpleScriptContextClass.getGenericSuperclass();
+        assertNotNull(genericSuperclass, "getGenericSuperclass() does not return null");
+    }
+
+    /**
+     * Test for method javax.script.SimpleScriptContext.getClass().getGenericInterfaces()
+     */
+    protected void testGetGenericInterfaces() {
+        // array of interface names that should exists
+        final String[] genericInterfaceNames_jdk6 = {
+            "interface javax.script.ScriptContext",
+        };
+
+        final String[] genericInterfaceNames_jdk7 = {
+            "interface javax.script.ScriptContext",
+        };
+
+        final String[] genericInterfaceNames_jdk8 = {
+            "interface javax.script.ScriptContext",
+        };
+
+        // get the right array of field signatures
+        String[] genericInterfaceNames = null;
+        switch (getJavaVersion()) {
+            case 6:
+                genericInterfaceNames = genericInterfaceNames_jdk6;
+                break;
+            case 7:
+                genericInterfaceNames = genericInterfaceNames_jdk7;
+                break;
+            case 8:
+                genericInterfaceNames = genericInterfaceNames_jdk8;
+                break;
+        }
+
+        // get all generic interfaces
+        Type[] genericInterfaces = this.simpleScriptContextClass.getGenericInterfaces();
+        assertNotNull(genericInterfaces, "getGenericInterfaces() returns null");
+        assertEquals(1, genericInterfaces.length, "array of wrong size returned by getGenericInterfaces " + genericInterfaces.length);
+
+        // and transform the array into a list of field names
+        List interfacesAsString = new ArrayList();
+        for (Type genericInterface : genericInterfaces) {
+            interfacesAsString.add(genericInterface.toString());
+        }
+
+        // check if all required interfaces really exists
+        for (String interfaceThatShouldExists : genericInterfaceNames) {
+            assertTrue(interfacesAsString.contains(interfaceThatShouldExists),
+                    "interface " + interfaceThatShouldExists + " not found");
+        }
+    }
+
+    /**
      * Test for instanceof operator applied to a class javax.script.SimpleScriptContext
      */
     @SuppressWarnings("cast")


From ptisnovs at icedtea.classpath.org  Fri Jun 28 01:52:43 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Fri, 28 Jun 2013 08:52:43 +0000
Subject: /hg/gfx-test: Another set of new tests added into BitBltCropImage.
Message-ID: 

changeset bb5ab798f6a9 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=bb5ab798f6a9
author: Pavel Tisnovsky 
date: Fri Jun 28 10:56:15 2013 +0200

	Another set of new tests added into BitBltCropImage.


diffstat:

 ChangeLog                                       |   5 +
 src/org/gfxtest/testsuites/BitBltCropImage.java |  68 ++++++++++++++++++++++++-
 2 files changed, 72 insertions(+), 1 deletions(-)

diffs (90 lines):

diff -r ac3310860be8 -r bb5ab798f6a9 ChangeLog
--- a/ChangeLog	Thu Jun 27 15:13:01 2013 +0200
+++ b/ChangeLog	Fri Jun 28 10:56:15 2013 +0200
@@ -1,3 +1,8 @@
+2013-06-28  Pavel Tisnovsky  
+
+	* src/org/gfxtest/testsuites/BitBltCropImage.java:
+	Another set of new tests added into BitBltCropImage.
+
 2013-06-27  Pavel Tisnovsky  
 
 	* src/org/gfxtest/testsuites/BitBltCropImage.java:
diff -r ac3310860be8 -r bb5ab798f6a9 src/org/gfxtest/testsuites/BitBltCropImage.java
--- a/src/org/gfxtest/testsuites/BitBltCropImage.java	Thu Jun 27 15:13:01 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltCropImage.java	Fri Jun 28 10:56:15 2013 +0200
@@ -792,7 +792,73 @@
     public TestResult testBitBltCheckerBufferedImageTypeUshort555RGBCropNE(TestImage image, Graphics2D graphics2d)
     {
         // create new buffered image and then perform BitBlt test using crop operation.
-        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY,
+        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB,
+                        BitmapCropRegions.CROP_REGION_NE);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type
+     * TYPE_USHORT_555_RGB. Image is cropped so only south-west quarter of it is rendered.
+     * 
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeUshort555RGBCropSW(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform BitBlt test using crop operation.
+        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB,
+                        BitmapCropRegions.CROP_REGION_SW);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type
+     * TYPE_USHORT_555_RGB. Image is cropped so only south-east quarter of it is rendered.
+     * 
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeUshort555RGBCropSE(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform BitBlt test using crop operation.
+        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB,
+                        BitmapCropRegions.CROP_REGION_SE);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_USHORT_565_RGB.
+     * No crop is performed to that image.
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeUshort565RGBNoCrop(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform BitBlt test using crop operation.
+        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type
+     * TYPE_USHORT_565_RGB. Image is cropped so only north-west quarter of it is rendered.
+     * 
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeUshort565RGBCropNW(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform BitBlt test using crop operation.
+        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB,
                         BitmapCropRegions.CROP_REGION_NW);
     }
 


From jvanek at icedtea.classpath.org  Fri Jun 28 05:09:49 2013
From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org)
Date: Fri, 28 Jun 2013 12:09:49 +0000
Subject: /hg/release/icedtea-web-1.4: JNLP file is now re-downloading onl...
Message-ID: 

changeset be23db7861a6 in /hg/release/icedtea-web-1.4
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=be23db7861a6
author: Jiri Vanek 
date: Fri Jun 28 14:02:37 2013 +0200

	JNLP file is now re-downloading only if is local and have href. Real couse of PR1473


diffstat:

 ChangeLog                                                           |   18 +
 NEWS                                                                |    1 +
 netx/net/sourceforge/jnlp/Launcher.java                             |  124 +-----
 netx/net/sourceforge/jnlp/runtime/Boot.java                         |    2 +-
 tests/reproducers/simple/GeneratedId/resources/GeneratedId.jnlp     |   51 ++
 tests/reproducers/simple/GeneratedId/srcs/GeneratedId.java          |   44 ++
 tests/reproducers/simple/GeneratedId/testcases/GeneratedIdTest.java |  181 ++++++++++
 tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java       |   13 +-
 8 files changed, 328 insertions(+), 106 deletions(-)

diffs (truncated from 548 to 500 lines):

diff -r b1b17bb14ab0 -r be23db7861a6 ChangeLog
--- a/ChangeLog	Thu Jun 20 15:26:14 2013 +0200
+++ b/ChangeLog	Fri Jun 28 14:02:37 2013 +0200
@@ -1,3 +1,21 @@
+2013-06-24  Jiri Vanek 
+
+	JNLP file is now re-downloading only if is local and have href
+	* /netx/net/sourceforge/jnlp/Launcher.java: (launch) api cleared 
+	from (fromSource). (fromUrl) removed always re-downloading code and
+	replaced by conditional. (launchBackground), (toFile), (BgRunner)
+	removed.
+	* netx/net/sourceforge/jnlp/runtime/Boot.java: following new (launch)
+	* tests/reproducers/simple/GeneratedId/srcs/GeneratedId.java: just
+	arguments reprinting application
+	* tests/reproducers/simple/GeneratedId/testcases/GeneratedIdTest.java
+	various tests based on href/no href x local/remote jnlp files
+	* tests/reproducers/simple/GeneratedId/resources/GeneratedId.jnlp: base
+	simple jnlp with someId argument
+	* tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: reprinting
+	the get/head correctly and with echo
+	* NEWS: mentioned PR1473
+
 2013-06-20  Jiri Vanek 
 
 	Made it work with OpenJDK build 25
diff -r b1b17bb14ab0 -r be23db7861a6 NEWS
--- a/NEWS	Thu Jun 20 15:26:14 2013 +0200
+++ b/NEWS	Fri Jun 28 14:02:37 2013 +0200
@@ -11,6 +11,7 @@
 New in release 1.4.1 (2013-XX-YY):
 * NetX
   - PR1465 - java.io.FileNotFoundException while trying to download a JAR file
+  - PR1473 - javaws should not depend on name of local file
 * Plugin
   - PR854: Resizing an applet several times causes 100% CPU load
 
diff -r b1b17bb14ab0 -r be23db7861a6 netx/net/sourceforge/jnlp/Launcher.java
--- a/netx/net/sourceforge/jnlp/Launcher.java	Thu Jun 20 15:26:14 2013 +0200
+++ b/netx/net/sourceforge/jnlp/Launcher.java	Fri Jun 28 14:02:37 2013 +0200
@@ -264,30 +264,18 @@
         return tg.getApplication();
     }
 
-    /**
-     * Launches a JNLP file by calling the launch method for the
-     * appropriate file type.
-     *
-     * @param location the URL of the JNLP file to launch
-     * @throws LaunchException if there was an exception
-     * @return the application instance
-     */
-    public ApplicationInstance launch(URL location) throws LaunchException {
-        return launch(toFile(location));
-    }
 
     /**
      * Launches a JNLP file by calling the launch method for the
      * appropriate file type.
      *
      * @param location the URL of the JNLP file to launch
-     * @param fromSource if true, the JNLP file will be re-read from the source
      * location to get the pristine version
      * @throws LaunchException if there was an exception
      * @return the application instance
      */
-    public ApplicationInstance launch(URL location, boolean fromSource) throws LaunchException {
-        return launch(fromUrl(location, fromSource));
+    public ApplicationInstance launch(URL location) throws LaunchException {
+        return launch(fromUrl(location));
     }
 
     /**
@@ -376,28 +364,7 @@
         }
     }
 
-    /**
-     * Launches a JNLP file by calling the launch method for the
-     * appropriate file type in a different thread.
-     *
-     * @param file the JNLP file to launch
-     */
-    public void launchBackground(JNLPFile file) {
-        BgRunner runner = new BgRunner(file, null);
-        new Thread(runner).start();
-    }
-
-    /**
-     * Launches the JNLP file at the specified location in the
-     * background by calling the launch method for its file type.
-     *
-     * @param location the location of the JNLP file
-     */
-    public void launchBackground(URL location) {
-        BgRunner runner = new BgRunner(null, location);
-        new Thread(runner).start();
-    }
-
+  
     /**
      * Launches the JNLP file in a new JVM instance.  The launched
      * application's output is sent to the system out and it's
@@ -477,60 +444,38 @@
     /**
      * Returns the JNLPFile for the URL, with error handling.
      */
-    private JNLPFile fromUrl(URL location, boolean fromSource) throws LaunchException {
+
+    private JNLPFile fromUrl(URL location) throws LaunchException {
         try {
             JNLPFile file = null;
 
             file = new JNLPFile(location, parserSettings.isStrict());
+            
+            boolean isLocal = false;
+            boolean haveHref = false;
+            if ("file".equalsIgnoreCase(location.getProtocol()) && new File(location.getFile()).exists()) {
+                isLocal = true;
+            }
+            if (file.getSourceLocation() != null) {
+                haveHref = true;
+            }
 
-            if (fromSource) {
-                // Launches the jnlp file where this file originated.
-                if (file.getSourceLocation() != null) {
-                    file = new JNLPFile(file.getSourceLocation(), parserSettings.isStrict());
-                }
+            if (isLocal && haveHref) {
+                file = new JNLPFile(file.getSourceLocation(), parserSettings.isStrict());
             }
             return file;
         } catch (Exception ex) {
-            if (ex instanceof LaunchException)
+            if (ex instanceof LaunchException) {
                 throw (LaunchException) ex; // already sent to handler when first thrown
-            else
+            } else {
                 // IO and Parse
                 throw launchError(new LaunchException(null, ex, R("LSFatal"), R("LCReadError"), R("LCantRead"), R("LCantReadInfo")));
+            }
         }
     }
+ 
 
-    /**
-     * Returns the JNLPFile for the URL, with error handling.
-     */
-    @Deprecated
-    private JNLPFile toFile(URL location) throws LaunchException {
-        try {
-            JNLPFile file = null;
-
-            try {
-                file = new JNLPFile(location, (Version) null, true, updatePolicy); // strict
-            } catch (ParseException ex) {
-                file = new JNLPFile(location, (Version) null, false, updatePolicy);
-
-                // only here if strict failed but lax did not fail
-                LaunchException lex =
-                        launchWarning(new LaunchException(file, ex, R("LSMinor"), R("LCFileFormat"), R("LNotToSpec"), R("LNotToSpecInfo")));
-
-                if (lex != null)
-                    throw lex;
-            }
-
-            return file;
-        } catch (Exception ex) {
-            if (ex instanceof LaunchException)
-                throw (LaunchException) ex; // already sent to handler when first thrown
-            else
-                // IO and Parse
-                throw launchError(new LaunchException(null, ex, R("LSFatal"), R("LCReadError"), R("LCantRead"), R("LCantReadInfo")));
-        }
-    }
-
-    /**
+   /**
      * Launches a JNLP application.  This method should be called
      * from a thread in the application's thread group.
      */
@@ -998,31 +943,6 @@
 
     };
 
-    /**
-     * This runnable is used by the launchBackground
-     * methods to launch a JNLP file from a separate thread.
-     */
-    private class BgRunner implements Runnable {
-        private JNLPFile file;
-        private URL location;
-
-        BgRunner(JNLPFile file, URL location) {
-            this.file = file;
-            this.location = location;
-        }
-
-        public void run() {
-            try {
-                if (file != null)
-                    launch(file);
-                if (location != null)
-                    launch(location);
-            } catch (LaunchException ex) {
-                // launch method communicates error conditions to the
-                // handler if it exists, otherwise we don't care because
-                // there's nothing that can be done about the exception.
-            }
-        }
-    };
+ 
 
 }
diff -r b1b17bb14ab0 -r be23db7861a6 netx/net/sourceforge/jnlp/runtime/Boot.java
--- a/netx/net/sourceforge/jnlp/runtime/Boot.java	Thu Jun 20 15:26:14 2013 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/Boot.java	Fri Jun 28 14:02:37 2013 +0200
@@ -208,7 +208,7 @@
             Launcher launcher = new Launcher(false);
             launcher.setParserSettings(settings);
             launcher.setInformationToMerge(extra);
-            launcher.launch(getFileLocation(), true);
+            launcher.launch(getFileLocation());
         } catch (LaunchException ex) {
             // default handler prints this
         } catch (Exception ex) {
diff -r b1b17bb14ab0 -r be23db7861a6 tests/reproducers/simple/GeneratedId/resources/GeneratedId.jnlp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/GeneratedId/resources/GeneratedId.jnlp	Fri Jun 28 14:02:37 2013 +0200
@@ -0,0 +1,51 @@
+
+
+
+
+
+    
+      Test Generated Id
+      IcedTea
+    
+   
+      
+   
+   
+      SomeId
+   
+ 
diff -r b1b17bb14ab0 -r be23db7861a6 tests/reproducers/simple/GeneratedId/srcs/GeneratedId.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/GeneratedId/srcs/GeneratedId.java	Fri Jun 28 14:02:37 2013 +0200
@@ -0,0 +1,44 @@
+/* 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 GeneratedId {
+    static public void main(String[] args) {
+        for(int x = 0; x l = new ArrayList(3);
+        l.add(server.getJavawsLocation());
+        l.add(ServerAccess.HEADLES_OPTION);
+        l.add(dest.getAbsolutePath());
+        ProcessResult pr = ServerAccess.executeProcess(l);
+        Assert.assertTrue("Stdout should contain '" + okBase1 + "', but did not.", pr.stdout.contains(okBase1));
+    }
+
+    @Test
+    //do not have href
+    //is local
+    //should NOT be redownloaded
+    public void launchLocalChangedFileWithNoHref() throws Exception {
+        File dest = prepareChangedFileNoHref();
+        List l = new ArrayList(3);
+        l.add(server.getJavawsLocation());
+        l.add(ServerAccess.HEADLES_OPTION);
+        l.add(dest.getAbsolutePath());
+        ProcessResult pr = ServerAccess.executeProcess(l);
+        Assert.assertTrue("Stdout should contain '" + okBase2 + "', but did not.", pr.stdout.contains(okBase2));
+    }
+
+    @Test
+    //do have href
+    //is local
+    //should be redownloaded (how to verify!?!)
+    public void launchLocalFileWithHref() throws Exception {
+        File dest = new File(server.getDir(), baseName1);
+        List l = new ArrayList(3);
+        l.add(server.getJavawsLocation());
+        l.add(ServerAccess.HEADLES_OPTION);
+        l.add(dest.getAbsolutePath());
+        ProcessResult pr = ServerAccess.executeProcess(l);
+        Assert.assertTrue("Stdout should contain '" + okBase1 + "', but did not.", pr.stdout.contains(okBase1));
+    }
+
+    @Test
+    //do not have href
+    //is local
+    //should NOT be redownloaded (how to verify!?!)
+    public void launchLocalFileNoHref() throws Exception {
+        File dest = prepareCopiedFileNoHref();
+        List l = new ArrayList(3);
+        l.add(server.getJavawsLocation());
+        l.add(ServerAccess.HEADLES_OPTION);
+        l.add(dest.getAbsolutePath());
+        ProcessResult pr = ServerAccess.executeProcess(l);
+        Assert.assertTrue("Stdout should contain '" + okBase1 + "', but did not.", pr.stdout.contains(okBase1));
+    }
+
+    @Test
+    //remote
+    //have href
+    //should not be redownloaded (how to verify!?!)
+    //href is same file
+    public void launchRemoteFileWithHref() throws Exception {
+        ProcessResult pr = server.executeJavawsHeadless("/" + baseName1);
+        Assert.assertTrue("Stdout should contain '" + okBase1 + "', but did not.", pr.stdout.contains(okBase1));
+    }
+
+    //remote
+    //have href
+    //should NOT be redownloaded
+    //href is different file
+    @Test
+    public void launchRemoteChangedFileWithHref() throws Exception {
+        File f = prepareChangedFileWithHref();
+        ProcessResult pr = server.executeJavawsHeadless("/" + f.getName());
+        Assert.assertTrue("Stdout should contain '" + okBase2 + "', but did not.", pr.stdout.contains(okBase2));
+    }
+
+    @Test
+    //remote
+    //have not href
+    //should not be redownloaded (how to verify!?!)
+    public void launchRemoteFileWithNoHref() throws Exception {
+        File f = prepareCopiedFileNoHref();


From bugzilla-daemon at icedtea.classpath.org  Fri Jun 28 05:09:56 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Fri, 28 Jun 2013 12:09:56 +0000
Subject: [Bug 1473] javaws should not depend on name of local file
In-Reply-To: 
References: 
Message-ID: 

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

--- Comment #3 from hg commits  ---
details:
http://icedtea.classpath.org//hg/release/icedtea-web-1.4?cmd=changeset;node=be23db7861a6
author: Jiri Vanek 
date: Fri Jun 28 14:02:37 2013 +0200

    JNLP file is now re-downloading only if is local and have href. Real couse
of PR1473

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130628/9eb49716/attachment.html 

From gnu_andrew at member.fsf.org  Fri Jun 28 06:10:07 2013
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 28 Jun 2013 14:10:07 +0100
Subject: [SECURITY] IcedTea 2.3.10 for OpenJDK 7 Released!
Message-ID: <20130628131007.GA28452@carrie.middle-earth.co.uk>

The IcedTea project provides a harness to build the source code from
OpenJDK using Free Software build tools, along with additional
features such as a PulseAudio sound driver and support for alternative
virtual machines.

This release updates our OpenJDK 7 support to include the latest
security updates. We recommend that users of the 2.3.x branch upgrade
to this latest release as soon as possible. The security fixes are as
follows:

  * S6741606, CVE-2013-2407: Integrate Apache Santuario
  * S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls
  * S7170730, CVE-2013-2451: Improve Windows network stack support.
  * S8000638, CVE-2013-2450: Improve deserialization
  * S8000642, CVE-2013-2446: Better handling of objects for transportation
  * S8001032: Restrict object access
  * S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers
  * S8001034, CVE-2013-1500: Memory management improvements
  * S8001038, CVE-2013-2444: Resourcefully handle resources
  * S8001043: Clarify definition restrictions
  * S8001308: Update display of applet windows
  * S8001309: Better handling of annotation interfaces
  * S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost
  * S8001330, CVE-2013-2443: Improve on checking order (non-Zero builds only)
  * S8003703, CVE-2013-2412: Update RMI connection dialog box
  * S8004288, CVE-2013-2449: (fs) Files.probeContentType problems
  * S8004584: Augment applet contextualization
  * S8005007: Better glyph processing
  * S8006328, CVE-2013-2448: Improve robustness of sound classes
  * S8006611: Improve scripting
  * S8007467: Improve robustness of JMX internal APIs
  * S8007471: Improve MBean notifications
  * S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes
  * S8007925: Improve cmsStageAllocLabV2ToV4curves
  * S8007926: Improve cmsPipelineDup
  * S8007927: Improve cmsAllocProfileSequenceDescription
  * S8007929: Improve CurvesAlloc
  * S8008120, CVE-2013-2457: Improve JMX class checking
  * S8008124, CVE-2013-2453: Better compliance testing
  * S8008128: Better API coherence for JMX
  * S8008132, CVE-2013-2456: Better serialization support
  * S8008585: Better JMX data handling
  * S8008593: Better URLClassLoader resource management
  * S8008603: Improve provision of JMX providers
  * S8008607: Better input checking in JMX
  * S8008611: Better handling of annotations in JMX
  * S8008615: Improve robustness of JMX internal APIs
  * S8008623: Better handling of MBeanServers
  * S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606
  * S8008982: Adjust JMX for underlying interface changes
  * S8009004: Better implementation of RMI connections
  * S8009008: Better manage management-api
  * S8009013: Better handling of T2K glyphs
  * S8009034: Improve resulting notifications in JMX
  * S8009038: Improve JMX notification support
  * S8009057, CVE-2013-2448: Improve MIDI event handling
  * S8009067: Improve storing keys in KeyStore
  * S8009071, CVE-2013-2459: Improve shape handling
  * S8009235: Improve handling of TSA data
  * S8009424, CVE-2013-2458: Adapt Nashorn to JSR-292 implementation change
  * S8009554, CVE-2013-2454: Improve SerialJavaObject.getFields
  * S8009654: Improve stability of cmsnamed
  * S8010209, CVE-2013-2460: Better provision of factories
  * S8011243, CVE-2013-2470: Improve ImagingLib
  * S8011248, CVE-2013-2471: Better Component Rasters
  * S8011253, CVE-2013-2472: Better Short Component Rasters
  * S8011257, CVE-2013-2473: Better Byte Component Rasters
  * S8012375, CVE-2013-1571: Improve Javadoc framing
  * S8012421: Better positioning of PairPositioning
  * S8012438, CVE-2013-2463: Better image validation
  * S8012597, CVE-2013-2465: Better image channel verification
  * S8012601, CVE-2013-2469: Better validation of image layouts
  * S8014281, CVE-2013-2461: Better checking of XML signature
  * S8015997: Additional improvement in Javadoc framing

The HotSpot part of S8001330 is currently only provided for HotSpot
23.7 on x86, x86_64 and SPARC architectures as we've found it to be
unstable when applied to the older HotSpot used by Zero.  If we find a
solution for this, we'll issue a further update.

In addition, IcedTea includes the usual IcedTea patches to allow
builds against system libraries and to support more esoteric
architectures.

If you find an issue with the release, please report it to our bug
database (http://icedtea.classpath.org/bugzilla) under the appropriate
component. Development discussion takes place on the
distro-pkg-dev at openjdk.java.net mailing list and patches are always
welcome.

Full details of the release can be found below.  Note that the unusually
large number of backports is due to syncing with the upstream u25 release,
which also provides all these.

What's New?
===========

New in release 2.3.10 (2013-06-28):

* Security fixes
  - S6741606, CVE-2013-2407: Integrate Apache Santuario
  - S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls
  - S7170730, CVE-2013-2451: Improve Windows network stack support.
  - S8000638, CVE-2013-2450: Improve deserialization
  - S8000642, CVE-2013-2446: Better handling of objects for transportation
  - S8001032: Restrict object access
  - S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers
  - S8001034, CVE-2013-1500: Memory management improvements
  - S8001038, CVE-2013-2444: Resourcefully handle resources
  - S8001043: Clarify definition restrictions
  - S8001308: Update display of applet windows
  - S8001309: Better handling of annotation interfaces
  - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost
  - S8001330, CVE-2013-2443: Improve on checking order (non-Zero builds only)
  - S8003703, CVE-2013-2412: Update RMI connection dialog box
  - S8004288, CVE-2013-2449: (fs) Files.probeContentType problems
  - S8004584: Augment applet contextualization
  - S8005007: Better glyph processing
  - S8006328, CVE-2013-2448: Improve robustness of sound classes
  - S8006611: Improve scripting
  - S8007467: Improve robustness of JMX internal APIs
  - S8007471: Improve MBean notifications
  - S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes
  - S8007925: Improve cmsStageAllocLabV2ToV4curves
  - S8007926: Improve cmsPipelineDup
  - S8007927: Improve cmsAllocProfileSequenceDescription
  - S8007929: Improve CurvesAlloc
  - S8008120, CVE-2013-2457: Improve JMX class checking
  - S8008124, CVE-2013-2453: Better compliance testing
  - S8008128: Better API coherence for JMX
  - S8008132, CVE-2013-2456: Better serialization support
  - S8008585: Better JMX data handling
  - S8008593: Better URLClassLoader resource management
  - S8008603: Improve provision of JMX providers
  - S8008607: Better input checking in JMX
  - S8008611: Better handling of annotations in JMX
  - S8008615: Improve robustness of JMX internal APIs
  - S8008623: Better handling of MBeanServers
  - S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606
  - S8008982: Adjust JMX for underlying interface changes
  - S8009004: Better implementation of RMI connections
  - S8009008: Better manage management-api
  - S8009013: Better handling of T2K glyphs
  - S8009034: Improve resulting notifications in JMX
  - S8009038: Improve JMX notification support
  - S8009057, CVE-2013-2448: Improve MIDI event handling
  - S8009067: Improve storing keys in KeyStore
  - S8009071, CVE-2013-2459: Improve shape handling
  - S8009235: Improve handling of TSA data
  - S8009424, CVE-2013-2458: Adapt Nashorn to JSR-292 implementation change
  - S8009554, CVE-2013-2454: Improve SerialJavaObject.getFields
  - S8009654: Improve stability of cmsnamed
  - S8010209, CVE-2013-2460: Better provision of factories
  - S8011243, CVE-2013-2470: Improve ImagingLib
  - S8011248, CVE-2013-2471: Better Component Rasters
  - S8011253, CVE-2013-2472: Better Short Component Rasters
  - S8011257, CVE-2013-2473: Better Byte Component Rasters
  - S8012375, CVE-2013-1571: Improve Javadoc framing
  - S8012421: Better positioning of PairPositioning
  - S8012438, CVE-2013-2463: Better image validation
  - S8012597, CVE-2013-2465: Better image channel verification
  - S8012601, CVE-2013-2469: Better validation of image layouts
  - S8014281, CVE-2013-2461: Better checking of XML signature
  - S8015997: Additional improvement in Javadoc framing
* New features
  - PR1378: Add AArch64 support to Zero
* Bug fixes
  - PR1409: IcedTea 2.3.9 fails to build Zero due to -Werror
  - PR1410: Icedtea 2.3.9 fails to build using icedtea 1.12.4
* Backports
  - S6720349: (ch) Channels tests depending on hosts inside Sun
  - S6736316: Timeout value in java/util/concurrent/locks/Lock/FlakyMutex.java is insufficient
  - S6776144: java/lang/ThreadGroup/NullThreadName.java fails with Thread group is not destroyed ,fastdebug LINUX
  - S6818464: TEST_BUG: java/util/Timer/KillThread.java failing intermittently
  - S6860309: TEST_BUG: Insufficient sleep time in java/lang/Runtime/exec/StreamsSurviveDestroy.java
  - S6948101: java/rmi/transport/pinLastArguments/PinLastArguments.java failing intermittently
  - S6957683: test/java/util/concurrent/ThreadPoolExecutor/Custom.java failing
  - S6963102: Testcase failures sun/tools/jstatd/jstatdExternalRegistry.sh and sun/tools/jstatd/jstatdDefaults.sh
  - S6963841: java/util/concurrent/Phaser/Basic.java fails intermittently
  - S6965150: TEST_BUG: java/nio/channels/AsynchronousSocketChannel/Basic.java takes too long
  - S7030573: test/java/io/FileInputStream/LargeFileAvailable.java fails when there is insufficient disk space
  - S7032247: java/net/InetAddress/GetLocalHostWithSM.java fails if hostname resolves to loopback address
  - S7044870: java/nio/channels/DatagramChannel/SelectWhenRefused.java failed on SUSE Linux 10
  - S7053526: Upgrade JDK 8 to use Little CMS 2.4
  - S7054918: jdk_security1 test target cleanup
  - S7055362: jdk_security2 test target cleanup
  - S7055363: jdk_security3 test target cleanup
  - S7072120: No mac os x support in several regression tests
  - S7073295: TEST_BUG: test/java/lang/instrument/ManifestTest.sh causing havoc (win)
  - S7076756: TEST_BUG: com/sun/jdi/BreakpointWithFullGC.sh fails to cleanup in Cygwin
  - S7076791: closed/javax/swing/JColorChooser/Test6827032.java failed on windows
  - S7077259: [TEST_BUG] [macosx] Test work correctly only when default L&F is Metal
  - S7084033: TEST_BUG: test/java/lang/ThreadGroup/Stop.java fails intermittently
  - S7089131: test/java/lang/invoke/InvokeGenericTest.java does not compile
  - S7102106: TEST_BUG: sun/security/util/Oid/S11N.sh should be modified
  - S7104161: test/sun/tools/jinfo/Basic.sh fails on Ubuntu
  - S7104594: [macosx] Test closed/javax/swing/JFrame/4962534/bug4962534 expects Metal L&F by default
  - S7105929: java/util/concurrent/FutureTask/BlockingTaskExecutor.java fails on solaris sparc
  - S7124347: [macosx] "java.lang.InternalError: not implemented yet" on call Graphics2D.drawRenderedImage
  - S7129800: [macosx] Regression test OverrideRedirectWindowActivationTest fails due to timing issue
  - S7132247: java/rmi/registry/readTest/readTest.sh failing with Cygwin
  - S7140868: TEST_BUG: jcmd tests need to use -XX:+UsePerfData
  - S7142596: RMI JPRT tests are failing
  - S7144833: sun/tools/jcmd/jcmd-Defaults.sh failing intermittently
  - S7144861: speed up RMI activation tests
  - S7147408: [macosx] Add autodelay to fix a regression test
  - S7151434, RH969884: java -jar -XX crashes java launcher
  - S7152183: TEST_BUG: java/lang/ProcessBuilder/Basic.java failing intermittently [sol]
  - S7152796: TEST_BUG: java/net/Socks/SocksV4Test.java does not terminate
  - S7152856: TEST_BUG: sun/net/www/protocol/jar/B4957695.java failing on Windows
  - S7154113: jcmd, jps and jstat tests failing when there are unknown Java processes on the system
  - S7154114: jstat tests failing on non-english locales
  - S7161759: TEST_BUG: java/awt/Frame/WindowDragTest/WindowDragTest.java fails to compile, should be modified
  - S7162111: TEST_BUG: change tests run in headless mode [macosx]
  - S7162385: TEST_BUG: sun/net/www/protocol/jar/B4957695.java failing again
  - S7175775: Disable SA options in jinfo/Basic.java test until SA updated for new hash and String count/offset
  - S7178649: TEST BUG: BadKdc3.java needs improvement to ignore the unlikely but possible timeout
  - S7183203: ShortRSAKeynnn.sh tests intermittent failure
  - S7183753: [TEST] Some colon in the diff for this test
  - S7184943: fix failing test com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java
  - S7184946: fix failing test com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java
  - S7185340: TEST_BUG: java/nio/channels/AsynchronousSocketChannel/Leaky.java failing intermittently [win]
  - S7186111: fix bugs in java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup
  - S7187882: TEST_BUG: java/rmi/activation/checkusage/CheckUsage.java fails intermittently
  - S7193219: JComboBox serialization fails in JDK 1.7
  - S7194032: update tests for upcoming changes for jtreg
  - S7194035: update tests for upcoming changes for jtreg
  - S7199143: RFE: OCSP revocation checker should provide possibility to specify connection timeout
  - S7199637: TEST_BUG: add serialization tests to jdk7u problem list for macosx
  - S8000817: Reinstate accidentally removed sleep() from ProcessBuilder/Basic.java
  - S8001161: mac: EmbeddedFrame doesn't become active window
  - S8001621: Update awk scripts that check output from jps/jcmd
  - S8002070: Remove the stack search for a resource bundle for Logger to use
  - S8002297: sun/net/www/protocol/http/StackTraceTest.java fails intermittently
  - S8002313: TEST_BUG : jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.java should run in headless mode
  - S8003597: TEST_BUG: Eliminate dependency on javaweb from closed net tests
  - S8003982: new test javax/swing/AncestorNotifier/7193219/bug7193219.java failed on macosx
  - S8004317: TestLibrary.getUnusedRandomPort() fails intermittently, but exception not reported
  - S8004748: clean up @build tags in RMI tests
  - S8004925: java/net/Socks/SocksV4Test.java failing on all platforms
  - S8005290: remove -showversion from RMI test library subprocess mechanism
  - S8005556: java/net/Socks/SocksV4Test.java is missing @run tag
  - S8005646: TEST_BUG: java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup leaves process running
  - S8005920: After pressing combination Windows Key and M key, the frame, the instruction and the dialog can't be minimized.
  - S8005932: Java 7 on mac os x only provides text clipboard formats
  - S8006120: Provide "Server JRE" for 7u train
  - S8006417: JComboBox.showPopup(), hidePopup() fails in JRE 1.7 on OS X
  - S8006534: CLONE - TestLibrary.getUnusedRandomPort() fails intermittently-doesn't retry enough times
  - S8006536: [launcher]  removes trailing slashes on arguments
  - S8006560: java/net/ipv6tests/B6521014.java fails intermittently
  - S8006564: Test sun/security/util/Oid/S11N.sh fails with timeout on Linux 32-bit
  - S8006669: sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh fails on mac
  - S8007515: TEST_BUG: update ProblemList.txt and TEST.ROOT in jdk7u-dev to match jdk8
  - S8007699: Move some tests from test/sun/security/provider/certpath/X509CertPath to closed repo
  - S8008223: java/net/BindException/Test.java fails rarely
  - S8008249: Sync ICU into JDK :
  - S8008379: TEST_BUG: Fail automatically with java.lang.NullPointerException.
  - S8008815: [TEST_BUG] Add back tests to the Problemlist files post the jdk7u -> 7u-cpu test sync up
  - S8009165: Fix for 8008817 needs revision
  - S8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03
  - S8009463: Regression test test\java\lang\Runtime\exec\ArgWithSpaceAndFinalBackslash.java failing.
  - S8009530: ICU Kern table support broken
  - S8009610: Blacklist certificate used with malware.
  - S8009634: TEST_BUG: sun/misc/Version/Version.java handle 2 digit minor in VM version
  - S8009750: javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java should run in other vm mode
  - S8009987: (tz) Support tzdata2013b
  - S8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail
  - S8009999: Test sun/tools/jcmd/jcmd-f.sh failing after JDK-8008820
  - S8010009: [macosx] Unable type into online word games on MacOSX
  - S8010118: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive
  - S8010166: TEST_BUG: fix for 8009634 overlooks possible version strings (sun/misc/Version/Version.java)
  - S8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build
  - S8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod
  - S8010727: WLS fails to add a logger with "" in its own LogManager subclass instance
  - S8010939: Deadlock in LogManager
  - S8011139: (reflect) Revise checking in getEnclosingClass
  - S8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows
  - S8011313: OCSP timeout set to wrong value if com.sun.security.ocsp.timeout not defined
  - S8011557: Improve reflection utility classes
  - S8011695: [tck-red] Application can not be run, the Security Warning dialog is gray.
  - S8011806: 7u25-b05 hotspot fastdebug build failure
  - S8011896: Add check for invalid offset for new AccessControlContext isAuthorized field
  - S8011990: TEST_BUG: java/util/logging/bundlesearch/ResourceBundleSearchTest.java fails on Windows
  - S8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05
  - S8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris
  - S8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21
  - S8012330: [macosx] Sometimes the applet showing the modal dialog itself loses the ability to gain focus
  - S8012453: (process) Runtime.exec(String) fails if command contains spaces [win]
  - S8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer
  - S8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07
  - S8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext()
  - S8013228: Create new system properties to control allowable OCSP clock skew and CRL connection timeout
  - S8013380: Removal of stack walk to find resource bundle breaks Glassfish startup
  - S8014205: Most of the Swing dialogs are blank on one win7 MUI
  - S8014423: [macosx] The scrollbar's block increment performs incorrectly
  - S8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09
  - S8014618, RH868136: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement
  - S8014676: Java debugger may fail to run
  - S8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10
  - S8014745: Provide a switch to allow stack walk search of resource bundle
  - S8014968: OCSP and CRL connection timeout is set to four hours by default

The tarball can be downloaded from:

    http://icedtea.classpath.org/download/source/icedtea-2.3.10.tar.gz

SHA256 checksum:

    d1c3b9423867b41508050e1d32b38e4a090f84a96b864b09936a4281ff01f5da  icedtea-2.3.10.tar.gz

The tarball is accompanied by a digital signature available at:

    http://icedtea.classpath.org/download/source/icedtea-2.3.10.tar.gz.sig

This is produced using my public key. See details below.

    PGP Key: 248BDC07 (https://keys.indymedia.org/)
    Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07

The following people helped with these releases:

 * Andreas Schwab (PR1378 patch for AArch64 Zero support)
 * Andrew Hughes (all other bug fixes, application of security fixes & backports, release management)

We would also like to thank the bug reporters and testers!

To get started:

$ tar xzf icedtea-2.3.10.tar.gz
$ mkdir icedtea-build
$ cd icedtea-build
$ ../icedtea-2.3.10/configure
$ make

Full build requirements and instructions are available in the INSTALL file.

Happy hacking!
-- 
Andrew :)

PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130628/c8286b95/attachment.bin 

From andrew at icedtea.classpath.org  Fri Jun 28 06:15:48 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Fri, 28 Jun 2013 13:15:48 +0000
Subject: /hg/release/icedtea7-2.3: 3 new changesets
Message-ID: 

changeset ee8144fe33e6 in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=ee8144fe33e6
author: Andrew John Hughes 
date: Fri Jun 28 01:30:06 2013 -0500

	Turn off system LCMS by default and warn if enabled, as it is unlikely to have the latest security updates.

	2013-06-28  Andrew John Hughes  

		* acinclude.m4:
		(IT_WITH_HOTSPOT_BUILD): Define once.
		(IT_CHECK_FOR_LCMS): Turn system LCMS off by default
		and warn if enabled as it is unlikely to have
		the new security fixes.
		* configure.ac: Drop IT_ENABLE_ZERO_BUILD; called
		by IT_WITH_HOTSPOT_BUILD.


changeset 5f0394d24af3 in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=5f0394d24af3
author: Andrew John Hughes 
date: Fri Jun 28 01:31:54 2013 -0500

	Prepare for 2.3.10 release.

	2013-06-28  Andrew John Hughes  

		* configure.ac: Set to 2.3.10.
		* NEWS: Set release date.


changeset 62bc3780164c in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=62bc3780164c
author: Andrew John Hughes 
date: Fri Jun 28 14:15:40 2013 +0100

	Added tag icedtea-2.3.10 for changeset 5f0394d24af3


diffstat:

 .hgtags      |   1 +
 ChangeLog    |  15 +++++++++++++++
 NEWS         |   2 +-
 acinclude.m4 |   7 ++++---
 configure.ac |   3 +--
 5 files changed, 22 insertions(+), 6 deletions(-)

diffs (90 lines):

diff -r 066d3181805f -r 62bc3780164c .hgtags
--- a/.hgtags	Fri Jun 28 07:20:34 2013 +0100
+++ b/.hgtags	Fri Jun 28 14:15:40 2013 +0100
@@ -46,3 +46,4 @@
 8e87a16a613cf9f2b6a9496c514fb098eb872f7f icedtea-2.3.7
 eeda7cda31dc55c0faa4d2773cfc4c2f27bb6d7a icedtea-2.3.8
 b382dc61dbdde9e404a459b5b71608674e6e3c34 icedtea-2.3.9
+5f0394d24af3ae26333240f3c98c94eb170ffb0c icedtea-2.3.10
diff -r 066d3181805f -r 62bc3780164c ChangeLog
--- a/ChangeLog	Fri Jun 28 07:20:34 2013 +0100
+++ b/ChangeLog	Fri Jun 28 14:15:40 2013 +0100
@@ -1,3 +1,18 @@
+2013-06-28  Andrew John Hughes  
+
+	* configure.ac: Set to 2.3.10.
+	* NEWS: Set release date.
+
+2013-06-28  Andrew John Hughes  
+
+	* acinclude.m4:
+	(IT_WITH_HOTSPOT_BUILD): Define once.
+	(IT_CHECK_FOR_LCMS): Turn system LCMS off by default
+	and warn if enabled as it is unlikely to have
+	the new security fixes.
+	* configure.ac: Drop IT_ENABLE_ZERO_BUILD; called
+	by IT_WITH_HOTSPOT_BUILD.
+
 2013-06-28  Andrew John Hughes  
 
 	* NEWS: Mention that 8001330 is not in Zero.
diff -r 066d3181805f -r 62bc3780164c NEWS
--- a/NEWS	Fri Jun 28 07:20:34 2013 +0100
+++ b/NEWS	Fri Jun 28 14:15:40 2013 +0100
@@ -10,7 +10,7 @@
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
-New in release 2.3.10 (2013-06-XX):
+New in release 2.3.10 (2013-06-28):
 
 * Security fixes
   - S6741606, CVE-2013-2407: Integrate Apache Santuario
diff -r 066d3181805f -r 62bc3780164c acinclude.m4
--- a/acinclude.m4	Fri Jun 28 07:20:34 2013 +0100
+++ b/acinclude.m4	Fri Jun 28 14:15:40 2013 +0100
@@ -921,7 +921,7 @@
   AC_SUBST([GCJ])
 ])
 
-AC_DEFUN([IT_WITH_HOTSPOT_BUILD],
+AC_DEFUN_ONCE([IT_WITH_HOTSPOT_BUILD],
 [
   AC_REQUIRE([IT_ENABLE_ZERO_BUILD])
   if test "x${use_zero}" = "xyes"; then
@@ -1912,15 +1912,16 @@
 [
   AC_MSG_CHECKING([whether to use the system LCMS install])
   AC_ARG_ENABLE([system-lcms],
-	      [AS_HELP_STRING(--enable-system-lcms,use the system LCMS [[default=yes]])],
+	      [AS_HELP_STRING(--enable-system-lcms,use the system LCMS [[default=no]])],
   [
     ENABLE_SYSTEM_LCMS="${enableval}"
   ],
   [
-    ENABLE_SYSTEM_LCMS="yes"
+    ENABLE_SYSTEM_LCMS="no"
   ])
   AC_MSG_RESULT(${ENABLE_SYSTEM_LCMS})
   if test x"${ENABLE_SYSTEM_LCMS}" = "xyes"; then
+    AC_MSG_WARN([System LCMS may not have the latest security updates])
     dnl Check for LCMS2 headers and libraries.
     PKG_CHECK_MODULES(LCMS2, lcms2,[LCMS2_FOUND=yes],[LCMS2_FOUND=no])
     if test "x${LCMS2_FOUND}" = xno
diff -r 066d3181805f -r 62bc3780164c configure.ac
--- a/configure.ac	Fri Jun 28 07:20:34 2013 +0100
+++ b/configure.ac	Fri Jun 28 14:15:40 2013 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.3.10pre], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.3.10], [distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 
@@ -180,7 +180,6 @@
 IT_ENABLE_WERROR
 IT_ENABLE_JAR_COMPRESSION
 IT_SET_SHARK_BUILD
-IT_ENABLE_ZERO_BUILD
 IT_CHECK_ADDITIONAL_VMS
 
 IT_WITH_VERSION_SUFFIX


From andrew at icedtea.classpath.org  Fri Jun 28 06:17:16 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Fri, 28 Jun 2013 13:17:16 +0000
Subject: /hg/release/icedtea7-2.3: Start 2.3.11 release cycle.
Message-ID: 

changeset 046c72402c91 in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=046c72402c91
author: Andrew John Hughes 
date: Fri Jun 28 14:16:59 2013 +0100

	Start 2.3.11 release cycle.

	2013-06-28  Andrew John Hughes  

		* configure.ac: Bump to 2.3.11pre.
		* NEWS: Add section for 2.3.11.


diffstat:

 ChangeLog    |  5 +++++
 NEWS         |  2 ++
 configure.ac |  2 +-
 3 files changed, 8 insertions(+), 1 deletions(-)

diffs (33 lines):

diff -r 62bc3780164c -r 046c72402c91 ChangeLog
--- a/ChangeLog	Fri Jun 28 14:15:40 2013 +0100
+++ b/ChangeLog	Fri Jun 28 14:16:59 2013 +0100
@@ -1,3 +1,8 @@
+2013-06-28  Andrew John Hughes  
+
+	* configure.ac: Bump to 2.3.11pre.
+	* NEWS: Add section for 2.3.11.
+
 2013-06-28  Andrew John Hughes  
 
 	* configure.ac: Set to 2.3.10.
diff -r 62bc3780164c -r 046c72402c91 NEWS
--- a/NEWS	Fri Jun 28 14:15:40 2013 +0100
+++ b/NEWS	Fri Jun 28 14:16:59 2013 +0100
@@ -10,6 +10,8 @@
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
+New in release 2.3.11 (2013-XX-XX):
+
 New in release 2.3.10 (2013-06-28):
 
 * Security fixes
diff -r 62bc3780164c -r 046c72402c91 configure.ac
--- a/configure.ac	Fri Jun 28 14:15:40 2013 +0100
+++ b/configure.ac	Fri Jun 28 14:16:59 2013 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.3.10], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.3.11pre], [distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 


From adomurad at icedtea.classpath.org  Fri Jun 28 06:56:35 2013
From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org)
Date: Fri, 28 Jun 2013 13:56:35 +0000
Subject: /hg/icedtea-web: Fix potential NPE on GetValue message
Message-ID: 

changeset 87c9fc859a21 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=87c9fc859a21
author: Adam Domurad 
date: Fri Jun 28 09:45:11 2013 -0400

	Fix potential NPE on GetValue message


diffstat:

 ChangeLog                                                         |  5 +++++
 plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java |  3 ++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diffs (26 lines):

diff -r 244ea962a635 -r 87c9fc859a21 ChangeLog
--- a/ChangeLog	Thu Jun 27 09:55:18 2013 +0200
+++ b/ChangeLog	Fri Jun 28 09:45:11 2013 -0400
@@ -1,3 +1,8 @@
+2013-06-28  Adam Domurad  
+
+	* plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
+	(handleMessage): Fix potential NPE on 'GetValue'
+
 2013-06-25  Jiri Vanek 
 
 	* acinclude.m4: (IT_CHECK_FOR_TAGSOUP) is now correctly setting
diff -r 244ea962a635 -r 87c9fc859a21 plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java	Thu Jun 27 09:55:18 2013 +0200
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java	Fri Jun 28 09:45:11 2013 -0400
@@ -522,8 +522,9 @@
                 Integer index = parseCall(args[1], null, Integer.class);
 
                 Object ret = store.getObject(index);
+                Class retClass = ret != null ? ret.getClass() : null;
 
-                String objIDStr = toObjectIDString(ret, ret.getClass(), true /*unbox primitives*/);
+                String objIDStr = toObjectIDString(ret, retClass, true /*unbox primitives*/);
                 write(reference, "GetValue " + objIDStr);
             } else if (message.startsWith("SetStaticField") ||
                                    message.startsWith("SetField")) {


From gnu_andrew at member.fsf.org  Fri Jun 28 06:59:24 2013
From: gnu_andrew at member.fsf.org (=?UTF-8?B?QW5kw6/Drw==?=)
Date: Fri, 28 Jun 2013 08:59:24 -0500
Subject: [SECURITY] IcedTea 2.3.10 for OpenJDK 7 Released!
In-Reply-To: <20130628131007.GA28452@carrie.middle-earth.co.uk>
References: <20130628131007.GA28452@carrie.middle-earth.co.uk>
Message-ID: 

On 28 June 2013 08:10, Andrew John Hughes  wrote:
> The IcedTea project provides a harness to build the source code from
> OpenJDK using Free Software build tools, along with additional
> features such as a PulseAudio sound driver and support for alternative
> virtual machines.
>
> This release updates our OpenJDK 7 support to include the latest
> security updates. We recommend that users of the 2.3.x branch upgrade
> to this latest release as soon as possible. The security fixes are as
> follows:
>
>   * S6741606, CVE-2013-2407: Integrate Apache Santuario
>   * S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls
>   * S7170730, CVE-2013-2451: Improve Windows network stack support.
>   * S8000638, CVE-2013-2450: Improve deserialization
>   * S8000642, CVE-2013-2446: Better handling of objects for transportation
>   * S8001032: Restrict object access
>   * S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers
>   * S8001034, CVE-2013-1500: Memory management improvements
>   * S8001038, CVE-2013-2444: Resourcefully handle resources
>   * S8001043: Clarify definition restrictions
>   * S8001308: Update display of applet windows
>   * S8001309: Better handling of annotation interfaces
>   * S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost
>   * S8001330, CVE-2013-2443: Improve on checking order (non-Zero builds only)
>   * S8003703, CVE-2013-2412: Update RMI connection dialog box
>   * S8004288, CVE-2013-2449: (fs) Files.probeContentType problems
>   * S8004584: Augment applet contextualization
>   * S8005007: Better glyph processing
>   * S8006328, CVE-2013-2448: Improve robustness of sound classes
>   * S8006611: Improve scripting
>   * S8007467: Improve robustness of JMX internal APIs
>   * S8007471: Improve MBean notifications
>   * S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes
>   * S8007925: Improve cmsStageAllocLabV2ToV4curves
>   * S8007926: Improve cmsPipelineDup
>   * S8007927: Improve cmsAllocProfileSequenceDescription
>   * S8007929: Improve CurvesAlloc
>   * S8008120, CVE-2013-2457: Improve JMX class checking
>   * S8008124, CVE-2013-2453: Better compliance testing
>   * S8008128: Better API coherence for JMX
>   * S8008132, CVE-2013-2456: Better serialization support
>   * S8008585: Better JMX data handling
>   * S8008593: Better URLClassLoader resource management
>   * S8008603: Improve provision of JMX providers
>   * S8008607: Better input checking in JMX
>   * S8008611: Better handling of annotations in JMX
>   * S8008615: Improve robustness of JMX internal APIs
>   * S8008623: Better handling of MBeanServers
>   * S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606
>   * S8008982: Adjust JMX for underlying interface changes
>   * S8009004: Better implementation of RMI connections
>   * S8009008: Better manage management-api
>   * S8009013: Better handling of T2K glyphs
>   * S8009034: Improve resulting notifications in JMX
>   * S8009038: Improve JMX notification support
>   * S8009057, CVE-2013-2448: Improve MIDI event handling
>   * S8009067: Improve storing keys in KeyStore
>   * S8009071, CVE-2013-2459: Improve shape handling
>   * S8009235: Improve handling of TSA data
>   * S8009424, CVE-2013-2458: Adapt Nashorn to JSR-292 implementation change
>   * S8009554, CVE-2013-2454: Improve SerialJavaObject.getFields
>   * S8009654: Improve stability of cmsnamed
>   * S8010209, CVE-2013-2460: Better provision of factories
>   * S8011243, CVE-2013-2470: Improve ImagingLib
>   * S8011248, CVE-2013-2471: Better Component Rasters
>   * S8011253, CVE-2013-2472: Better Short Component Rasters
>   * S8011257, CVE-2013-2473: Better Byte Component Rasters
>   * S8012375, CVE-2013-1571: Improve Javadoc framing
>   * S8012421: Better positioning of PairPositioning
>   * S8012438, CVE-2013-2463: Better image validation
>   * S8012597, CVE-2013-2465: Better image channel verification
>   * S8012601, CVE-2013-2469: Better validation of image layouts
>   * S8014281, CVE-2013-2461: Better checking of XML signature
>   * S8015997: Additional improvement in Javadoc framing
>
> The HotSpot part of S8001330 is currently only provided for HotSpot
> 23.7 on x86, x86_64 and SPARC architectures as we've found it to be
> unstable when applied to the older HotSpot used by Zero.  If we find a
> solution for this, we'll issue a further update.
>
> In addition, IcedTea includes the usual IcedTea patches to allow
> builds against system libraries and to support more esoteric
> architectures.
>
> If you find an issue with the release, please report it to our bug
> database (http://icedtea.classpath.org/bugzilla) under the appropriate
> component. Development discussion takes place on the
> distro-pkg-dev at openjdk.java.net mailing list and patches are always
> welcome.
>
> Full details of the release can be found below.  Note that the unusually
> large number of backports is due to syncing with the upstream u25 release,
> which also provides all these.
>
> What's New?
> ===========
>
> New in release 2.3.10 (2013-06-28):
>
> * Security fixes
>   - S6741606, CVE-2013-2407: Integrate Apache Santuario
>   - S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls
>   - S7170730, CVE-2013-2451: Improve Windows network stack support.
>   - S8000638, CVE-2013-2450: Improve deserialization
>   - S8000642, CVE-2013-2446: Better handling of objects for transportation
>   - S8001032: Restrict object access
>   - S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers
>   - S8001034, CVE-2013-1500: Memory management improvements
>   - S8001038, CVE-2013-2444: Resourcefully handle resources
>   - S8001043: Clarify definition restrictions
>   - S8001308: Update display of applet windows
>   - S8001309: Better handling of annotation interfaces
>   - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost
>   - S8001330, CVE-2013-2443: Improve on checking order (non-Zero builds only)
>   - S8003703, CVE-2013-2412: Update RMI connection dialog box
>   - S8004288, CVE-2013-2449: (fs) Files.probeContentType problems
>   - S8004584: Augment applet contextualization
>   - S8005007: Better glyph processing
>   - S8006328, CVE-2013-2448: Improve robustness of sound classes
>   - S8006611: Improve scripting
>   - S8007467: Improve robustness of JMX internal APIs
>   - S8007471: Improve MBean notifications
>   - S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes
>   - S8007925: Improve cmsStageAllocLabV2ToV4curves
>   - S8007926: Improve cmsPipelineDup
>   - S8007927: Improve cmsAllocProfileSequenceDescription
>   - S8007929: Improve CurvesAlloc
>   - S8008120, CVE-2013-2457: Improve JMX class checking
>   - S8008124, CVE-2013-2453: Better compliance testing
>   - S8008128: Better API coherence for JMX
>   - S8008132, CVE-2013-2456: Better serialization support
>   - S8008585: Better JMX data handling
>   - S8008593: Better URLClassLoader resource management
>   - S8008603: Improve provision of JMX providers
>   - S8008607: Better input checking in JMX
>   - S8008611: Better handling of annotations in JMX
>   - S8008615: Improve robustness of JMX internal APIs
>   - S8008623: Better handling of MBeanServers
>   - S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606
>   - S8008982: Adjust JMX for underlying interface changes
>   - S8009004: Better implementation of RMI connections
>   - S8009008: Better manage management-api
>   - S8009013: Better handling of T2K glyphs
>   - S8009034: Improve resulting notifications in JMX
>   - S8009038: Improve JMX notification support
>   - S8009057, CVE-2013-2448: Improve MIDI event handling
>   - S8009067: Improve storing keys in KeyStore
>   - S8009071, CVE-2013-2459: Improve shape handling
>   - S8009235: Improve handling of TSA data
>   - S8009424, CVE-2013-2458: Adapt Nashorn to JSR-292 implementation change
>   - S8009554, CVE-2013-2454: Improve SerialJavaObject.getFields
>   - S8009654: Improve stability of cmsnamed
>   - S8010209, CVE-2013-2460: Better provision of factories
>   - S8011243, CVE-2013-2470: Improve ImagingLib
>   - S8011248, CVE-2013-2471: Better Component Rasters
>   - S8011253, CVE-2013-2472: Better Short Component Rasters
>   - S8011257, CVE-2013-2473: Better Byte Component Rasters
>   - S8012375, CVE-2013-1571: Improve Javadoc framing
>   - S8012421: Better positioning of PairPositioning
>   - S8012438, CVE-2013-2463: Better image validation
>   - S8012597, CVE-2013-2465: Better image channel verification
>   - S8012601, CVE-2013-2469: Better validation of image layouts
>   - S8014281, CVE-2013-2461: Better checking of XML signature
>   - S8015997: Additional improvement in Javadoc framing
> * New features
>   - PR1378: Add AArch64 support to Zero
> * Bug fixes
>   - PR1409: IcedTea 2.3.9 fails to build Zero due to -Werror
>   - PR1410: Icedtea 2.3.9 fails to build using icedtea 1.12.4
> * Backports
>   - S6720349: (ch) Channels tests depending on hosts inside Sun
>   - S6736316: Timeout value in java/util/concurrent/locks/Lock/FlakyMutex.java is insufficient
>   - S6776144: java/lang/ThreadGroup/NullThreadName.java fails with Thread group is not destroyed ,fastdebug LINUX
>   - S6818464: TEST_BUG: java/util/Timer/KillThread.java failing intermittently
>   - S6860309: TEST_BUG: Insufficient sleep time in java/lang/Runtime/exec/StreamsSurviveDestroy.java
>   - S6948101: java/rmi/transport/pinLastArguments/PinLastArguments.java failing intermittently
>   - S6957683: test/java/util/concurrent/ThreadPoolExecutor/Custom.java failing
>   - S6963102: Testcase failures sun/tools/jstatd/jstatdExternalRegistry.sh and sun/tools/jstatd/jstatdDefaults.sh
>   - S6963841: java/util/concurrent/Phaser/Basic.java fails intermittently
>   - S6965150: TEST_BUG: java/nio/channels/AsynchronousSocketChannel/Basic.java takes too long
>   - S7030573: test/java/io/FileInputStream/LargeFileAvailable.java fails when there is insufficient disk space
>   - S7032247: java/net/InetAddress/GetLocalHostWithSM.java fails if hostname resolves to loopback address
>   - S7044870: java/nio/channels/DatagramChannel/SelectWhenRefused.java failed on SUSE Linux 10
>   - S7053526: Upgrade JDK 8 to use Little CMS 2.4
>   - S7054918: jdk_security1 test target cleanup
>   - S7055362: jdk_security2 test target cleanup
>   - S7055363: jdk_security3 test target cleanup
>   - S7072120: No mac os x support in several regression tests
>   - S7073295: TEST_BUG: test/java/lang/instrument/ManifestTest.sh causing havoc (win)
>   - S7076756: TEST_BUG: com/sun/jdi/BreakpointWithFullGC.sh fails to cleanup in Cygwin
>   - S7076791: closed/javax/swing/JColorChooser/Test6827032.java failed on windows
>   - S7077259: [TEST_BUG] [macosx] Test work correctly only when default L&F is Metal
>   - S7084033: TEST_BUG: test/java/lang/ThreadGroup/Stop.java fails intermittently
>   - S7089131: test/java/lang/invoke/InvokeGenericTest.java does not compile
>   - S7102106: TEST_BUG: sun/security/util/Oid/S11N.sh should be modified
>   - S7104161: test/sun/tools/jinfo/Basic.sh fails on Ubuntu
>   - S7104594: [macosx] Test closed/javax/swing/JFrame/4962534/bug4962534 expects Metal L&F by default
>   - S7105929: java/util/concurrent/FutureTask/BlockingTaskExecutor.java fails on solaris sparc
>   - S7124347: [macosx] "java.lang.InternalError: not implemented yet" on call Graphics2D.drawRenderedImage
>   - S7129800: [macosx] Regression test OverrideRedirectWindowActivationTest fails due to timing issue
>   - S7132247: java/rmi/registry/readTest/readTest.sh failing with Cygwin
>   - S7140868: TEST_BUG: jcmd tests need to use -XX:+UsePerfData
>   - S7142596: RMI JPRT tests are failing
>   - S7144833: sun/tools/jcmd/jcmd-Defaults.sh failing intermittently
>   - S7144861: speed up RMI activation tests
>   - S7147408: [macosx] Add autodelay to fix a regression test
>   - S7151434, RH969884: java -jar -XX crashes java launcher
>   - S7152183: TEST_BUG: java/lang/ProcessBuilder/Basic.java failing intermittently [sol]
>   - S7152796: TEST_BUG: java/net/Socks/SocksV4Test.java does not terminate
>   - S7152856: TEST_BUG: sun/net/www/protocol/jar/B4957695.java failing on Windows
>   - S7154113: jcmd, jps and jstat tests failing when there are unknown Java processes on the system
>   - S7154114: jstat tests failing on non-english locales
>   - S7161759: TEST_BUG: java/awt/Frame/WindowDragTest/WindowDragTest.java fails to compile, should be modified
>   - S7162111: TEST_BUG: change tests run in headless mode [macosx]
>   - S7162385: TEST_BUG: sun/net/www/protocol/jar/B4957695.java failing again
>   - S7175775: Disable SA options in jinfo/Basic.java test until SA updated for new hash and String count/offset
>   - S7178649: TEST BUG: BadKdc3.java needs improvement to ignore the unlikely but possible timeout
>   - S7183203: ShortRSAKeynnn.sh tests intermittent failure
>   - S7183753: [TEST] Some colon in the diff for this test
>   - S7184943: fix failing test com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java
>   - S7184946: fix failing test com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java
>   - S7185340: TEST_BUG: java/nio/channels/AsynchronousSocketChannel/Leaky.java failing intermittently [win]
>   - S7186111: fix bugs in java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup
>   - S7187882: TEST_BUG: java/rmi/activation/checkusage/CheckUsage.java fails intermittently
>   - S7193219: JComboBox serialization fails in JDK 1.7
>   - S7194032: update tests for upcoming changes for jtreg
>   - S7194035: update tests for upcoming changes for jtreg
>   - S7199143: RFE: OCSP revocation checker should provide possibility to specify connection timeout
>   - S7199637: TEST_BUG: add serialization tests to jdk7u problem list for macosx
>   - S8000817: Reinstate accidentally removed sleep() from ProcessBuilder/Basic.java
>   - S8001161: mac: EmbeddedFrame doesn't become active window
>   - S8001621: Update awk scripts that check output from jps/jcmd
>   - S8002070: Remove the stack search for a resource bundle for Logger to use
>   - S8002297: sun/net/www/protocol/http/StackTraceTest.java fails intermittently
>   - S8002313: TEST_BUG : jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.java should run in headless mode
>   - S8003597: TEST_BUG: Eliminate dependency on javaweb from closed net tests
>   - S8003982: new test javax/swing/AncestorNotifier/7193219/bug7193219.java failed on macosx
>   - S8004317: TestLibrary.getUnusedRandomPort() fails intermittently, but exception not reported
>   - S8004748: clean up @build tags in RMI tests
>   - S8004925: java/net/Socks/SocksV4Test.java failing on all platforms
>   - S8005290: remove -showversion from RMI test library subprocess mechanism
>   - S8005556: java/net/Socks/SocksV4Test.java is missing @run tag
>   - S8005646: TEST_BUG: java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup leaves process running
>   - S8005920: After pressing combination Windows Key and M key, the frame, the instruction and the dialog can't be minimized.
>   - S8005932: Java 7 on mac os x only provides text clipboard formats
>   - S8006120: Provide "Server JRE" for 7u train
>   - S8006417: JComboBox.showPopup(), hidePopup() fails in JRE 1.7 on OS X
>   - S8006534: CLONE - TestLibrary.getUnusedRandomPort() fails intermittently-doesn't retry enough times
>   - S8006536: [launcher]  removes trailing slashes on arguments
>   - S8006560: java/net/ipv6tests/B6521014.java fails intermittently
>   - S8006564: Test sun/security/util/Oid/S11N.sh fails with timeout on Linux 32-bit
>   - S8006669: sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh fails on mac
>   - S8007515: TEST_BUG: update ProblemList.txt and TEST.ROOT in jdk7u-dev to match jdk8
>   - S8007699: Move some tests from test/sun/security/provider/certpath/X509CertPath to closed repo
>   - S8008223: java/net/BindException/Test.java fails rarely
>   - S8008249: Sync ICU into JDK :
>   - S8008379: TEST_BUG: Fail automatically with java.lang.NullPointerException.
>   - S8008815: [TEST_BUG] Add back tests to the Problemlist files post the jdk7u -> 7u-cpu test sync up
>   - S8009165: Fix for 8008817 needs revision
>   - S8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03
>   - S8009463: Regression test test\java\lang\Runtime\exec\ArgWithSpaceAndFinalBackslash.java failing.
>   - S8009530: ICU Kern table support broken
>   - S8009610: Blacklist certificate used with malware.
>   - S8009634: TEST_BUG: sun/misc/Version/Version.java handle 2 digit minor in VM version
>   - S8009750: javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java should run in other vm mode
>   - S8009987: (tz) Support tzdata2013b
>   - S8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail
>   - S8009999: Test sun/tools/jcmd/jcmd-f.sh failing after JDK-8008820
>   - S8010009: [macosx] Unable type into online word games on MacOSX
>   - S8010118: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive
>   - S8010166: TEST_BUG: fix for 8009634 overlooks possible version strings (sun/misc/Version/Version.java)
>   - S8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build
>   - S8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod
>   - S8010727: WLS fails to add a logger with "" in its own LogManager subclass instance
>   - S8010939: Deadlock in LogManager
>   - S8011139: (reflect) Revise checking in getEnclosingClass
>   - S8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows
>   - S8011313: OCSP timeout set to wrong value if com.sun.security.ocsp.timeout not defined
>   - S8011557: Improve reflection utility classes
>   - S8011695: [tck-red] Application can not be run, the Security Warning dialog is gray.
>   - S8011806: 7u25-b05 hotspot fastdebug build failure
>   - S8011896: Add check for invalid offset for new AccessControlContext isAuthorized field
>   - S8011990: TEST_BUG: java/util/logging/bundlesearch/ResourceBundleSearchTest.java fails on Windows
>   - S8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05
>   - S8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris
>   - S8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21
>   - S8012330: [macosx] Sometimes the applet showing the modal dialog itself loses the ability to gain focus
>   - S8012453: (process) Runtime.exec(String) fails if command contains spaces [win]
>   - S8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer
>   - S8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07
>   - S8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext()
>   - S8013228: Create new system properties to control allowable OCSP clock skew and CRL connection timeout
>   - S8013380: Removal of stack walk to find resource bundle breaks Glassfish startup
>   - S8014205: Most of the Swing dialogs are blank on one win7 MUI
>   - S8014423: [macosx] The scrollbar's block increment performs incorrectly
>   - S8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09
>   - S8014618, RH868136: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement
>   - S8014676: Java debugger may fail to run
>   - S8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10
>   - S8014745: Provide a switch to allow stack walk search of resource bundle
>   - S8014968: OCSP and CRL connection timeout is set to four hours by default
>
> The tarball can be downloaded from:
>
>     http://icedtea.classpath.org/download/source/icedtea-2.3.10.tar.gz
>
> SHA256 checksum:
>
>     d1c3b9423867b41508050e1d32b38e4a090f84a96b864b09936a4281ff01f5da  icedtea-2.3.10.tar.gz
>
> The tarball is accompanied by a digital signature available at:
>
>     http://icedtea.classpath.org/download/source/icedtea-2.3.10.tar.gz.sig
>
> This is produced using my public key. See details below.
>
>     PGP Key: 248BDC07 (https://keys.indymedia.org/)
>     Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07
>
> The following people helped with these releases:
>
>  * Andreas Schwab (PR1378 patch for AArch64 Zero support)
>  * Andrew Hughes (all other bug fixes, application of security fixes & backports, release management)
>
> We would also like to thank the bug reporters and testers!
>
> To get started:
>
> $ tar xzf icedtea-2.3.10.tar.gz
> $ mkdir icedtea-build
> $ cd icedtea-build
> $ ../icedtea-2.3.10/configure
> $ make
>
> Full build requirements and instructions are available in the INSTALL file.
>
> Happy hacking!
> --
> Andrew :)
>
> PGP Key: 248BDC07 (https://keys.indymedia.org/)
> Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07

In this release, use of the system version of LCMS is disabled by
default to ensure the most secure version is used. Before using the
system version, please ensure it has the S8007925, S8007926, S8007927,
S8007929 and S8009654 updates listed above.
--
Andrew :-)


From adomurad at icedtea.classpath.org  Fri Jun 28 07:07:34 2013
From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org)
Date: Fri, 28 Jun 2013 14:07:34 +0000
Subject: /hg/release/icedtea-web-1.4: Fix potential NPE on GetValue message
Message-ID: 

changeset 6cd78e135d41 in /hg/release/icedtea-web-1.4
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=6cd78e135d41
author: Adam Domurad 
date: Fri Jun 28 10:07:19 2013 -0400

	Fix potential NPE on GetValue message


diffstat:

 ChangeLog                                                         |  5 +++++
 plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java |  3 ++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diffs (26 lines):

diff -r be23db7861a6 -r 6cd78e135d41 ChangeLog
--- a/ChangeLog	Fri Jun 28 14:02:37 2013 +0200
+++ b/ChangeLog	Fri Jun 28 10:07:19 2013 -0400
@@ -1,3 +1,8 @@
+2013-06-28  Adam Domurad  
+
+	* plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
+	(handleMessage): Fix potential NPE on 'GetValue'
+
 2013-06-24  Jiri Vanek 
 
 	JNLP file is now re-downloading only if is local and have href
diff -r be23db7861a6 -r 6cd78e135d41 plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java	Fri Jun 28 14:02:37 2013 +0200
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java	Fri Jun 28 10:07:19 2013 -0400
@@ -522,8 +522,9 @@
                 Integer index = parseCall(args[1], null, Integer.class);
 
                 Object ret = store.getObject(index);
+                Class retClass = ret != null ? ret.getClass() : null;
 
-                String objIDStr = toObjectIDString(ret, ret.getClass(), true /*unbox primitives*/);
+                String objIDStr = toObjectIDString(ret, retClass, true /*unbox primitives*/);
                 write(reference, "GetValue " + objIDStr);
             } else if (message.startsWith("SetStaticField") ||
                                    message.startsWith("SetField")) {


From bugzilla-daemon at icedtea.classpath.org  Fri Jun 28 15:40:31 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Fri, 28 Jun 2013 22:40:31 +0000
Subject: [Bug 1489] New: no sound with KGS GO server
Message-ID: 

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

            Bug ID: 1489
           Summary: no sound with KGS GO server
    Classification: Unclassified
           Product: IcedTea-Web
           Version: unspecified
          Hardware: x86_64
                OS: Linux
            Status: NEW
          Severity: normal
          Priority: P3
         Component: NetX (javaws)
          Assignee: omajid at redhat.com
          Reporter: xzurukneg at free.fr
                CC: unassigned at icedtea.classpath.org

No sound with KGS GO server:
try it:
http://www.gokgs.com/applet.jsp

Personnaly, I use Cgoban3:
http://www.gokgs.com/download.jsp

But still no sound.
Try it: normaly, you ear bell wen you start a play (test against a bot as a
guess), went you put a stone to play, when time in warging  etc..

It's bad because sound is verry important to play (notification,alarm, etc..).

Before I was using java sun/oracle packages without problem.
But I use ubuntu and there is no more package that can run this apllication
with sound.

Thank you!

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130628/cdf2afc4/attachment.html 

From stefan at complang.tuwien.ac.at  Sat Jun 29 09:00:02 2013
From: stefan at complang.tuwien.ac.at (Stefan Ring)
Date: Sat, 29 Jun 2013 18:00:02 +0200
Subject: CACAO 1.6.1 released
Message-ID: 

This is a snapshot release.

* Support for OpenJDK 7.
* ARM: Support for hard-float systems (PR172).
* Fixed remaining icedtea6 check-langtools failures (PR166, PR167).
* Reworked internal string representation.
* Completed migration to C++ for almost all remaining files.
* alpha: Regression tests work again.
* Introduced a new logging framework in more idiomatic C++.
* PR178, PR179: Introduced checks for junit and jasmin at configure time.
* PR184: Repair build on armv4.
* Assorted minor infrastructure and build fixes and improvements.

In the traditional configuration, CACAO uses GNU Classpath as its default Java
runtime library and supports upstream releases or the current git master
branch. This release is tested against GNU Classpath 0.99. Alternatively, the
preferred configuration is to build against OpenJDK 6. See INSTALL.CACAO for
details.

Currently supported JIT compiler architectures are:

* alpha
* arm (armv5l, armv7l)
* i386
* powerpc
* powerpc64
* x86_64

Currently orphaned architectures, on which earlier releases of CACAO
were known to work, are:

* m68k
* mips (mipsel, mips64)
* s390
* sparc64

CACAO 1.6.1 can be downloaded from
http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-1.6.1/

| File : cacao-1.6.1.tar.gz
| sha1sum: 439055965595e669573023a32531ef4d26bfcc30
| File : cacao-1.6.1.tar.xz
| sha1sum: 0928b449cf6260a44b93690f4c0ce0437320f2bd

Enjoy!

| CACAOVM - Verein zur F?rderung der freien virtuellen Maschine CACAO
| cacao at cacaojvm.org


From andrew at icedtea.classpath.org  Sat Jun 29 16:48:42 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Sat, 29 Jun 2013 23:48:42 +0000
Subject: /hg/release/icedtea7-2.2: 5 new changesets
Message-ID: 

changeset 59a35368e3f7 in /hg/release/icedtea7-2.2
details: http://icedtea.classpath.org/hg/release/icedtea7-2.2?cmd=changeset;node=59a35368e3f7
author: Andrew John Hughes 
date: Sat Jun 29 22:49:34 2013 +0100

	Remove 8001330 patch which causes build to fail.

	2013-06-29  Andrew John Hughes  

		* Makefile.am,
		(HOTSPOT_CHANGESET): Update to revised IcedTea7 2.2.9
		tag, removing 8001330.
		(HOTSPOT_SHA256SUM): Likewise.
		* NEWS: Remove 8001330.
		* patches/boot/ecj-stringswitch.patch:
		Merge two MethodHandleNatives patches.


changeset 574d43fdc2fd in /hg/release/icedtea7-2.2
details: http://icedtea.classpath.org/hg/release/icedtea7-2.2?cmd=changeset;node=574d43fdc2fd
author: Andrew John Hughes 
date: Fri Jun 28 01:30:06 2013 -0500

	Turn off system LCMS by default and warn if enabled, as it is unlikely to have the latest security updates.

	2013-06-28  Andrew John Hughes  

		* acinclude.m4:
		(IT_WITH_HOTSPOT_BUILD): Define once.
		(IT_CHECK_FOR_LCMS): Turn system LCMS off by default
		and warn if enabled as it is unlikely to have
		the new security fixes.
		* configure.ac: Drop IT_ENABLE_ZERO_BUILD; called
		by IT_WITH_HOTSPOT_BUILD.


changeset 3655623eb34d in /hg/release/icedtea7-2.2
details: http://icedtea.classpath.org/hg/release/icedtea7-2.2?cmd=changeset;node=3655623eb34d
author: Andrew John Hughes 
date: Sat Jun 29 22:51:53 2013 +0100

	Prepare for 2.2.9 release.

	2013-06-29  Andrew John Hughes  

		* configure.ac: Set to 2.2.9.
		* NEWS: Set release date.


changeset c927db268b09 in /hg/release/icedtea7-2.2
details: http://icedtea.classpath.org/hg/release/icedtea7-2.2?cmd=changeset;node=c927db268b09
author: Andrew John Hughes 
date: Sun Jun 30 00:48:09 2013 +0100

	Amend LCMS changes for 2.2.

	2013-06-29  Andrew John Hughes  

		* acinclude.m4:
		(IT_ENABLE_ZERO_BUILD): Define once only.
		* configure.ac: Revert previous change,
		adding back IT_ENABLE_ZERO_BUILD as this
		is not invoked by IT_WITH_HOTSPOT_BUILD in
		2.2.x.


changeset a59e86a12ac9 in /hg/release/icedtea7-2.2
details: http://icedtea.classpath.org/hg/release/icedtea7-2.2?cmd=changeset;node=a59e86a12ac9
author: Andrew John Hughes 
date: Sun Jun 30 00:48:18 2013 +0100

	Added tag icedtea-2.2.9 for changeset c927db268b09


diffstat:

 .hgtags                             |   1 +
 ChangeLog                           |  34 ++++++++++++++++++++++++++++++++++
 Makefile.am                         |   4 ++--
 NEWS                                |   3 +--
 acinclude.m4                        |   9 +++++----
 configure.ac                        |   2 +-
 patches/boot/ecj-stringswitch.patch |   3 ---
 7 files changed, 44 insertions(+), 12 deletions(-)

diffs (152 lines):

diff -r c8f337eac826 -r a59e86a12ac9 .hgtags
--- a/.hgtags	Fri Jun 28 02:49:03 2013 +0100
+++ b/.hgtags	Sun Jun 30 00:48:18 2013 +0100
@@ -42,3 +42,4 @@
 af9f6b25365c6b6f906ca5386649912945bc596f icedtea-2.2.6
 f431ba3ea9d46d6c7758c8d1e97c818b43e46b8d icedtea-2.2.7
 d3b6c2b728a8630154557f8bfafc30ebb12524e8 icedtea-2.2.8
+c927db268b09520a9562148c13dd42dc6ad3e73d icedtea-2.2.9
diff -r c8f337eac826 -r a59e86a12ac9 ChangeLog
--- a/ChangeLog	Fri Jun 28 02:49:03 2013 +0100
+++ b/ChangeLog	Sun Jun 30 00:48:18 2013 +0100
@@ -1,3 +1,37 @@
+2013-06-29  Andrew John Hughes  
+
+	* acinclude.m4:
+	(IT_ENABLE_ZERO_BUILD): Define once only.
+	* configure.ac: Revert previous change,
+	adding back IT_ENABLE_ZERO_BUILD as this
+	is not invoked by IT_WITH_HOTSPOT_BUILD in
+	2.2.x.
+
+2013-06-29  Andrew John Hughes  
+
+	* configure.ac: Set to 2.2.9.
+	* NEWS: Set release date.
+
+2013-06-28  Andrew John Hughes  
+
+	* acinclude.m4:
+	(IT_WITH_HOTSPOT_BUILD): Define once.
+	(IT_CHECK_FOR_LCMS): Turn system LCMS off by default
+	and warn if enabled as it is unlikely to have
+	the new security fixes.
+	* configure.ac: Drop IT_ENABLE_ZERO_BUILD; called
+	by IT_WITH_HOTSPOT_BUILD.
+
+2013-06-29  Andrew John Hughes  
+
+	* Makefile.am,
+	(HOTSPOT_CHANGESET): Update to revised IcedTea7 2.2.9
+	tag, removing 8001330.
+	(HOTSPOT_SHA256SUM): Likewise.
+	* NEWS: Remove 8001330.
+	* patches/boot/ecj-stringswitch.patch:
+	Merge two MethodHandleNatives patches.
+
 2013-06-25  Andrew John Hughes  
 
 	* NEWS: Add Red Hat bugzilla references.
diff -r c8f337eac826 -r a59e86a12ac9 Makefile.am
--- a/Makefile.am	Fri Jun 28 02:49:03 2013 +0100
+++ b/Makefile.am	Sun Jun 30 00:48:18 2013 +0100
@@ -4,7 +4,7 @@
 JDK_UPDATE_VERSION = 05
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
 
-HOTSPOT_CHANGESET = 89a7d38e2e31
+HOTSPOT_CHANGESET = 4f1ec3403248
 CORBA_CHANGESET = 4fdf74f61b48
 JAXP_CHANGESET = 5ce90e84aa21
 JAXWS_CHANGESET = 5942fdde2af6
@@ -12,7 +12,7 @@
 LANGTOOLS_CHANGESET = 1c14c3a8ea14
 OPENJDK_CHANGESET = 0cc24300e6de
 
-HOTSPOT_SHA256SUM = 895802e8e5d3661ef9ed7f8530a595c899f056faf73b4cfa7d603777ba8f28f0
+HOTSPOT_SHA256SUM = af0c2f7ce58eecec8f2c6bb3a7093bae7817852dcd3f690474aa065fb9e1b0e2
 CORBA_SHA256SUM = 01da9cb128138afa48f9d17e800f90d1fea54db876551fe10145f4aaac01b0b3
 JAXP_SHA256SUM = 479516db3d57f1cf6ec67c26229fb70f59499a6794b90cbabb4c47d930d13229
 JAXWS_SHA256SUM = 535c443eb71aead164a9e790f368c8424a51190d25027847820a6705bee3ff72
diff -r c8f337eac826 -r a59e86a12ac9 NEWS
--- a/NEWS	Fri Jun 28 02:49:03 2013 +0100
+++ b/NEWS	Sun Jun 30 00:48:18 2013 +0100
@@ -10,7 +10,7 @@
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
-New in release 2.2.9 (2013-06-XX):
+New in release 2.2.9 (2013-06-29):
 
 * New features
   - PR1378: Add AArch64 support to Zero
@@ -28,7 +28,6 @@
   - S8001308: Update display of applet windows
   - S8001309: Better handling of annotation interfaces
   - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost
-  - S8001330, CVE-2013-2443: Improve on checking order
   - S8003703, CVE-2013-2412: Update RMI connection dialog box
   - S8004288, CVE-2013-2449: (fs) Files.probeContentType problems
   - S8004584: Augment applet contextualization
diff -r c8f337eac826 -r a59e86a12ac9 acinclude.m4
--- a/acinclude.m4	Fri Jun 28 02:49:03 2013 +0100
+++ b/acinclude.m4	Sun Jun 30 00:48:18 2013 +0100
@@ -657,7 +657,7 @@
  AC_SUBST([$1])
 ])
 
-AC_DEFUN([IT_ENABLE_ZERO_BUILD],
+AC_DEFUN_ONCE([IT_ENABLE_ZERO_BUILD],
 [
   AC_REQUIRE([IT_SET_ARCH_SETTINGS])
   AC_MSG_CHECKING([whether to use the zero-assembler port])
@@ -928,7 +928,7 @@
   AC_SUBST([GCJ])
 ])
 
-AC_DEFUN([IT_WITH_HOTSPOT_BUILD],
+AC_DEFUN_ONCE([IT_WITH_HOTSPOT_BUILD],
 [
   DEFAULT_BUILD="default"
   AC_MSG_CHECKING([which HotSpot build to use])
@@ -1873,15 +1873,16 @@
 [
   AC_MSG_CHECKING([whether to use the system LCMS install])
   AC_ARG_ENABLE([system-lcms],
-	      [AS_HELP_STRING(--enable-system-lcms,use the system LCMS [[default=yes]])],
+	      [AS_HELP_STRING(--enable-system-lcms,use the system LCMS [[default=no]])],
   [
     ENABLE_SYSTEM_LCMS="${enableval}"
   ],
   [
-    ENABLE_SYSTEM_LCMS="yes"
+    ENABLE_SYSTEM_LCMS="no"
   ])
   AC_MSG_RESULT(${ENABLE_SYSTEM_LCMS})
   if test x"${ENABLE_SYSTEM_LCMS}" = "xyes"; then
+    AC_MSG_WARN([System LCMS may not have the latest security updates])
     dnl Check for LCMS2 headers and libraries.
     PKG_CHECK_MODULES(LCMS2, lcms2,[LCMS2_FOUND=yes],[LCMS2_FOUND=no])
     if test "x${LCMS2_FOUND}" = xno
diff -r c8f337eac826 -r a59e86a12ac9 configure.ac
--- a/configure.ac	Fri Jun 28 02:49:03 2013 +0100
+++ b/configure.ac	Sun Jun 30 00:48:18 2013 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.2.9pre], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.2.9], [distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 
diff -r c8f337eac826 -r a59e86a12ac9 patches/boot/ecj-stringswitch.patch
--- a/patches/boot/ecj-stringswitch.patch	Fri Jun 28 02:49:03 2013 +0100
+++ b/patches/boot/ecj-stringswitch.patch	Sun Jun 30 00:48:18 2013 +0100
@@ -484,9 +484,6 @@
              return defc == java.util.logging.Logger.class;
          }
          return false;
-diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java	2013-06-27 16:08:36.739202429 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java	2013-06-27 16:40:02.673171484 +0100
 @@ -528,10 +528,10 @@
      private static boolean canBeCalledVirtual(MemberName mem) {
          assert(mem.isInvocable());


From andrew at icedtea.classpath.org  Sat Jun 29 16:48:49 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Sat, 29 Jun 2013 23:48:49 +0000
Subject: /hg/release/icedtea7-forest-2.2/hotspot: 2 new changesets
Message-ID: 

changeset bf1bb029c403 in /hg/release/icedtea7-forest-2.2/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/hotspot?cmd=changeset;node=bf1bb029c403
author: andrew
date: Sat Jun 29 21:19:39 2013 +0100

	Removed tag icedtea-2.2.9


changeset 71ac3f5046c6 in /hg/release/icedtea7-forest-2.2/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/hotspot?cmd=changeset;node=71ac3f5046c6
author: andrew
date: Sat Jun 29 21:19:45 2013 +0100

	Added tag icedtea-2.2.9 for changeset 4f1ec3403248


diffstat:

 .hgtags |  4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diffs (11 lines):

diff -r 09d4dd5ec76d -r 71ac3f5046c6 .hgtags
--- a/.hgtags	Thu Jun 27 05:35:40 2013 +0100
+++ b/.hgtags	Sat Jun 29 21:19:45 2013 +0100
@@ -294,3 +294,7 @@
 de365dd264846fcb73fed2afc3cd41652eb44ce1 icedtea-2.2.7
 168d05b42b8900de8974b5d5cee9e65d19c9db02 icedtea-2.2.8
 89a7d38e2e31a3d81aaae7a1ea52862a5a71b042 icedtea-2.2.9
+89a7d38e2e31a3d81aaae7a1ea52862a5a71b042 icedtea-2.2.9
+0000000000000000000000000000000000000000 icedtea-2.2.9
+0000000000000000000000000000000000000000 icedtea-2.2.9
+4f1ec3403248e910918903f1d37ad15391ac49ff icedtea-2.2.9


From andrew at icedtea.classpath.org  Sat Jun 29 18:58:42 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Sun, 30 Jun 2013 01:58:42 +0000
Subject: /hg/release/icedtea7-2.1: 3 new changesets
Message-ID: 

changeset a3780f9b9d89 in /hg/release/icedtea7-2.1
details: http://icedtea.classpath.org/hg/release/icedtea7-2.1?cmd=changeset;node=a3780f9b9d89
author: Andrew John Hughes 
date: Sun Jun 30 00:53:37 2013 +0100

	Turn off system LCMS by default and warn if enabled, as it is unlikely to have the latest security updates.

	2013-06-28  Andrew John Hughes  

		* acinclude.m4:
		(IT_WITH_HOTSPOT_BUILD): Define once.
		(IT_CHECK_FOR_LCMS): Turn system LCMS off by default
		and warn if enabled as it is unlikely to have
		the new security fixes.


changeset 07eebe149062 in /hg/release/icedtea7-2.1
details: http://icedtea.classpath.org/hg/release/icedtea7-2.1?cmd=changeset;node=07eebe149062
author: Andrew John Hughes 
date: Sun Jun 30 00:55:06 2013 +0100

	Prepare for 2.1.9 release.

	2013-06-29  Andrew John Hughes  

		* configure.ac: Set to 2.1.9.
		* NEWS: Set release date.


changeset 9f2d90dee407 in /hg/release/icedtea7-2.1
details: http://icedtea.classpath.org/hg/release/icedtea7-2.1?cmd=changeset;node=9f2d90dee407
author: Andrew John Hughes 
date: Sun Jun 30 02:58:35 2013 +0100

	Added tag icedtea-2.1.9 for changeset 07eebe149062


diffstat:

 .hgtags      |   1 +
 ChangeLog    |  13 +++++++++++++
 NEWS         |   2 +-
 acinclude.m4 |   7 ++++---
 configure.ac |   2 +-
 5 files changed, 20 insertions(+), 5 deletions(-)

diffs (80 lines):

diff -r 7e0b337628c1 -r 9f2d90dee407 .hgtags
--- a/.hgtags	Fri Jun 28 06:45:21 2013 +0100
+++ b/.hgtags	Sun Jun 30 02:58:35 2013 +0100
@@ -45,3 +45,4 @@
 05bc6e6f7d9cbed6d4760813236856c9782c5277 icedtea-2.1.6
 04dbdea00c8531667d0273ed9ee76fa7db645f94 icedtea-2.1.7
 40b919581506871ff1e35d9b635b4bb371d656aa icedtea-2.1.8
+07eebe1490625b19f5444e8099ecc20957714e85 icedtea-2.1.9
diff -r 7e0b337628c1 -r 9f2d90dee407 ChangeLog
--- a/ChangeLog	Fri Jun 28 06:45:21 2013 +0100
+++ b/ChangeLog	Sun Jun 30 02:58:35 2013 +0100
@@ -1,3 +1,16 @@
+2013-06-29  Andrew John Hughes  
+
+	* configure.ac: Set to 2.1.9.
+	* NEWS: Set release date.
+
+2013-06-28  Andrew John Hughes  
+
+	* acinclude.m4:
+	(IT_WITH_HOTSPOT_BUILD): Define once.
+	(IT_CHECK_FOR_LCMS): Turn system LCMS off by default
+	and warn if enabled as it is unlikely to have
+	the new security fixes.
+
 2013-06-25  Andrew John Hughes  
 
 	* NEWS: Add Red Hat bugzilla references.
diff -r 7e0b337628c1 -r 9f2d90dee407 NEWS
--- a/NEWS	Fri Jun 28 06:45:21 2013 +0100
+++ b/NEWS	Sun Jun 30 02:58:35 2013 +0100
@@ -10,7 +10,7 @@
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
-New in release 2.1.9 (2013-06-XX):
+New in release 2.1.9 (2013-06-29):
 
 * New features
   - PR1378: Add AArch64 support to Zero
diff -r 7e0b337628c1 -r 9f2d90dee407 acinclude.m4
--- a/acinclude.m4	Fri Jun 28 06:45:21 2013 +0100
+++ b/acinclude.m4	Sun Jun 30 02:58:35 2013 +0100
@@ -928,7 +928,7 @@
   AC_SUBST([GCJ])
 ])
 
-AC_DEFUN([IT_WITH_HOTSPOT_BUILD],
+AC_DEFUN_ONCE([IT_WITH_HOTSPOT_BUILD],
 [
   DEFAULT_BUILD="default"
   AC_MSG_CHECKING([which HotSpot build to use])
@@ -1873,15 +1873,16 @@
 [
   AC_MSG_CHECKING([whether to use the system LCMS install])
   AC_ARG_ENABLE([system-lcms],
-	      [AS_HELP_STRING(--enable-system-lcms,use the system LCMS [[default=yes]])],
+	      [AS_HELP_STRING(--enable-system-lcms,use the system LCMS [[default=no]])],
   [
     ENABLE_SYSTEM_LCMS="${enableval}"
   ],
   [
-    ENABLE_SYSTEM_LCMS="yes"
+    ENABLE_SYSTEM_LCMS="no"
   ])
   AC_MSG_RESULT(${ENABLE_SYSTEM_LCMS})
   if test x"${ENABLE_SYSTEM_LCMS}" = "xyes"; then
+    AC_MSG_WARN([System LCMS may not have the latest security updates])
     dnl Check for LCMS2 headers and libraries.
     PKG_CHECK_MODULES(LCMS2, lcms2,[LCMS2_FOUND=yes],[LCMS2_FOUND=no])
     if test "x${LCMS2_FOUND}" = xno
diff -r 7e0b337628c1 -r 9f2d90dee407 configure.ac
--- a/configure.ac	Fri Jun 28 06:45:21 2013 +0100
+++ b/configure.ac	Sun Jun 30 02:58:35 2013 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.1.9pre], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.1.9], [distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 


From gnu_andrew at member.fsf.org  Sun Jun 30 06:21:13 2013
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Sun, 30 Jun 2013 14:21:13 +0100
Subject: [SECURITY] IcedTea 2.1.9 & 2.2.9 for OpenJDK 7 Released!
Message-ID: <20130630132112.GA11513@carrie.middle-earth.co.uk>

The IcedTea project provides a harness to build the source code from
OpenJDK using Free Software build tools, along with additional
features such as a PulseAudio sound driver and support for alternative
virtual machines.

These releases update our OpenJDK 7 support to include the latest
security updates. We recommend that users of the 2.1.x and 2.2.x branches
upgrade to the latest release as soon as possible. The security fixes are as
follows:

  * S6741606, CVE-2013-2407: Integrate Apache Santuario
  * S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls
  * S7170730, CVE-2013-2451: Improve Windows network stack support.
  * S8000638, CVE-2013-2450: Improve deserialization
  * S8000642, CVE-2013-2446: Better handling of objects for transportation
  * S8001032: Restrict object access
  * S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers
  * S8001034, CVE-2013-1500: Memory management improvements
  * S8001038, CVE-2013-2444: Resourcefully handle resources
  * S8001043: Clarify definition restrictions
  * S8001308: Update display of applet windows
  * S8001309: Better handling of annotation interfaces
  * S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost
  * S8003703, CVE-2013-2412: Update RMI connection dialog box
  * S8004288, CVE-2013-2449: (fs) Files.probeContentType problems
  * S8004584: Augment applet contextualization
  * S8005007: Better glyph processing
  * S8006328, CVE-2013-2448: Improve robustness of sound classes
  * S8006611: Improve scripting
  * S8007467: Improve robustness of JMX internal APIs
  * S8007471: Improve MBean notifications
  * S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes
  * S8007925: Improve cmsStageAllocLabV2ToV4curves
  * S8007926: Improve cmsPipelineDup
  * S8007927: Improve cmsAllocProfileSequenceDescription
  * S8007929: Improve CurvesAlloc
  * S8008120, CVE-2013-2457: Improve JMX class checking
  * S8008124, CVE-2013-2453: Better compliance testing
  * S8008128: Better API coherence for JMX
  * S8008132, CVE-2013-2456: Better serialization support
  * S8008585: Better JMX data handling
  * S8008593: Better URLClassLoader resource management
  * S8008603: Improve provision of JMX providers
  * S8008607: Better input checking in JMX
  * S8008611: Better handling of annotations in JMX
  * S8008615: Improve robustness of JMX internal APIs
  * S8008623: Better handling of MBeanServers
  * S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606
  * S8008982: Adjust JMX for underlying interface changes
  * S8009004: Better implementation of RMI connections
  * S8009008: Better manage management-api
  * S8009013: Better handling of T2K glyphs
  * S8009034: Improve resulting notifications in JMX
  * S8009038: Improve JMX notification support
  * S8009057, CVE-2013-2448: Improve MIDI event handling
  * S8009067: Improve storing keys in KeyStore
  * S8009071, CVE-2013-2459: Improve shape handling
  * S8009235: Improve handling of TSA data
  * S8009424, CVE-2013-2458: Adapt Nashorn to JSR-292 implementation change
  * S8009554, CVE-2013-2454: Improve SerialJavaObject.getFields
  * S8009654: Improve stability of cmsnamed
  * S8010209, CVE-2013-2460: Better provision of factories
  * S8011243, CVE-2013-2470: Improve ImagingLib
  * S8011248, CVE-2013-2471: Better Component Rasters
  * S8011253, CVE-2013-2472: Better Short Component Rasters
  * S8011257, CVE-2013-2473: Better Byte Component Rasters
  * S8012375, CVE-2013-1571: Improve Javadoc framing
  * S8012421: Better positioning of PairPositioning
  * S8012438, CVE-2013-2463: Better image validation
  * S8012597, CVE-2013-2465: Better image channel verification
  * S8012601, CVE-2013-2469: Better validation of image layouts
  * S8014281, CVE-2013-2461: Better checking of XML signature
  * S8015997: Additional improvement in Javadoc framing

S8001330 is currently only provided for HotSpot 23.7 on 2.3.x, as
we?ve found it to be unstable when applied to the older HotSpot used
by Zero. If we find a solution for this, we?ll issue a further update.

This will be the last set of updates for the 2.1.x and 2.2.x branches.
Users should upgrade to either 2.3.10 or the upcoming 2.4.1 release.
Those users who need ARM32 JIT support should wait for the 2.3.11
release, coming in the next few months, which will add this to the
2.3.x series.

IcedTea includes the usual IcedTea patches to allow builds against
system libraries and to support more esoteric architectures. In these
releases, use of the system version of LCMS is disabled by default to
ensure the most secure version is used. Before using the system
version, please ensure it has the S8007925, S8007926, S8007927,
S8007929 and S8009654 updates listed above.

If you find an issue with the release, please report it to our bug
database (http://icedtea.classpath.org/bugzilla) under the appropriate
component. Development discussion takes place on the
distro-pkg-dev at openjdk.java.net mailing list and patches are always
welcome.

Full details of the release can be found below. Note that the
unusually large number of backports is due to backporting from the
upstream u25 release, which also provides all these.

What's New?
===========
New in release 2.1.9 (2013-06-29):

* New features
  - PR1378: Add AArch64 support to Zero
* Security fixes
  - S6741606, CVE-2013-2407: Integrate Apache Santuario
  - S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls
  - S7170730, CVE-2013-2451: Improve Windows network stack support.
  - S8000638, CVE-2013-2450: Improve deserialization
  - S8000642, CVE-2013-2446: Better handling of objects for transportation
  - S8001032: Restrict object access
  - S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers
  - S8001034, CVE-2013-1500: Memory management improvements
  - S8001038, CVE-2013-2444: Resourcefully handle resources
  - S8001043: Clarify definition restrictions
  - S8001308: Update display of applet windows
  - S8001309: Better handling of annotation interfaces
  - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost
  - S8003703, CVE-2013-2412: Update RMI connection dialog box
  - S8004288, CVE-2013-2449: (fs) Files.probeContentType problems
  - S8004584: Augment applet contextualization
  - S8005007: Better glyph processing
  - S8006328, CVE-2013-2448: Improve robustness of sound classes
  - S8006611: Improve scripting
  - S8007467: Improve robustness of JMX internal APIs
  - S8007471: Improve MBean notifications
  - S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes
  - S8007925: Improve cmsStageAllocLabV2ToV4curves
  - S8007926: Improve cmsPipelineDup
  - S8007927: Improve cmsAllocProfileSequenceDescription
  - S8007929: Improve CurvesAlloc
  - S8008120, CVE-2013-2457: Improve JMX class checking
  - S8008124, CVE-2013-2453: Better compliance testing
  - S8008128: Better API coherence for JMX
  - S8008132, CVE-2013-2456: Better serialization support
  - S8008585: Better JMX data handling
  - S8008593: Better URLClassLoader resource management
  - S8008603: Improve provision of JMX providers
  - S8008607: Better input checking in JMX
  - S8008611: Better handling of annotations in JMX
  - S8008615: Improve robustness of JMX internal APIs
  - S8008623: Better handling of MBeanServers
  - S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606
  - S8008982: Adjust JMX for underlying interface changes
  - S8009004: Better implementation of RMI connections
  - S8009008: Better manage management-api
  - S8009013: Better handling of T2K glyphs
  - S8009034: Improve resulting notifications in JMX
  - S8009038: Improve JMX notification support
  - S8009057, CVE-2013-2448: Improve MIDI event handling
  - S8009067: Improve storing keys in KeyStore
  - S8009071, CVE-2013-2459: Improve shape handling
  - S8009235: Improve handling of TSA data
  - S8009424, CVE-2013-2458: Adapt Nashorn to JSR-292 implementation change
  - S8009554, CVE-2013-2454: Improve SerialJavaObject.getFields
  - S8009654: Improve stability of cmsnamed
  - S8010209, CVE-2013-2460: Better provision of factories
  - S8011243, CVE-2013-2470: Improve ImagingLib
  - S8011248, CVE-2013-2471: Better Component Rasters
  - S8011253, CVE-2013-2472: Better Short Component Rasters
  - S8011257, CVE-2013-2473: Better Byte Component Rasters
  - S8012375, CVE-2013-1571: Improve Javadoc framing
  - S8012421: Better positioning of PairPositioning
  - S8012438, CVE-2013-2463: Better image validation
  - S8012597, CVE-2013-2465: Better image channel verification
  - S8012601, CVE-2013-2469: Better validation of image layouts
  - S8014281, CVE-2013-2461: Better checking of XML signature
  - S8015997: Additional improvement in Javadoc framing
* Backports
  - S7171223, RH967436: Building ExtensionSubtables.cpp should use -fno-strict-aliasing
  - S7053526: Upgrade JDK 8 to use Little CMS 2.4
  - S7077803: java.lang.InternalError in java.lang.invoke.MethodHandleNatives.init
  - S7124347: [macosx] java.lang.InternalError: not implemented yet on call Graphics2D.drawRenderedImage
  - S7142596: RMI JPRT tests are failing
  - S7151434, RH969884: java -jar -XX crashes java launcher
  - S7158483: (tz) Support tzdata2012c
  - S7188114: (launcher) need an alternate command line parser for Windows
  - S7195301: XML Signature DOM implementation should not use instanceof to determine type of Node
  - S7198570: (tz) Support tzdata2012f
  - S7199143: RFE: OCSP revocation checker should provide possibility to specify connection timeout
  - S8002070: Remove the stack search for a resource bundle for Logger to use
  - S8002225: (tz) Support tzdata2012i
  - S8006120: Provide "Server JRE" for 7u train
  - S8006536: [launcher]  removes trailing slashes on arguments
  - S8009165: Fix for 8006435 needs revision
  - S8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03
  - S8009463: Regression test test\java\lang\Runtime\exec\ArgWithSpaceAndFinalBackslash.java failing.
  - S8009610: Blacklist certificate used with malware.
  - S8009987: (tz) Support tzdata2013b
  - S8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail
  - S8010118: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive
  - S8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build
  - S8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod
  - S8010727: WLS fails to add a logger with "" in its own LogManager subclass instance
  - S8010939: Deadlock in LogManager
  - S8011139: (reflect) Revise checking in getEnclosingClass
  - S8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows
  - S8011313: OCSP timeout set to wrong value if com.sun.security.ocsp.timeout not defined
  - S8011557: Improve reflection utility classes
  - S8011806: 7u25-b05 hotspot fastdebug build failure
  - S8011990: TEST_BUG: java/util/logging/bundlesearch/ResourceBundleSearchTest.java fails on Windows
  - S8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05
  - S8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris
  - S8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21
  - S8012453: (process) Runtime.exec(String) fails if command contains spaces [win]
  - S8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer
  - S8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07
  - S8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext()
  - S8013228: Create new system properties to control allowable OCSP clock skew and CRL connection timeout
  - S8013380: Removal of stack walk to find resource bundle breaks Glassfish startup
  - S8014205: Most of the Swing dialogs are blank on one win7 MUI
  - S8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09
  - S8014618, RH868136: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement
  - S8014676: Java debugger may fail to run
  - S8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10
  - S8014745: Provide a switch to allow stack walk search of resource bundle
  - S8014968: OCSP and CRL connection timeout is set to four hours by default
* Bug fixes
  - PR1095, PR1409: Allow -Werror to be turned off (HotSpot repository only).
  - PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on armel

New in release 2.2.9 (2013-06-29):

* New features
  - PR1378: Add AArch64 support to Zero
* Security fixes
  - S6741606, CVE-2013-2407: Integrate Apache Santuario
  - S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls
  - S7170730, CVE-2013-2451: Improve Windows network stack support.
  - S8000638, CVE-2013-2450: Improve deserialization
  - S8000642, CVE-2013-2446: Better handling of objects for transportation
  - S8001032: Restrict object access
  - S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers
  - S8001034, CVE-2013-1500: Memory management improvements
  - S8001038, CVE-2013-2444: Resourcefully handle resources
  - S8001043: Clarify definition restrictions
  - S8001308: Update display of applet windows
  - S8001309: Better handling of annotation interfaces
  - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost
  - S8003703, CVE-2013-2412: Update RMI connection dialog box
  - S8004288, CVE-2013-2449: (fs) Files.probeContentType problems
  - S8004584: Augment applet contextualization
  - S8005007: Better glyph processing
  - S8006328, CVE-2013-2448: Improve robustness of sound classes
  - S8006611: Improve scripting
  - S8007467: Improve robustness of JMX internal APIs
  - S8007471: Improve MBean notifications
  - S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes
  - S8007925: Improve cmsStageAllocLabV2ToV4curves
  - S8007926: Improve cmsPipelineDup
  - S8007927: Improve cmsAllocProfileSequenceDescription
  - S8007929: Improve CurvesAlloc
  - S8008120, CVE-2013-2457: Improve JMX class checking
  - S8008124, CVE-2013-2453: Better compliance testing
  - S8008128: Better API coherence for JMX
  - S8008132, CVE-2013-2456: Better serialization support
  - S8008585: Better JMX data handling
  - S8008593: Better URLClassLoader resource management
  - S8008603: Improve provision of JMX providers
  - S8008607: Better input checking in JMX
  - S8008611: Better handling of annotations in JMX
  - S8008615: Improve robustness of JMX internal APIs
  - S8008623: Better handling of MBeanServers
  - S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606
  - S8008982: Adjust JMX for underlying interface changes
  - S8009004: Better implementation of RMI connections
  - S8009008: Better manage management-api
  - S8009013: Better handling of T2K glyphs
  - S8009034: Improve resulting notifications in JMX
  - S8009038: Improve JMX notification support
  - S8009057, CVE-2013-2448: Improve MIDI event handling
  - S8009067: Improve storing keys in KeyStore
  - S8009071, CVE-2013-2459: Improve shape handling
  - S8009235: Improve handling of TSA data
  - S8009424, CVE-2013-2458: Adapt Nashorn to JSR-292 implementation change
  - S8009554, CVE-2013-2454: Improve SerialJavaObject.getFields
  - S8009654: Improve stability of cmsnamed
  - S8010209, CVE-2013-2460: Better provision of factories
  - S8011243, CVE-2013-2470: Improve ImagingLib
  - S8011248, CVE-2013-2471: Better Component Rasters
  - S8011253, CVE-2013-2472: Better Short Component Rasters
  - S8011257, CVE-2013-2473: Better Byte Component Rasters
  - S8012375, CVE-2013-1571: Improve Javadoc framing
  - S8012421: Better positioning of PairPositioning
  - S8012438, CVE-2013-2463: Better image validation
  - S8012597, CVE-2013-2465: Better image channel verification
  - S8012601, CVE-2013-2469: Better validation of image layouts
  - S8014281, CVE-2013-2461: Better checking of XML signature
  - S8015997: Additional improvement in Javadoc framing
* Bug fixes
  - S7053526: Upgrade JDK 8 to use Little CMS 2.4
  - S7124347: [macosx] java.lang.InternalError: not implemented yet on call Graphics2D.drawRenderedImage
  - S7142091: [macosx] RFE: Refactoring of peer initialization/disposing
  - S7142596: RMI JPRT tests are failing
  - S7150345: [macosx] Can't type into applets
  - S7151434, RH969884: java -jar -XX crashes java launcher
  - S7156191: [macosx] Can't type into applet demos in Pivot
  - S7156194: [macosx] Can't type non-ASCII characters into applets
  - S7171223: Building ExtensionSubtables.cpp should use -fno-strict-aliasing
  - S7174718: [macosx] Regression in 7u6 b12: PopupFactory leaks DefaultFrames.
  - S7188114: (launcher) need an alternate command line parser for Windows
  - S7195301: XML Signature DOM implementation should not use instanceof to determine type of Node
  - S7198570: (tz) Support tzdata2012f
  - S7199143: RFE: OCSP revocation checker should provide possibility to specify connection timeout
  - S8001161: mac: EmbeddedFrame doesn't become active window
  - S8002070: Remove the stack search for a resource bundle for Logger to use
  - S8002225: (tz) Support tzdata2012i
  - S8005932: Java 7 on mac os x only provides text clipboard formats
  - S8006120: Provide "Server JRE" for 7u train
  - S8006417: JComboBox.showPopup(), hidePopup() fails in JRE 1.7 on OS X
  - S8006536: [launcher]  removes trailing slashes on arguments
  - S8009165: Fix for 8006435 needs revision
  - S8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03
  - S8009463: Regression test test\java\lang\Runtime\exec\ArgWithSpaceAndFinalBackslash.java failing.
  - S8009610: Blacklist certificate used with malware.
  - S8009987: (tz) Support tzdata2013b
  - S8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail
  - S8010009: [macosx] Unable type into online word games on MacOSX
  - S8010118: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive
  - S8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build
  - S8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod
  - S8010727: WLS fails to add a logger with "" in its own LogManager subclass instance
  - S8010939: Deadlock in LogManager
  - S8011139: (reflect) Revise checking in getEnclosingClass
  - S8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows
  - S8011313: OCSP timeout set to wrong value if com.sun.security.ocsp.timeout not defined
  - S8011557: Improve reflection utility classes
  - S8011806: 7u25-b05 hotspot fastdebug build failure
  - S8011990: TEST_BUG: java/util/logging/bundlesearch/ResourceBundleSearchTest.java fails on Windows
  - S8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05
  - S8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris
  - S8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21
  - S8012330: [macosx] Sometimes the applet showing the modal dialog itself loses the ability to gain focus
  - S8012453: (process) Runtime.exec(String) fails if command contains spaces [win]
  - S8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer
  - S8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07
  - S8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext()
  - S8013228: Create new system properties to control allowable OCSP clock skew and CRL connection timeout
  - S8013380: Removal of stack walk to find resource bundle breaks Glassfish startup
  - S8014205: Most of the Swing dialogs are blank on one win7 MUI
  - S8014423: [macosx] The scrollbar's block increment performs incorrectly
  - S8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09
  - S8014618, RH868136: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement
  - S8014676: Java debugger may fail to run
  - S8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10
  - S8014745: Provide a switch to allow stack walk search of resource bundle
  - S8014968: OCSP and CRL connection timeout is set to four hours by default

The tarballs can be downloaded from:

    http://icedtea.classpath.org/download/source/icedtea-2.1.9.tar.gz
    http://icedtea.classpath.org/download/source/icedtea-2.2.9.tar.gz

SHA256 checksum:

978bd734103ac3a81476d31801ff9ddc007b4b30bccf13ce83af5f4a5e17604d  icedtea-2.1.9.tar.gz
e56dbcc3fe783535881aca893ce5cd20e73d9c0f159811b98233042843af756a  icedtea-2.2.9.tar.gz

The tarballs are accompanied by a digital signature available at:

    http://icedtea.classpath.org/download/source/icedtea-2.1.9.tar.gz.sig
    http://icedtea.classpath.org/download/source/icedtea-2.2.9.tar.gz.sig

respectively.  This is produced using my public key. See details below.

    PGP Key: 248BDC07 (https://keys.indymedia.org/)
    Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07

The following people helped with these releases:

* Andreas Schwab (PR1378 patch for AArch64 Zero support)
* Andrew Hughes (all other bug fixes, application of security fixes & backports, release management)
* Xerxes R?nby (PR1188 ARM fix for 2.1.9)

We would also like to thank the bug reporters and testers!

To get started:

$ tar xzf icedtea-${ver}.tar.gz
$ mkdir icedtea-build
$ cd icedtea-build
$ ../icedtea-${ver}/configure
$ make

where ${ver} is the version used.

Full build requirements and instructions are available in the INSTALL file.

Happy hacking!
-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130630/ce24fade/attachment.bin 

From skrsn at yahoo.com  Sun Jun 30 14:47:27 2013
From: skrsn at yahoo.com (Krishna S)
Date: Sun, 30 Jun 2013 14:47:27 -0700 (PDT)
Subject: OpenJDK zero build
Message-ID: <1372628847.28517.YahooMailNeo@web163902.mail.gq1.yahoo.com>

Hi,

This seemed like an appropriate alias for this question. Please redirect me if it isn't.

I'm trying to build the OpenJDK (specifically Hotspot) with only a C++ interpreter ?(which I understand is the jvmgzero target) like I would a regular OpenJDK build (i.e. not using icedtea) but can't get it to work.?

This is the command I'm using to build
$ ZERO_ARCHDEF=amd64 ZERO_LIBARCH=amd64 ZERO_ENDIANNESS=little ZERO_ARCHFLAG="-m64" ARCH_DATA_MODEL=64 ZERO_BUILD=true ... make jvmgzero

?
With this I could get to the linking stage, but it failed complaining that multiple ffi symbols were missing. This I could fix, trivially, by adding an -lffi switch in the Makefile.

This let me link and create test_gamma, which however hangs every time I run it [1].

Given it didn't work out of the box I wonder if building zero outside of icedtea is even supported? If it is, could someone tell me the exact set of flags I'd use to get a working build?

Thanks.
--


Krishna S
skrsn at yahoo.com

[1]?http://pastebin.com/NeDq06cc
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130630/8c129404/attachment.html