From ptisnovs at icedtea.classpath.org Thu Aug 1 00:32:23 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 01 Aug 2013 07:32:23 +0000 Subject: /hg/gfx-test: Ten new tests added into BitBltUsingBgColor test s... Message-ID: changeset 0adf53c3f877 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=0adf53c3f877 author: Pavel Tisnovsky date: Thu Aug 01 09:34:48 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 0489bac8bc0e -r 0adf53c3f877 ChangeLog --- a/ChangeLog Wed Jul 31 13:49:52 2013 +0200 +++ b/ChangeLog Thu Aug 01 09:34:48 2013 +0200 @@ -1,3 +1,8 @@ +2013-08-01 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Ten new tests added into BitBltUsingBgColor test suite. + 2013-07-31 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBasicTests.java: diff -r 0489bac8bc0e -r 0adf53c3f877 src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Wed Jul 31 13:49:52 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Thu Aug 01 09:34:48 2013 +0200 @@ -915,6 +915,176 @@ } /** + * Test basic BitBlt operation for grid buffered image with type TYPE_USHORT_555_RGB + * + * @param image + * image to be 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 doBitBltGridBufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB, backgroundColor); + } + + /** + * Test basic BitBlt operation for grid buffered image with type TYPE_USHORT_565_RGB + * + * @param image + * image to be 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 doBitBltGridBufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB, backgroundColor); + } + + /** + * Test basic BitBlt operation for grid buffered image with type TYPE_USHORT_GRAY + * + * @param image + * image to be 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 doBitBltGridBufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type TYPE_3BYTE_BGR + * + * @param image + * image to be 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 doBitBltDiagonalGridBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type TYPE_4BYTE_ABGR + * + * @param image + * image to be 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 doBitBltDiagonalGridBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type TYPE_4BYTE_ABGR + * + * @param image + * image to be 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 doBitBltDiagonalGridBufferedImageType4ByteABGRPre(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type TYPE_INT_ARGB + * + * @param image + * image to be 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 doBitBltDiagonalGridBufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type TYPE_INT_ARGB_PRE + * + * @param image + * image to be 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 doBitBltDiagonalGridBufferedImageTypeIntARGBPre(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type TYPE_INT_BGR + * + * @param image + * image to be 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 doBitBltDiagonalGridBufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(image, graphics2d, BufferedImage.TYPE_INT_BGR, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type TYPE_INT_RGB + * + * @param image + * image to be 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 doBitBltDiagonalGridBufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(image, graphics2d, BufferedImage.TYPE_INT_RGB, backgroundColor); + } + + /** * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. * Background color is set to Color.black. * From ptisnovs at icedtea.classpath.org Thu Aug 1 01:22:15 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 01 Aug 2013 08:22:15 +0000 Subject: /hg/rhino-tests: Added two new tests getGenericSuperclass() and ... Message-ID: changeset a73f929dc212 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=a73f929dc212 author: Pavel Tisnovsky date: Thu Aug 01 10:25:51 2013 +0200 Added two new tests getGenericSuperclass() and getGenericInterfaces() into ScriptEngineFactoryClassTest. diffstat: ChangeLog | 6 +++ src/org/RhinoTests/ScriptEngineClassTest.java | 54 +++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diffs (77 lines): diff -r 75127200e6a0 -r a73f929dc212 ChangeLog --- a/ChangeLog Wed Jul 31 13:57:08 2013 +0200 +++ b/ChangeLog Thu Aug 01 10:25:51 2013 +0200 @@ -1,3 +1,9 @@ +2013-08-01 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptEngineClassTest.java: + Added two new tests getGenericSuperclass() and getGenericInterfaces() + into ScriptEngineFactoryClassTest. + 2013-07-31 Pavel Tisnovsky * src/org/RhinoTests/ScriptEngineClassTest.java: diff -r 75127200e6a0 -r a73f929dc212 src/org/RhinoTests/ScriptEngineClassTest.java --- a/src/org/RhinoTests/ScriptEngineClassTest.java Wed Jul 31 13:57:08 2013 +0200 +++ b/src/org/RhinoTests/ScriptEngineClassTest.java Thu Aug 01 10:25:51 2013 +0200 @@ -1186,6 +1186,60 @@ } /** + * Test for method javax.script.ScriptEngine.getClass().getGenericSuperclass() + */ + protected void testGetGenericSuperclass() { + Type genericSuperclass = this.scriptEngineClass.getGenericSuperclass(); + assertNull(genericSuperclass, "getGenericSuperclass() does not return null"); + } + + /** + * Test for method javax.script.ScriptEngine.getClass().getGenericInterfaces() + */ + protected void testGetGenericInterfaces() { + // array of interface names that should exists + final String[] genericInterfaceNames_jdk6 = { + }; + + final String[] genericInterfaceNames_jdk7 = { + }; + + final String[] genericInterfaceNames_jdk8 = { + }; + + // 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.scriptEngineClass.getGenericInterfaces(); + assertNotNull(genericInterfaces, "getGenericInterfaces() returns null"); + assertEquals(0, 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 method javax.script.ScriptEngine.getClass().getEnumConstants() */ protected void testGetEnumConstants() { From gitne at excite.co.jp Thu Aug 1 08:14:01 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Fri, 2 Aug 2013 00:14:01 +0900 Subject: =?ISO-2022-JP?B?W3JmY11baWNlZHRlYS13ZWJdIFRlbXBvcmFyeSBmaWxlcyBsb2NhdGlvbiBjaG9vc2VyIGNsZWFudXA=?= Message-ID: <201308011514.r71FE1Mr024623@mail-web02.excite.co.jp> Hello, * Made temporary files location JFileChooser open at the currently specified location * Made temporary files location JFileChooser display a helpful title * Removed misleading "All Files" file filter from JFileChooser * Added new message to resources for JFileChooser's choose button * Fixed a few inconsistent messages in resource files @Jiri Please add a cs translation for the new "TIFPFileChooserChooseButton" message. Regards, Jacob -------------- next part -------------- A non-text attachment was scrubbed... Name: Temporary files FileChooser cleanup.patch Type: text/x-patch Size: 5279 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130802/43cc3b01/ISO-2022-JPBVGVtcG9yYXJ5IGZpbGVzIEZpbGVDaG9vc2VyIGNsZWFudXAucGF0Y2g.patch From aazores at redhat.com Thu Aug 1 08:15:57 2013 From: aazores at redhat.com (Andrew Azores) Date: Thu, 01 Aug 2013 11:15:57 -0400 Subject: [rfc][icedtea-web] TinyHttpdImpl refactor In-Reply-To: <51F74E5C.7060706@redhat.com> References: <51F2971C.7050005@redhat.com> <51F74E5C.7060706@redhat.com> Message-ID: <51FA7BAD.7090203@redhat.com> On 07/30/2013 01:25 AM, Jiri Vanek wrote: > On 07/26/2013 05:34 PM, Andrew Azores wrote: >> Changelog: >> * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java >> (TinyHttpdImpl): BufferedReader and DataOutputStream become member >> variables rather than local to run. More informative/mnemonic >> variable names >> (writeErrorToPipe): new private method. >> (writeToPipe): new private method. >> (run): refactored to use writeToPipe and writeErrorToPipe, and >> ensuring that streams are closed when no longer in use. More >> informative/mnemonic variable names >> >> The patch looks big (relative to the size of the file) but it's >> really almost entirely variable renaming and method extractions. :) > Does not, I'm dealyed due to packaging stuff ;( Sorry > Practicaly no objections to the code: > * The unittests for this are however a must - for new method, > constructors and especially for run - to ensure they behave as they > behaved before. Not that the backward compatibility is important in > tests extensions, but because it worked pretty well. > I would rather this patch to be pushed to head only together with > unittests, but if you swear, you can push in two pushes. > > Thanx for refactoring! > J. Round two. Changelog: * tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java: moved TinyHttpdImpl tests into new class * tests/test-extensions-tests/net/sourceforge/jnlp/TinyHttpdImplTest.java: new class for testing TinyHttpdImpl specifically * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: refactored. "port" field removed as it was unused. Server now continues to run after an HTTP 404. * tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java: removed "port" argument from TinyHttpdImpl constructor call I decided to undo some of my deeper changes to TinyHttpdImpl since they were really done in the first place just to make the code look cleaner (not good reasoning...), but I found better ways to clean it up without making the reader/writer variables into fields. Andrew A From bugzilla-daemon at icedtea.classpath.org Thu Aug 1 10:56:32 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 01 Aug 2013 17:56:32 +0000 Subject: [Bug 1271] icedtea-web does not handle 'javascript:' protocol URLs In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1271 Garrett Mitchener changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |garrett.mitchener at gmail.com --- Comment #2 from Garrett Mitchener --- I don't know if this is relevant, but I've had trouble with firefox and javascript: URLs in other contexts. The troublesome link was something like ... It worked fine in google chrome, but firefox would sort of partially evaluate document.doStuff(), and show me a page with a couple of lines of javascript from somewhere in the dojo toolkit that I'm using. I was able to get the link to work in firefox by changing it to ... which makes no sense to me, but it worked. -- 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/20130801/c254a337/attachment.html From aazores at icedtea.classpath.org Thu Aug 1 11:58:15 2013 From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org) Date: Thu, 01 Aug 2013 18:58:15 +0000 Subject: /hg/icedtea-web: ignore generated HTML files (from AboutDialog) Message-ID: changeset 54c77e5ee2a6 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=54c77e5ee2a6 author: Andrew Azores date: Thu Aug 01 14:57:29 2013 -0400 ignore generated HTML files (from AboutDialog) diffstat: .hgignore | 4 ++++ ChangeLog | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diffs (22 lines): diff -r f1eaa1ee7891 -r 54c77e5ee2a6 .hgignore --- a/.hgignore Tue Jul 30 13:49:13 2013 -0400 +++ b/.hgignore Thu Aug 01 14:57:29 2013 -0400 @@ -7,3 +7,7 @@ missing config.guess config.sub +netx/net/sourceforge/jnlp/resources/AUTHORS.html +netx/net/sourceforge/jnlp/resources/COPYING.html +netx/net/sourceforge/jnlp/resources/ChangeLog.html +netx/net/sourceforge/jnlp/resources/NEWS.html diff -r f1eaa1ee7891 -r 54c77e5ee2a6 ChangeLog --- a/ChangeLog Tue Jul 30 13:49:13 2013 -0400 +++ b/ChangeLog Thu Aug 01 14:57:29 2013 -0400 @@ -1,3 +1,7 @@ +2013-08-01 Andrew Azores + + * .hgignore: ignore generated HTML files (from AboutDialog) + 2013-07-30 Adam Domurad * plugin/icedteanp/IcedTeaPluginUtils.cc From adomurad at redhat.com Thu Aug 1 12:14:54 2013 From: adomurad at redhat.com (Adam Domurad) Date: Thu, 01 Aug 2013 15:14:54 -0400 Subject: [rfc][icedtea-web] Many C++-plugin unit tests that invoke Java Message-ID: <51FAB3AE.7040402@redhat.com> Hi all. Recently I decided to try spawning the Java process during the C++ unit tests to great success. This allows us to test much of the NPAPI usage and the Java<->Javascript usage. I have painstakenly provided full method coverage (at least execution) for JavaRequestProcessor, which provides reflection-oriented requests from C++ to Java. As well I introduced a few other tests this enabled. Small refactoring goes first. ChangeLog: 2013-XX-XX Adam Domurad * plugin/icedteanp/IcedTeaNPPlugin.cc: Refactor plugin data creation. * plugin/icedteanp/IcedTeaNPPlugin.h: Same. And the major patch: ChangeLog: 2013-XX-XX Adam Domurad Spawn Java side during C++ unit tests. Many new tests. * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc (hasPackage): Minor cleanup. * plugin/icedteanp/IcedTeaNPPlugin.cc (initialize_data_directory): New, extracted function. (NP_Initialize): Calls extracted function. * plugin/icedteanp/IcedTeaNPPlugin.h: Expose more functions for testing purposes. * tests/cpp-unit-tests/IcedTeaNPPluginTest.cc (get_scriptable_package_object): Test binding of java package (get_scriptable_java_object): Test binding of java object * tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc (NPIdentifierAsString): Update to create npidentifier properly. * tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc (getProperty): Test loading java.lang.Integer.MAX_VALUE from C++. * tests/cpp-unit-tests/MemoryLeakDetector.h (reset_global_state): Made public * tests/cpp-unit-tests/checked_allocations.h (SafeAllocator): New, typedef for allocator that avoids leak detection. * tests/cpp-unit-tests/browser_mock.cc (browsermock_setup_functions): Renamed to (browsermock_create_table). (browsermock_create_table): Now returns browser table, additional object release and identifier methods added. * tests/cpp-unit-tests/browser_mock.h: Update for rename. * tests/cpp-unit-tests/main.cc: Now clears state via (reset_global_state) * tests/cpp-unit-tests/IcedTeaJavaRequestProcessorTest.cc: New, contains unit tests that cover all of JavaRequestProcessor's methods. * tests/cpp-unit-tests/browser_mock_npidentifier.cc: Allocation-safe npidentifier mocking, adheres to NPAPI spec. * tests/cpp-unit-tests/browser_mock_npidentifier.h: Same. Happy hacking, -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: plugin-data-minor.patch Type: text/x-patch Size: 7882 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130801/2ff28391/plugin-data-minor.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: many-cpp-plugin-unit-tests.patch Type: text/x-patch Size: 43361 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130801/2ff28391/many-cpp-plugin-unit-tests.patch From adomurad at redhat.com Thu Aug 1 12:23:15 2013 From: adomurad at redhat.com (Adam Domurad) Date: Thu, 01 Aug 2013 15:23:15 -0400 Subject: [rfc][icedtea-web] Make 'getvalue' nonblocking to reduce hanging chance & improve responsivity In-Reply-To: <51B2226B.7080100@redhat.com> References: <51B2226B.7080100@redhat.com> Message-ID: <51FAB5A3.3060701@redhat.com> On 06/07/2013 02:11 PM, Adam Domurad wrote: > 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 Ping ? -Adam From adomurad at redhat.com Thu Aug 1 12:25:29 2013 From: adomurad at redhat.com (Adam Domurad) Date: Thu, 01 Aug 2013 15:25:29 -0400 Subject: [rfc][icedtea-web] TinyHttpdImpl refactor In-Reply-To: <51FA7BAD.7090203@redhat.com> References: <51F2971C.7050005@redhat.com> <51F74E5C.7060706@redhat.com> <51FA7BAD.7090203@redhat.com> Message-ID: <51FAB629.50800@redhat.com> On 08/01/2013 11:15 AM, Andrew Azores wrote: > On 07/30/2013 01:25 AM, Jiri Vanek wrote: >> On 07/26/2013 05:34 PM, Andrew Azores wrote: >>> Changelog: >>> * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java >>> (TinyHttpdImpl): BufferedReader and DataOutputStream become member >>> variables rather than local to run. More informative/mnemonic >>> variable names >>> (writeErrorToPipe): new private method. >>> (writeToPipe): new private method. >>> (run): refactored to use writeToPipe and writeErrorToPipe, and >>> ensuring that streams are closed when no longer in use. More >>> informative/mnemonic variable names >>> >>> The patch looks big (relative to the size of the file) but it's >>> really almost entirely variable renaming and method extractions. :) >> Does not, I'm dealyed due to packaging stuff ;( Sorry >> Practicaly no objections to the code: >> * The unittests for this are however a must - for new method, >> constructors and especially for run - to ensure they behave as they >> behaved before. Not that the backward compatibility is important in >> tests extensions, but because it worked pretty well. >> I would rather this patch to be pushed to head only together with >> unittests, but if you swear, you can push in two pushes. >> >> Thanx for refactoring! >> J. > > Round two. > > Changelog: > * > tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java: > moved TinyHttpdImpl tests into new class > * > tests/test-extensions-tests/net/sourceforge/jnlp/TinyHttpdImplTest.java: > new class for testing TinyHttpdImpl specifically > * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: > refactored. "port" field removed as it was unused. Server now continues > to run after an HTTP 404. > * tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java: > removed "port" argument from TinyHttpdImpl constructor call > > I decided to undo some of my deeper changes to TinyHttpdImpl since they > were really done in the first place just to make the code look cleaner > (not good reasoning...), but I found better ways to clean it up without > making the reader/writer variables into fields. > > Andrew A I believe you forgot a patch Cheers, -Adam From bugzilla-daemon at icedtea.classpath.org Thu Aug 1 12:36:12 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 01 Aug 2013 19:36:12 +0000 Subject: [Bug 1510] New: crashplan crash while starting Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1510 Bug ID: 1510 Summary: crashplan crash while starting Classification: Unclassified Product: IcedTea Version: 6-1.0 Hardware: x86 OS: Linux Status: NEW Severity: normal Priority: P3 Component: JamVM Assignee: xerxes at zafena.se Reporter: andytansm at gmail.com CC: unassigned at icedtea.classpath.org # # A fatal error has been detected by the Java Runtime Environment: # # Internal Error (os_linux_zero.cpp:270), pid=6525, tid=1954018448 # fatal error: caught unhandled signal 11 # # JRE version: 6.0_27-b27 # Java VM: OpenJDK Zero VM (20.0-b12 interpreted mode linux-ppc ) # Derivative: IcedTea6 1.12.6 # Distribution: Debian GNU/Linux 6.0.7 (squeeze), package 6b27-1.12.6-1~deb6u1 # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # --------------- T H R E A D --------------- Current thread (0x1022d618): Thread [stack: 0x74600000,0x74780000] [id=6770] Stack: [0x74600000,0x74780000], sp=0x7477e248, free space=1528k --------------- P R O C E S S --------------- Java Threads: ( => current thread ) 0x1022f110 JavaThread "inotify reader thread" [_thread_in_native, id=6769, stack(0x74480000,0x74600000)] 0x104bb5e0 JavaThread "BWQ-Sync-1375384290893::-0" [_thread_blocked, id=6768, stack(0x73280000,0x73400000)] 0x104bb340 JavaThread "W19875128_ScanWrkr" [_thread_blocked, id=6767, stack(0x74300000,0x74480000)] 0x1006c040 JavaThread "W13043649_Authorizer" [_thread_in_vm, id=6766, stack(0x71d80000,0x71f00000)] 0x101632f0 JavaThread "inotify reader thread" [_thread_in_native, id=6764, stack(0x74180000,0x74300000)] 0x101ba238 JavaThread "DMIRcvW-sId...4177" daemon [_thread_blocked, id=6763, stack(0x74000000,0x74180000)] 0x101b7228 JavaThread "DMORcvW-sId...4177" daemon [_thread_blocked, id=6762, stack(0x73e80000,0x74000000)] 0x10310328 JavaThread "W23131583_SFQ-QW-1" daemon [_thread_blocked, id=6761, stack(0x73d00000,0x73e80000)] 0x1033f850 JavaThread "W5192610_SFQ-CW-1" daemon [_thread_blocked, id=6760, stack(0x73b80000,0x73d00000)] 0x101bb1d0 JavaThread "W21142769_BackupConnWrk" daemon [_thread_blocked, id=6759, stack(0x73a00000,0x73b80000)] 0x101b5538 JavaThread "MaintJobWorker0-User" [_thread_blocked, id=6758, stack(0x73880000,0x73a00000)] 0x104725f8 JavaThread "W10891966_MaintLoadWorker-User" [_thread_blocked, id=6757, stack(0x73700000,0x73880000)] 0x10490f00 JavaThread "MaintJobWorker0-System" [_thread_blocked, id=6756, stack(0x73580000,0x73700000)] 0x1048fb10 JavaThread "W10670852_MaintLoadWorker-System" [_thread_blocked, id=6755, stack(0x73400000,0x73580000)] 0x102dc240 JavaThread "W153694_BckpSel" daemon [_thread_blocked, id=6753, stack(0x73100000,0x73280000)] 0x1040f9f0 JavaThread "inotify handler thread" [_thread_blocked, id=6752, stack(0x72f80000,0x73100000)] 0x104656b8 JavaThread "inotify reader thread" [_thread_in_native, id=6751, stack(0x72e00000,0x72f80000)] 0x10493b80 JavaThread "W2707298_VolumeWatcher" [_thread_blocked, id=6750, stack(0x72c80000,0x72e00000)] 0x102d8b48 JavaThread "BWQ-Replace::-1" [_thread_blocked, id=6749, stack(0x72b00000,0x72c80000)] 0x10339a08 JavaThread "BWQ-Replace::-0" [_thread_blocked, id=6748, stack(0x72980000,0x72b00000)] 0x10338408 JavaThread "BWQ-Backup::-3" [_thread_blocked, id=6747, stack(0x72800000,0x72980000)] 0x10336ed0 JavaThread "BWQ-Backup::-2" [_thread_blocked, id=6746, stack(0x72680000,0x72800000)] 0x101c8980 JavaThread "BWQ-Backup::-1" [_thread_blocked, id=6745, stack(0x72500000,0x72680000)] 0x1006d468 JavaThread "BWQ-Backup::-0" [_thread_blocked, id=6744, stack(0x72380000,0x72500000)] 0x1019f4c8 JavaThread "QPub-BackupMgr" [_thread_in_Java, id=6743, stack(0x72200000,0x72380000)] 0x10316058 JavaThread "Thread-8" [_thread_blocked, id=6742, stack(0x72080000,0x72200000)] 0x1006c500 JavaThread "RPConnWrk-DefaultGroup" [_thread_blocked, id=6702, stack(0x71f00000,0x72080000)] 0x102cce08 JavaThread "BWQ-DefaultGroup::-0" [_thread_blocked, id=6611, stack(0x71c00000,0x71d80000)] 0x102a87e0 JavaThread "W5312057_RPCtdWrk-DefaultGroup" [_thread_blocked, id=6610, stack(0x718e0000,0x71a60000)] 0x102a71b8 JavaThread "Sel-Peer-W" [_thread_in_native, id=6609, stack(0x71760000,0x718e0000)] 0x102a5c10 JavaThread "Sel-Peer-R" [_thread_in_native, id=6608, stack(0x715e0000,0x71760000)] 0x102a4650 JavaThread "Sel-Peer-C" [_thread_in_native, id=6607, stack(0x71460000,0x715e0000)] 0x10353a58 JavaThread "Sel-Peer-A" [_thread_in_native, id=6606, stack(0x712e0000,0x71460000)] 0x10317ae8 JavaThread "Factory$Notifier-Peer0" [_thread_blocked, id=6605, stack(0x71160000,0x712e0000)] 0x10316520 JavaThread "MQ-Peer-3" [_thread_blocked, id=6604, stack(0x70fe0000,0x71160000)] 0x10324e70 JavaThread "MQ-Peer-2" [_thread_in_native, id=6603, stack(0x70e60000,0x70fe0000)] 0x102bcfb0 JavaThread "MQ-Peer-1" [_thread_blocked, id=6602, stack(0x70ce0000,0x70e60000)] 0x1031ae88 JavaThread "MQ-Peer-0" [_thread_blocked, id=6601, stack(0x70b60000,0x70ce0000)] 0x1031c560 JavaThread "W21933769_PeerTimeoutWrk" [_thread_blocked, id=6600, stack(0x709e0000,0x70b60000)] 0x103262f8 JavaThread "QPub-DefaultGroup" [_thread_blocked, id=6599, stack(0x70860000,0x709e0000)] 0x10354ad0 JavaThread "ProxyAutoConfigService" daemon [_thread_blocked, id=6598, stack(0x706e0000,0x70860000)] 0x102d52d0 JavaThread "Sel-UI-W" [_thread_in_native, id=6597, stack(0x70560000,0x706e0000)] 0x102f5980 JavaThread "Sel-UI-R" [_thread_in_native, id=6596, stack(0x703e0000,0x70560000)] 0x10334360 JavaThread "Sel-UI-C" [_thread_in_native, id=6595, stack(0x70260000,0x703e0000)] 0x1035dbb0 JavaThread "Sel-UI-A" [_thread_in_native, id=6594, stack(0x700e0000,0x70260000)] 0x1024b460 JavaThread "Factory$Notifier-UI0" [_thread_blocked, id=6593, stack(0x6ff60000,0x700e0000)] 0x102b6d48 JavaThread "MQ-UI-1" [_thread_blocked, id=6592, stack(0x6fde0000,0x6ff60000)] 0x1024c5b0 JavaThread "MQ-UI-0" [_thread_blocked, id=6591, stack(0x6fc60000,0x6fde0000)] 0x102518c8 JavaThread "W29071960_SystemWatcher" daemon [_thread_blocked, id=6590, stack(0x6fae0000,0x6fc60000)] 0x102509c0 JavaThread "BWQ-Security::-0" [_thread_blocked, id=6589, stack(0x6f960000,0x6fae0000)] 0x102443a8 JavaThread "W27140443_NIWatcher" daemon [_thread_blocked, id=6549, stack(0x6f7e0000,0x6f960000)] 0x10245700 JavaThread "W7263010_FileCopier" daemon [_thread_blocked, id=6548, stack(0x6f660000,0x6f7e0000)] 0x1021b050 JavaThread "BWQ-FileTransfer::-0" [_thread_blocked, id=6547, stack(0x6f4e0000,0x6f660000)] 0x1021faa0 JavaThread "QPub-JobQueuePub-" [_thread_blocked, id=6545, stack(0x6f360000,0x6f4e0000)] 0x10090788 JavaThread "Low Memory Detector" daemon [_thread_blocked, id=6531, stack(0x6edd0000,0x6ef50000)] 0x1008cf08 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=6530, stack(0x6ec50000,0x6edd0000)] 0x1007f598 JavaThread "Finalizer" daemon [_thread_blocked, id=6529, stack(0x6e8d0000,0x6ea50000)] 0x1007ac68 JavaThread "Reference Handler" daemon [_thread_blocked, id=6528, stack(0x6e750000,0x6e8d0000)] 0x10025800 JavaThread "main" [_thread_blocked, id=6526, stack(0x48040000,0x481b0000)] Other Threads: 0x10077ce0 VMThread [stack: 0x6e660000,0x6e750000] [id=6527] 0x10092478 WatcherThread [stack: 0x6ef60000,0x6f050000] [id=6532] =>0x1022d618 (exited) Thread [stack: 0x74600000,0x74780000] [id=6770] VM state:not at safepoint (normal execution) VM Mutex/Monitor currently owned by a thread: None Heap def new generation total 6336K, used 1115K [0x4a260000, 0x4a940000, 0x54d00000) eden space 5632K, 19% used [0x4a260000, 0x4a376e08, 0x4a7e0000) from space 704K, 0% used [0x4a7e0000, 0x4a7e0000, 0x4a890000) to space 704K, 0% used [0x4a890000, 0x4a890000, 0x4a940000) tenured generation total 13696K, used 3860K [0x54d00000, 0x55a60000, 0x6a260000) the space 13696K, 28% used [0x54d00000, 0x550c52e8, 0x550c5400, 0x55a60000) compacting perm gen total 20224K, used 20158K [0x6a260000, 0x6b620000, 0x6e260000) the space 20224K, 99% used [0x6a260000, 0x6b60f908, 0x6b60fa00, 0x6b620000) No shared spaces configured. Code Cache [0x481e0000, 0x48210000, 0x4a1e0000) total_blobs=132 nmethods=0 adapters=118 free_code_cache=33479424 largest_free_block=0 Dynamic libraries: 00100000-00120000 r-xp 00000000 00:00 0 [vdso] 0eed0000-0eee0000 r-xp 00000000 09:01 81481 /usr/lib/libffi.so.5.0.10 0eee0000-0eef0000 rw-p 00000000 09:01 81481 /usr/lib/libffi.so.5.0.10 0ef00000-0ef20000 r-xp 00000000 09:01 104962 /usr/lib/jni/libjnidispatch.so 0ef20000-0ef30000 rw-p 00010000 09:01 104962 /usr/lib/jni/libjnidispatch.so 0ef40000-0ef60000 r-xp 00000000 09:01 62962 /lib/libresolv-2.11.2.so 0ef60000-0ef70000 rw-p 00010000 09:01 62962 /lib/libresolv-2.11.2.so 0ef80000-0ef90000 r-xp 00000000 09:01 62607 /lib/libnss_dns-2.11.2.so 0ef90000-0efa0000 rw-p 00000000 09:01 62607 /lib/libnss_dns-2.11.2.so 0efb0000-0efd0000 r-xp 00000000 09:01 81049 /usr/local/crashplan/libjtux.so 0efd0000-0efe0000 rwxp 00010000 09:01 81049 /usr/local/crashplan/libjtux.so 0eff0000-0f040000 r-xp 00000000 09:01 81177 /usr/lib/nss/libfreebl3.so 0f040000-0f050000 rw-p 00040000 09:01 81177 /usr/lib/nss/libfreebl3.so 0f060000-0f100000 r-xp 00000000 09:01 80274 /usr/lib/libsqlite3.so.0.8.6 0f100000-0f120000 rw-p 00090000 09:01 80274 /usr/lib/libsqlite3.so.0.8.6 0f130000-0f170000 r-xp 00000000 09:01 81174 /usr/lib/nss/libsoftokn3.so 0f170000-0f180000 rw-p 00030000 09:01 81174 /usr/lib/nss/libsoftokn3.so 0f190000-0f1d0000 r-xp 00000000 09:01 81163 /usr/lib/libnspr4.so.0d 0f1d0000-0f1e0000 rw-p 00030000 09:01 81163 /usr/lib/libnspr4.so.0d 0f1e0000-0f1f0000 rw-p 00000000 00:00 0 0f200000-0f210000 r-xp 00000000 09:01 81164 /usr/lib/libplds4.so.0d 0f210000-0f220000 rw-p 00000000 09:01 81164 /usr/lib/libplds4.so.0d 0f230000-0f240000 r-xp 00000000 09:01 81165 /usr/lib/libplc4.so.0d 0f240000-0f250000 rw-p 00000000 09:01 81165 /usr/lib/libplc4.so.0d 0f260000-0f280000 r-xp 00000000 09:01 81169 /usr/lib/libnssutil3.so.1d 0f280000-0f290000 rw-p 00010000 09:01 81169 /usr/lib/libnssutil3.so.1d 0f2a0000-0f3a0000 r-xp 00000000 09:01 81179 /usr/lib/libnss3.so.1d 0f3a0000-0f3b0000 rw-p 000f0000 09:01 81179 /usr/lib/libnss3.so.1d 0f3c0000-0f3e0000 r-xp 00000000 09:01 81532 /usr/lib/jvm/java-6-openjdk/jre/lib/ppc/libj2pkcs11.so 0f3e0000-0f3f0000 rw-p 00010000 09:01 81532 /usr/lib/jvm/java-6-openjdk/jre/lib/ppc/libj2pkcs11.so 0f400000-0f410000 r-xp 00000000 09:01 81546 /usr/lib/jvm/java-6-openjdk/jre/lib/ppc/libmanagement.so 0f410000-0f420000 rw-p 00000000 09:01 81546 /usr/lib/jvm/java-6-openjdk/jre/lib/ppc/libmanagement.so 0f430000-0f440000 r-xp 00000000 09:01 81534 /usr/lib/jvm/java-6-openjdk/jre/lib/ppc/libnio.so 0f440000-0f450000 rw-p 00000000 09:01 81534 /usr/lib/jvm/java-6-openjdk/jre/lib/ppc/libnio.so 0f460000-0f480000 r-xp 00000000 09:01 81541 /usr/lib/jvm/java-6-openjdk/jre/lib/ppc/libnet.so 0f480000-0f490000 rw-p 00010000 09:01 81541 /usr/lib/jvm/java-6-openjdk/jre/lib/ppc/libnet.so 0f4a0000-0f4b0000 r-xp 00000000 09:01 81544 /usr/lib/jvm/java-6-openjdk/jre/lib/ppc/libzip.so 0f4b0000-0f4c0000 rw-p 00000000 09:01 81544 /usr/lib/jvm/java-6-openjdk/jre/lib/ppc/libzip.so 0f4d0000-0f4e0000 r-xp 00000000 09:01 62862 /lib/libnss_files-2.11.2.so 0f4e0000-0f4f0000 rw-p 00000000 09:01 62862 /lib/libnss_files-2.11.2.so 0f500000-0f510000 r-xp 00000000 09:01 62755 /lib/libnss_nis-2.11.2.so 0f510000-0f520000 rw-p 00000000 09:01 62755 /lib/libnss_nis-2.11.2.so 0f530000-0f540000 r-xp 00000000 09:01 62986 /lib/libnss_compat-2.11.2.so 0f540000-0f550000 rw-p 00000000 09:01 62986 /lib/libnss_compat-2.11.2.so 0f560000-0f580000 r-xp 00000000 09:01 62968 /lib/libnsl-2.11.2.so 0f580000-0f590000 rw-p 00010000 09:01 62968 /lib/libnsl-2.11.2.so 0f5a0000-0f5d0000 r-xp 00000000 09:01 81515 /usr/lib/jvm/java-6-openjdk/jre/lib/ppc/libjava.so 0f5d0000-0f5f0000 rw-p 00020000 09:01 81515 /usr/lib/jvm/java-6-openjdk/jre/lib/ppc/libjava.so 0f600000-0f610000 r-xp 00000000 09:01 81526 /usr/lib/jvm/java-6-openjdk/jre/lib/ppc/libverify.so 0f610000-0f620000 rw-p 00000000 09:01 81526 /usr/lib/jvm/java-6-openjdk/jre/lib/ppc/libverify.so 0f630000-0f640000 r-xp 00000000 09:01 62846 /lib/librt-2.11.2.so 0f640000-0f650000 rw-p 00000000 09:01 62846 /lib/librt-2.11.2.so 0f660000-0f680000 r-xp 00000000 09:01 62733 /lib/libgcc_s.so.1 0f680000-0f690000 rw-p 00010000 09:01 62733 /lib/libgcc_s.so.1 0f6a0000-0f750000 r-xp 00000000 09:01 62670 /lib/libm-2.11.2.so 0f750000-0f760000 rw-p 000a0000 09:01 62670 /lib/libm-2.11.2.so 0f770000-0f8a0000 r-xp 00000000 09:01 80044 /usr/lib/libstdc++.so.6.0.13 0f8a0000-0f8b0000 rw-p 00120000 09:01 80044 /usr/lib/libstdc++.so.6.0.13 0f8c0000-0fd20000 r-xp 00000000 09:01 81529 /usr/lib/jvm/java-6-openjdk/jre/lib/ppc/server/libjvm.so 0fd20000-0fd60000 rw-p 00450000 09:01 81529 /usr/lib/jvm/java-6-openjdk/jre/lib/ppc/server/libjvm.so 0fd60000-0fd70000 rw-p 00000000 00:00 0 0fd80000-0fef0000 r-xp 00000000 09:01 62983 /lib/libc-2.11.2.so 0fef0000-0ff00000 rw-p 00160000 09:01 62983 /lib/libc-2.11.2.so 0ff00000-0ff10000 rw-p 00000000 00:00 0 0ff20000-0ff30000 r-xp 00000000 09:01 62984 /lib/libdl-2.11.2.so 0ff30000-0ff40000 rw-p 00000000 09:01 62984 /lib/libdl-2.11.2.so 0ff50000-0ff60000 r-xp 00000000 09:01 81539 /usr/lib/jvm/java-6-openjdk/jre/lib/ppc/jli/libjli.so 0ff60000-0ff70000 rw-p 00000000 09:01 81539 /usr/lib/jvm/java-6-openjdk/jre/lib/ppc/jli/libjli.so 0ff80000-0ffa0000 r-xp 00000000 09:01 62868 /lib/libpthread-2.11.2.so 0ffa0000-0ffb0000 rw-p 00010000 09:01 62868 /lib/libpthread-2.11.2.so 0ffc0000-0ffe0000 r-xp 00000000 09:01 80687 /usr/lib/libz.so.1.2.3.3 0ffe0000-0fff0000 rw-p 00010000 09:01 80687 /usr/lib/libz.so.1.2.3.3 10000000-10010000 r-xp 00000000 09:01 81486 /usr/lib/jvm/java-6-openjdk/jre/bin/java 10010000-10020000 rw-p 00000000 09:01 81486 /usr/lib/jvm/java-6-openjdk/jre/bin/java 10020000-105f0000 rwxp 00000000 00:00 0 [heap] 48000000-48020000 r-xp 00000000 09:01 62792 /lib/ld-2.11.2.so 48020000-48030000 rw-p 00020000 09:01 62792 /lib/ld-2.11.2.so 48030000-48070000 ---p 00000000 00:00 0 48070000-481b0000 rw-p 00000000 00:00 0 481b0000-481c0000 r--p 00000000 00:00 0 481c0000-481d0000 rw-p 00000000 00:00 0 481d0000-481e0000 rw-s 00000000 00:11 12500 /tmp/hsperfdata_root/6525 481e0000-48210000 rwxp 00000000 00:00 0 48210000-4a1e0000 rw-p 00000000 00:00 0 4a1e0000-4a1f0000 rw-p 00000000 00:00 0 4a1f0000-4a260000 rw-p 00000000 00:00 0 4a260000-4a940000 rw-p 00000000 00:00 0 4a940000-54d00000 rw-p 00000000 00:00 0 54d00000-55a60000 rw-p 00000000 00:00 0 55a60000-6a260000 rw-p 00000000 00:00 0 6a260000-6b620000 rw-p 00000000 00:00 0 6b620000-6e260000 rw-p 00000000 00:00 0 6e260000-6e270000 rw-p 00000000 00:00 0 6e270000-6e2b0000 rw-p 00000000 00:00 0 6e2b0000-6e2c0000 rw-p 00000000 00:00 0 6e2c0000-6e360000 rw-p 00000000 00:00 0 6e360000-6e370000 rw-p 00000000 00:00 0 6e370000-6e380000 rw-p 00000000 00:00 0 6e380000-6e3a0000 rw-p 00000000 00:00 0 6e3a0000-6e440000 rw-p 00000000 00:00 0 6e440000-6e450000 rw-p 00000000 00:00 0 6e450000-6e470000 rw-p 00000000 00:00 0 6e470000-6e610000 r--s 03800000 09:01 81514 /usr/lib/jvm/java-6-openjdk/jre/lib/rt.jar 6e610000-6e650000 rw-p 00000000 00:00 0 6e650000-6e660000 ---p 00000000 00:00 0 6e660000-6e750000 rw-p 00000000 00:00 0 6e750000-6e780000 ---p 00000000 00:00 0 6e780000-6e8d0000 rw-p 00000000 00:00 0 6e8d0000-6e900000 ---p 00000000 00:00 0 6e900000-6ea50000 rw-p 00000000 00:00 0 6ea50000-6ec50000 r--p 00000000 09:01 101879 /usr/lib/locale/locale-archive 6ec50000-6ec80000 ---p 00000000 00:00 0 6ec80000-6edd0000 rw-p 00000000 00:00 0 6edd0000-6ee00000 ---p 00000000 00:00 0 6ee00000-6ef50000 rw-p 00000000 00:00 0 6ef50000-6ef60000 ---p 00000000 00:00 0 6ef60000-6f050000 rw-p 00000000 00:00 0 6f050000-6f070000 r--s 00000000 09:01 81261 /usr/lib/jvm/java-6-openjdk/jre/lib/ext/pulse-java.jar 6f070000-6f0e0000 r--s 00510000 09:01 80981 /usr/local/crashplan/lib/com.backup42.desktop.jar 6f0e0000-6f100000 r--s 00070000 09:01 81269 /usr/lib/jvm/java-6-openjdk/jre/lib/jsse.jar 6f100000-6f120000 r--s 00120000 09:01 80980 /usr/local/crashplan/lib/c42_protolib.jar 6f120000-6f130000 r--s 00030000 09:01 80982 /usr/local/crashplan/lib/com.jniwrapper.jniwrap.jar 6f130000-6f160000 r--s 00110000 09:01 80983 /usr/local/crashplan/lib/com.jniwrapper.macpack.jar 6f160000-6f170000 r--s 000a0000 09:01 80984 /usr/local/crashplan/lib/com.jniwrapper.winpack.jar 6f170000-6f180000 r--s 00000000 09:01 80985 /usr/local/crashplan/lib/commons-collections-3.2.1-mini.jar 6f180000-6f1a0000 r--s 00030000 09:01 80986 /usr/local/crashplan/lib/commons-jxpath-1.1.jar 6f1a0000-6f1b0000 r--s 000e0000 09:01 80987 /usr/local/crashplan/lib/jna-3.2.5.jar 6f1b0000-6f1c0000 r--s 00000000 09:01 80988 /usr/local/crashplan/lib/json-20070829.jar 6f1c0000-6f1d0000 r--s 00020000 09:01 80989 /usr/local/crashplan/lib/json-lib-2.4.jar 6f1d0000-6f1e0000 r--s 00000000 09:01 80990 /usr/local/crashplan/lib/jtux.jar 6f1e0000-6f200000 r--s 00060000 09:01 80991 /usr/local/crashplan/lib/log4j-1.2.16.jar 6f200000-6f210000 r--s 00010000 09:01 80992 /usr/local/crashplan/lib/miglayout15-swt.jar 6f210000-6f220000 r--s 00010000 09:01 80993 /usr/local/crashplan/lib/org.eclipse.core.commands_3.6.1.v20120814-150512.jar 6f220000-6f230000 r--s 00010000 09:01 80994 /usr/local/crashplan/lib/org.eclipse.equinox.common_3.6.100.v20120522-1841.jar 6f230000-6f250000 r--s 000f0000 09:01 80995 /usr/local/crashplan/lib/org.eclipse.jface_3.8.101.v20120817-083647.jar 6f250000-6f270000 r--s 00140000 09:01 80996 /usr/local/crashplan/lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar 6f270000-6f280000 r--s 00060000 09:01 80997 /usr/local/crashplan/lib/protobuf-java-2.4.1.jar 6f280000-6f2a0000 r--s 00100000 09:01 80998 /usr/local/crashplan/lib/rhino-1.7r3.jar 6f2a0000-6f2b0000 r--s 00010000 09:01 80999 /usr/local/crashplan/lib/sbbi-upnplib-1.0.4.jar 6f2b0000-6f2c0000 r--s 00000000 09:01 81000 /usr/local/crashplan/lib/slf4j-api-1.6.1.jar 6f2c0000-6f2d0000 r--s 00000000 09:01 81001 /usr/local/crashplan/lib/slf4j-log4j12-1.6.1.jar 6f2d0000-6f300000 r--s 00240000 09:01 81004 /usr/local/crashplan/lib/trove-3.0.2.jar 6f300000-6f310000 r--s 00040000 09:01 81005 /usr/local/crashplan/lib/twitter4j.jar 6f310000-6f330000 r--s 000f0000 09:01 81266 /usr/lib/jvm/java-6-openjdk/jre/lib/resources.jar 6f330000-6f340000 r--s 00030000 09:01 81256 /usr/lib/jvm/java-6-openjdk/jre/lib/ext/sunjce_provider.jar 6f340000-6f350000 r--s 00010000 09:01 81265 /usr/lib/jvm/java-6-openjdk/jre/lib/jce.jar 6f350000-6f360000 r--s 00030000 09:01 81257 /usr/lib/jvm/java-6-openjdk/jre/lib/ext/sunpkcs11.jar 6f360000-6f390000 ---p 00000000 00:00 0 6f390000-6f4e0000 rw-p 00000000 00:00 0 6f4e0000-6f510000 ---p 00000000 00:00 0 6f510000-6f660000 rw-p 00000000 00:00 0 6f660000-6f690000 ---p 00000000 00:00 0 6f690000-6f7e0000 rw-p 00000000 00:00 0 6f7e0000-6f810000 ---p 00000000 00:00 0 6f810000-6f960000 rw-p 00000000 00:00 0 6f960000-6f990000 ---p 00000000 00:00 0 6f990000-6fae0000 rw-p 00000000 00:00 0 6fae0000-6fb10000 ---p 00000000 00:00 0 6fb10000-6fc60000 rw-p 00000000 00:00 0 6fc60000-6fc90000 ---p 00000000 00:00 0 6fc90000-6fde0000 rw-p 00000000 00:00 0 6fde0000-6fe10000 ---p 00000000 00:00 0 6fe10000-6ff60000 rw-p 00000000 00:00 0 6ff60000-6ff90000 ---p 00000000 00:00 0 6ff90000-700e0000 rw-p 00000000 00:00 0 700e0000-70110000 ---p 00000000 00:00 0 70110000-70260000 rw-p 00000000 00:00 0 70260000-70290000 ---p 00000000 00:00 0 70290000-703e0000 rw-p 00000000 00:00 0 703e0000-70410000 ---p 00000000 00:00 0 70410000-70560000 rw-p 00000000 00:00 0 70560000-70590000 ---p 00000000 00:00 0 70590000-706e0000 rw-p 00000000 00:00 0 706e0000-70710000 ---p 00000000 00:00 0 70710000-70860000 rw-p 00000000 00:00 0 70860000-70890000 ---p 00000000 00:00 0 70890000-709e0000 rw-p 00000000 00:00 0 709e0000-70a10000 ---p 00000000 00:00 0 70a10000-70b60000 rw-p 00000000 00:00 0 70b60000-70b90000 ---p 00000000 00:00 0 70b90000-70ce0000 rw-p 00000000 00:00 0 70ce0000-70d10000 ---p 00000000 00:00 0 70d10000-70e60000 rw-p 00000000 00:00 0 70e60000-70e90000 ---p 00000000 00:00 0 70e90000-70fe0000 rw-p 00000000 00:00 0 70fe0000-71010000 ---p 00000000 00:00 0 71010000-71160000 rw-p 00000000 00:00 0 71160000-71190000 ---p 00000000 00:00 0 71190000-712e0000 rw-p 00000000 00:00 0 712e0000-71310000 ---p 00000000 00:00 0 71310000-71460000 rw-p 00000000 00:00 0 71460000-71490000 ---p 00000000 00:00 0 71490000-715e0000 rw-p 00000000 00:00 0 715e0000-71610000 ---p 00000000 00:00 0 71610000-71760000 rw-p 00000000 00:00 0 71760000-71790000 ---p 00000000 00:00 0 71790000-718e0000 rw-p 00000000 00:00 0 718e0000-71910000 ---p 00000000 00:00 0 71910000-71a60000 rw-p 00000000 00:00 0 71b00000-71b50000 rw-p 00000000 00:00 0 71b50000-71c00000 ---p 00000000 00:00 0 71c00000-71c30000 ---p 00000000 00:00 0 71c30000-71d80000 rw-p 00000000 00:00 0 71d80000-71db0000 ---p 00000000 00:00 0 71db0000-71f00000 rw-p 00000000 00:00 0 71f00000-71f30000 ---p 00000000 00:00 0 71f30000-72080000 rw-p 00000000 00:00 0 72080000-720b0000 ---p 00000000 00:00 0 720b0000-72200000 rw-p 00000000 00:00 0 72200000-72230000 ---p 00000000 00:00 0 72230000-72380000 rw-p 00000000 00:00 0 72380000-723b0000 ---p 00000000 00:00 0 723b0000-72500000 rw-p 00000000 00:00 0 72500000-72530000 ---p 00000000 00:00 0 72530000-72680000 rw-p 00000000 00:00 0 72680000-726b0000 ---p 00000000 00:00 0 726b0000-72800000 rw-p 00000000 00:00 0 72800000-72830000 ---p 00000000 00:00 0 72830000-72980000 rw-p 00000000 00:00 0 72980000-729b0000 ---p 00000000 00:00 0 729b0000-72b00000 rw-p 00000000 00:00 0 72b00000-72b30000 ---p 00000000 00:00 0 72b30000-72c80000 rw-p 00000000 00:00 0 72c80000-72cb0000 ---p 00000000 00:00 0 72cb0000-72e00000 rw-p 00000000 00:00 0 72e00000-72e30000 ---p 00000000 00:00 0 72e30000-72f80000 rw-p 00000000 00:00 0 72f80000-72fb0000 ---p 00000000 00:00 0 72fb0000-73100000 rw-p 00000000 00:00 0 73100000-73130000 ---p 00000000 00:00 0 73130000-73280000 rw-p 00000000 00:00 0 73280000-732b0000 ---p 00000000 00:00 0 732b0000-73400000 rw-p 00000000 00:00 0 73400000-73430000 ---p 00000000 00:00 0 73430000-73580000 rw-p 00000000 00:00 0 73580000-735b0000 ---p 00000000 00:00 0 735b0000-73700000 rw-p 00000000 00:00 0 73700000-73730000 ---p 00000000 00:00 0 73730000-73880000 rw-p 00000000 00:00 0 73880000-738b0000 ---p 00000000 00:00 0 738b0000-73a00000 rw-p 00000000 00:00 0 73a00000-73a30000 ---p 00000000 00:00 0 73a30000-73b80000 rw-p 00000000 00:00 0 73b80000-73bb0000 ---p 00000000 00:00 0 73bb0000-73d00000 rw-p 00000000 00:00 0 73d00000-73d30000 ---p 00000000 00:00 0 73d30000-73e80000 rw-p 00000000 00:00 0 73e80000-73eb0000 ---p 00000000 00:00 0 73eb0000-74000000 rw-p 00000000 00:00 0 74000000-74030000 ---p 00000000 00:00 0 74030000-74180000 rw-p 00000000 00:00 0 74180000-741b0000 ---p 00000000 00:00 0 741b0000-74300000 rw-p 00000000 00:00 0 74300000-74330000 ---p 00000000 00:00 0 74330000-74480000 rw-p 00000000 00:00 0 74480000-744b0000 ---p 00000000 00:00 0 744b0000-74600000 rw-p 00000000 00:00 0 74600000-74630000 ---p 00000000 00:00 0 74630000-74780000 rw-p 00000000 00:00 0 [threadstack:0014eff0] bf6c0000-bf810000 rw-p 00000000 00:00 0 [stack] VM Arguments: jvm_args: -Dfile.encoding=UTF-8 -Dapp=CrashPlanService -DappBaseName=CrashPlan -Xms20m -Xmx512m -Djava.net.preferIPv4Stack=true -Dsun.net.inetaddr.ttl=300 -Dnetworkaddress.cache.ttl=300 -Dsun.net.inetaddr.negative.ttl=0 -Dnetworkaddress.cache.negative.ttl=0 -Dc42.native.md5.enabled=false java_command: com.backup42.service.CPService Launcher Type: SUN_STANDARD Environment Variables: PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin LD_LIBRARY_PATH=/usr/lib/jvm/java-6-openjdk/jre/lib/ppc/server:/usr/lib/jvm/java-6-openjdk/jre/lib/ppc:/usr/lib/jvm/java-6-openjdk/jre/../lib/ppc SHELL=/bin/bash DISPLAY=localhost:10.0 Signal Handlers: SIGSEGV: [libjvm.so+0x406880], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGBUS: [libjvm.so+0x406880], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGFPE: [libjvm.so+0x3385c0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGPIPE: SIG_IGN, sa_mask[0]=0x00000000, sa_flags=0x00000000 SIGXFSZ: [libjvm.so+0x3385c0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGILL: [libjvm.so+0x3385c0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGUSR1: SIG_DFL, sa_mask[0]=0x00000000, sa_flags=0x00000000 SIGUSR2: [libjvm.so+0x337ac0], sa_mask[0]=0x00000000, sa_flags=0x10000004 SIGHUP: [libjvm.so+0x33ae70], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGINT: SIG_IGN, sa_mask[0]=0x00000000, sa_flags=0x00000000 SIGTERM: [libjvm.so+0x33ae70], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGQUIT: [libjvm.so+0x33ae70], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 --------------- S Y S T E M --------------- OS:5.0.10 uname:Linux 2.6.32.11-svn70860 #1 Thu May 17 13:32:51 PDT 2012 ppc libc:glibc 2.11.2 NPTL 2.11.2 rlimit: STACK 8192k, CORE 0k, NPROC infinity, NOFILE 1024, AS infinity load average:1.81 1.31 1.12 /proc/meminfo: MemTotal: 253632 kB MemFree: 7424 kB Buffers: 16512 kB Cached: 80256 kB SwapCached: 4352 kB Active: 111744 kB Inactive: 95616 kB Active(anon): 65088 kB Inactive(anon): 66496 kB Active(file): 46656 kB Inactive(file): 29120 kB Unevictable: 0 kB Mlocked: 0 kB SwapTotal: 500608 kB SwapFree: 475712 kB Dirty: 960 kB Writeback: 0 kB AnonPages: 107136 kB Mapped: 34624 kB Shmem: 20800 kB Slab: 17728 kB SReclaimable: 8064 kB SUnreclaim: 9664 kB KernelStack: 1496 kB PageTables: 8576 kB NFS_Unstable: 0 kB Bounce: 0 kB WritebackTmp: 0 kB CommitLimit: 627392 kB Committed_AS: 471360 kB VmallocTotal: 727040 kB VmallocUsed: 7616 kB VmallocChunk: 668224 kB CPU:total 1 Memory: 64k page, physical 253632k(7424k free), swap 500608k(475712k free) vm_info: OpenJDK Zero VM (20.0-b12) for linux-ppc JRE (1.6.0_27-b27), built on Jul 16 2013 14:54:20 by "buildd" with gcc 4.4.5 -- 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/20130801/1d01cb89/attachment.html From aazores at redhat.com Thu Aug 1 12:41:50 2013 From: aazores at redhat.com (Andrew Azores) Date: Thu, 01 Aug 2013 15:41:50 -0400 Subject: [rfc][icedtea-web] jnlp_href extensions inside HTML applets - PR974 In-Reply-To: <51F7534F.8090006@redhat.com> References: <51C9F3C1.8070307@redhat.com> <51F7534F.8090006@redhat.com> Message-ID: <51FAB9FE.7080004@redhat.com> On 07/30/2013 01:46 AM, Jiri Vanek wrote: > On 06/25/2013 09:47 PM, Andrew Azores wrote: >> 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 >> >> >> fix.patch >> >> >> diff --git a/netx/net/sourceforge/jnlp/PluginBridge.java >> b/netx/net/sourceforge/jnlp/PluginBridge.java >> --- a/netx/net/sourceforge/jnlp/PluginBridge.java >> +++ b/netx/net/sourceforge/jnlp/PluginBridge.java >> @@ -26,19 +26,19 @@ import java.io.ByteArrayInputStream; >> import java.io.File; >> import java.io.IOException; >> import java.io.InputStream; >> +import java.net.MalformedURLException; >> import java.net.URL; >> -import java.net.MalformedURLException; >> +import java.util.ArrayList; >> +import java.util.Arrays; >> import java.util.HashSet; >> +import java.util.List; >> import java.util.Locale; >> -import java.util.List; >> -import java.util.ArrayList; >> import java.util.Map; >> import java.util.Set; >> >> +import net.sourceforge.jnlp.runtime.JNLPRuntime; >> import sun.misc.BASE64Decoder; >> >> -import net.sourceforge.jnlp.runtime.JNLPRuntime; >> - >> /** >> * Allows reuse of code that expects a JNLPFile object, >> * while overriding behaviour specific to applets. >> @@ -47,6 +47,7 @@ public class PluginBridge extends JNLPFi >> >> private PluginParameters params; >> private Set jars = new HashSet(); >> + private List extensionJars = new >> ArrayList(); >> //Folders can be added to the code-base through the archive tag >> private List codeBaseFolders = new ArrayList(); >> private String[] cacheJars = new String[0]; >> @@ -90,6 +91,7 @@ public class PluginBridge extends JNLPFi >> this.codeBase = codebase; >> this.sourceLocation = documentBase; >> this.params = params; >> + this.parserSettings = new ParserSettings(); > > I believe this is wrong. Parser settings are depending on commandline > (plugin) parameters. > So you need to crete correct parser. If you check the Main method of > javaws, you will se it. Maybe extraction of the code from Boot to some > factory method in ParserSettings is most correct, here, but the > refactoring can e done as separate changeset (as you wish, but you > will need this here anyway) Okay, this is taken into account now in the new patch set. > > If you have just copy and paste the " this.parserSettings = new > ParserSettings();" then probably also source was wrong. May you point > it out? >> >> if (params.getJNLPHref() != null) { >> useJNLPHref = true; >> @@ -122,6 +124,9 @@ public class PluginBridge extends JNLPFi >> String fileName = >> jarDesc.getLocation().toExternalForm(); >> this.jars.add(fileName); >> } >> + >> + // Store any extensions listed in the JNLP file to >> be returned later on, namely in getResources() >> + extensionJars = >> Arrays.asList(jnlpFile.getResources().getExtensions()); >> } catch (MalformedURLException e) { >> // Don't fail because we cannot get the jnlp file. >> Parameters are optional not required. >> // it is the site developer who should ensure that >> file exist. >> @@ -308,6 +313,8 @@ public class PluginBridge extends JNLPFi >> return result; >> } catch (MalformedURLException ex) { /* Ignored */ >> } >> + } else if (launchType.equals(ExtensionDesc.class)) { >> + return (List) extensionJars; // this list is >> populated when the PluginBridge is first constructed >> } >> return sharedResources.getResources(launchType); >> } >> >> >> reproducer.patch >> >> >> diff --git >> a/tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpHelper.jnlp >> b/tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpHelper.jnlp >> > > I do not think this is custom reproducer. See below. > >> new file mode 100644 >> --- /dev/null >> +++ >> b/tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpHelper.jnlp >> @@ -0,0 +1,53 @@ > > ..snip (=ok:)) > >> diff --git >> a/tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile >> b/tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile >> new file mode 100644 >> --- /dev/null >> +++ b/tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile >> @@ -0,0 +1,34 @@ >> +TESTNAME=ExtensionJnlpsInApplet >> + >> +SRC_FILES=ExtensionJnlpHelper.java ExtensionJnlpTestApplet.java >> +RESOURCE_FILES=ExtensionJnlpTest.html ExtensionJnlpTestApplet.jnlp >> ExtensionJnlpHelper.jnlp >> +ENTRYPOINT_CLASSES=ExtensionJnlpHelper ExtensionJnlpTestApplet >> + >> +JAVAC_CLASSPATH=$(TEST_EXTENSIONS_DIR):$(NETX_DIR)/lib/classes.jar >> +JAVAC=$(BOOT_DIR)/bin/javac >> +JAR=$(BOOT_DIR)/bin/jar >> + >> +TMPDIR:=$(shell mktemp -d) >> + >> +prepare-reproducer: >> + echo PREPARING REPRODUCER $(TESTNAME) >> + >> + $(JAVAC) -d $(TMPDIR) -classpath $(JAVAC_CLASSPATH) $(SRC_FILES) >> + >> + cd ../resources; \ >> + cp $(RESOURCE_FILES) $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR); \ >> + cd -; \ >> + ls; \ >> + for CLASS in $(ENTRYPOINT_CLASSES); \ >> + do \ >> + cd $(TMPDIR); \ >> + $(JAR) cfe "$$CLASS.jar" "$$CLASS" "$$CLASS.class"; \ >> + cd -;\ >> + mv $(TMPDIR)/"$$CLASS.jar" >> $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR); \ >> + done; \ >> + >> + echo PREPARED REPRODUCER $(TESTNAME), removing $(TMPDIR) >> + rm -rf $(TMPDIR) >> + > > As far as I can read this just compile classes and jar them. Then copy > ajr and resources. This is exactly what engine do for you for free. > Unless I misread, please move this reproducer to simple ones. The simple reproducers get JAR'd up into a single JAR, but this test specifically requires the srcs to end up in their own separate JARs. Is there some way to make this happen for a simple reproducer? >> +clean-reproducer: >> + echo NOTHING TO CLEAN FOR $(TESTNAME) >> diff --git >> a/tests/reproducers/custom/ExtensionJnlpsInApplet/testcases/ExtensionJnlpsInAppletTest.java >> b/tests/reproducers/custom/ExtensionJnlpsInApplet/testcases/ExtensionJnlpsInAppletTest.java >> >> new file mode 100644 >> --- /dev/null >> +++ >> b/tests/reproducers/custom/ExtensionJnlpsInApplet/testcases/ExtensionJnlpsInAppletTest.java >> @@ -0,0 +1,74 @@ >> +/* ExtensionJnlpsInAppletTest.java >> +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. >> + */ >> + >> +import net.sourceforge.jnlp.ProcessResult; >> +import net.sourceforge.jnlp.ServerAccess.AutoClose; >> +import net.sourceforge.jnlp.annotations.Bug; >> +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 ExtensionJnlpsInAppletTest extends BrowserTest { >> + >> + private static final String appletCloseString = >> AutoOkClosingListener.MAGICAL_OK_CLOSING_STRING; >> + >> + @Test >> + @NeedsDisplay >> + @TestInBrowsers(testIn={Browsers.one}) >> + public void testExtensionJnlpsInAppletLaunch() throws Exception { >> + ProcessResult pr = >> server.executeBrowser("/ExtensionJnlpTest.html", >> AutoClose.CLOSE_ON_BOTH); > Those slashes before resources are not necessary. I'm in favour to > remove them, Okay, they're gone now. > > > Also TBH I'm not fan of CLOSE_ON_BOTH. I woul like to encourage you > to use only CloseOnOk. AThe reason is that some completely unrelated > exception can be fired, and it will cause this reproducer to fail. > > Although we (Me, Omair and Adam) have long ago decided that it is a > correct behaviour, the instability of reproducers is proving the > opposite. > > As you have already put an eye on reproducers engine, try to consider it. This makes sense, I'll keep this in mind for the future (and it has been changed now too). > >> + Assert.assertTrue("stdout should contain \"" + >> appletCloseString + "\" but did not", >> pr.stdout.contains(appletCloseString)); >> + Assert.assertTrue("stdout should contain \"Applet test >> running\" but did not", pr.stdout.contains("Applet test running")); >> + } >> + >> + @Test >> + @NeedsDisplay >> + @TestInBrowsers(testIn={Browsers.one}) >> + @Bug(id="PR974") >> + public void testExtensionJnlpsInAppletHelper() throws Exception { >> + ProcessResult pr = >> server.executeBrowser("/ExtensionJnlpTest.html", >> AutoClose.CLOSE_ON_BOTH); >> + Assert.assertTrue("stdout should contain \"" + >> appletCloseString + "\" but did not", >> pr.stdout.contains(appletCloseString)); >> + Assert.assertTrue("stdout should contain \"Helper!\" but did >> not", pr.stdout.contains("Helper!")); >> + } >> + >> +} > > Otherwise nice job. > J. > Changelog: * netx/net/sourceforge/jnlp/runtime/Boot.java (main): Pass command line arguments to ParserSettings and retrieve parser settings from there * netx/net/sourceforge/jnlp/PluginBridge.java (PluginBridge, getResources): Constructor stores list of JNLP extensions, getResources returns this list. ParserSettings field instantiated from ParserSettings new method getCommandLineParserSettings * netx/net/sourceforge/jnlp/ParserSettings.java (cmdArgs, setCommandLineArgs, getCommandLineParserSettings, getOption, getOptions): new field to keep track of command line args. New methods to return parser settings according to command line args. * 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 Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: fix2.patch Type: text/x-patch Size: 6754 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130801/de54aed6/fix2.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: reproducer2.patch Type: text/x-patch Size: 17133 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130801/de54aed6/reproducer2.patch From aazores at redhat.com Thu Aug 1 12:46:13 2013 From: aazores at redhat.com (Andrew Azores) Date: Thu, 01 Aug 2013 15:46:13 -0400 Subject: [rfc][icedtea-web] TinyHttpdImpl refactor In-Reply-To: <51FAB629.50800@redhat.com> References: <51F2971C.7050005@redhat.com> <51F74E5C.7060706@redhat.com> <51FA7BAD.7090203@redhat.com> <51FAB629.50800@redhat.com> Message-ID: <51FABB05.6030206@redhat.com> On 08/01/2013 03:25 PM, Adam Domurad wrote: > On 08/01/2013 11:15 AM, Andrew Azores wrote: >> On 07/30/2013 01:25 AM, Jiri Vanek wrote: >>> On 07/26/2013 05:34 PM, Andrew Azores wrote: >>>> Changelog: >>>> * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java >>>> (TinyHttpdImpl): BufferedReader and DataOutputStream become member >>>> variables rather than local to run. More informative/mnemonic >>>> variable names >>>> (writeErrorToPipe): new private method. >>>> (writeToPipe): new private method. >>>> (run): refactored to use writeToPipe and writeErrorToPipe, and >>>> ensuring that streams are closed when no longer in use. More >>>> informative/mnemonic variable names >>>> >>>> The patch looks big (relative to the size of the file) but it's >>>> really almost entirely variable renaming and method extractions. :) >>> Does not, I'm dealyed due to packaging stuff ;( Sorry >>> Practicaly no objections to the code: >>> * The unittests for this are however a must - for new method, >>> constructors and especially for run - to ensure they behave as they >>> behaved before. Not that the backward compatibility is important in >>> tests extensions, but because it worked pretty well. >>> I would rather this patch to be pushed to head only together with >>> unittests, but if you swear, you can push in two pushes. >>> >>> Thanx for refactoring! >>> J. >> >> Round two. >> >> Changelog: >> * >> tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java: >> moved TinyHttpdImpl tests into new class >> * >> tests/test-extensions-tests/net/sourceforge/jnlp/TinyHttpdImplTest.java: >> new class for testing TinyHttpdImpl specifically >> * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: >> refactored. "port" field removed as it was unused. Server now continues >> to run after an HTTP 404. >> * tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java: >> removed "port" argument from TinyHttpdImpl constructor call >> >> I decided to undo some of my deeper changes to TinyHttpdImpl since they >> were really done in the first place just to make the code look cleaner >> (not good reasoning...), but I found better ways to clean it up without >> making the reader/writer variables into fields. >> >> Andrew A > > I believe you forgot a patch > > Cheers, > -Adam D'oh, this happens to me too frequently. Thanks. Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: TinyHttpdImpl_refactor.patch Type: text/x-patch Size: 11602 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130801/5f6ae223/TinyHttpdImpl_refactor.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: TinyHttpdImpl_tests.patch Type: text/x-patch Size: 13451 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130801/5f6ae223/TinyHttpdImpl_tests.patch From bugzilla-daemon at icedtea.classpath.org Thu Aug 1 20:02:33 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 02 Aug 2013 03:02:33 +0000 Subject: [Bug 1511] New: Iced Tea crashed on time.gov Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1511 Bug ID: 1511 Summary: Iced Tea crashed on time.gov Classification: Unclassified Product: IcedTea Version: unspecified Hardware: x86_64 OS: Linux Status: NEW Severity: critical Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: mrmeval at gmail.com CC: unassigned at icedtea.classpath.org Created attachment 913 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=913&action=edit Error dump Linux tower 3.9.11-200.fc18.x86_64 #1 SMP Mon Jul 22 21:04:50 UTC 2013 x86_64 x86_64 x86_64 GNU/Linux Fedora release 18 (Spherical Cow) -- 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/20130802/e1a3c444/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu Aug 1 20:03:25 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 02 Aug 2013 03:03:25 +0000 Subject: [Bug 1511] Iced Tea crashed on time.gov In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1511 --- Comment #1 from Mr. Meval --- Created attachment 914 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=914&action=edit hardware from lshw -- 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/20130802/198863d0/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Aug 2 01:22:29 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 02 Aug 2013 08:22:29 +0000 Subject: [Bug 1511] Iced Tea crashed on time.gov In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1511 Andrew Haley changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |aph at redhat.com --- Comment #2 from Andrew Haley --- There doesn't seem to be a crash here. JNLP refused to run the applet because it wasn't signed. -- 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/20130802/e6d8b73c/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Aug 2 02:44:24 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 02 Aug 2013 09:44:24 +0000 Subject: [Bug 1511] Iced Tea crashed on time.gov In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1511 Andrew Haley changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |INVALID -- 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/20130802/e38748d1/attachment.html From ptisnovs at icedtea.classpath.org Fri Aug 2 03:08:25 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 02 Aug 2013 10:08:25 +0000 Subject: /hg/gfx-test: Added twelwe new methods used by BitBlt test cases... Message-ID: changeset 4b6739fa6b0f in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=4b6739fa6b0f author: Pavel Tisnovsky date: Fri Aug 02 12:12:00 2013 +0200 Added twelwe new methods used by BitBlt test cases and BitBlt-related tests. diffstat: ChangeLog | 6 + src/org/gfxtest/testsuites/BitBltBufferedImageOp.java | 243 +++++++++++++++++- 2 files changed, 246 insertions(+), 3 deletions(-) diffs (280 lines): diff -r 0adf53c3f877 -r 4b6739fa6b0f ChangeLog --- a/ChangeLog Thu Aug 01 09:34:48 2013 +0200 +++ b/ChangeLog Fri Aug 02 12:12:00 2013 +0200 @@ -1,3 +1,9 @@ +2013-08-02 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBufferedImageOp.java: + Added twelwe new methods used by BitBlt test cases and BitBlt-related + tests. + 2013-08-01 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r 0adf53c3f877 -r 4b6739fa6b0f src/org/gfxtest/testsuites/BitBltBufferedImageOp.java --- a/src/org/gfxtest/testsuites/BitBltBufferedImageOp.java Thu Aug 01 09:34:48 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltBufferedImageOp.java Fri Aug 02 12:12:00 2013 +0200 @@ -107,6 +107,23 @@ } /** + * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_BYTE_INDEXED}. + * + * @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 + */ + protected TestResult doBitBltEmptyBufferedImageTypeByteIndexed(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED, rasterOp); + } + + /** * Test basic BitBlt operation for empty buffered image with type {@link BufferedImage#TYPE_CUSTOM}. * * @param image @@ -294,9 +311,76 @@ } /** - * Test basic BitBlt operation for buffered image containing checker pattern - * with type TYPE_3BYTE_BGR - * + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}. + * + * @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 + */ + protected TestResult doBitBltCheckerBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, rasterOp); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_BYTE_GRAY}. + * + * @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 + */ + protected TestResult doBitBltCheckerBufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY, rasterOp); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_BYTE_INDEXED}. + * + * @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 + */ + protected TestResult doBitBltCheckerBufferedImageTypeByteIndexed(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED, rasterOp); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_CUSTOM}. + * + * @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 + */ + protected TestResult doBitBltCheckerBufferedImageTypeCustom(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_CUSTOM, rasterOp); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * * @param image * image used as a destination for BitBlt-type operations * @param graphics2d @@ -312,6 +396,159 @@ } /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#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 + */ + protected TestResult doBitBltCheckerBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR, rasterOp); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR_PRE}. + * + * @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 + */ + protected TestResult doBitBltCheckerBufferedImageType4ByteABGRPre(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE, rasterOp); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_ARGB}. + * + * @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 + */ + protected TestResult doBitBltCheckerBufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB, rasterOp); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}. + * + * @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 + */ + protected TestResult doBitBltCheckerBufferedImageTypeIntARGBPre(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE, rasterOp); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_BGR}. + * + * @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 + */ + protected TestResult doBitBltCheckerBufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_INT_BGR, rasterOp); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_INT_RGB}. + * + * @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 + */ + protected TestResult doBitBltCheckerBufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_INT_RGB, rasterOp); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}. + * + * @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 + */ + protected TestResult doBitBltCheckerBufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB, rasterOp); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_USHORT_565_RGB}. + * + * @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 + */ + protected TestResult doBitBltCheckerBufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB, rasterOp); + } + + /** + * Test basic BitBlt operation for checker buffered image with type {@link BufferedImage#TYPE_USHORT_GRAY}. + * + * @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 + */ + protected TestResult doBitBltCheckerBufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY, rasterOp); + } + + /** * Test basic BitBlt operation for buffered image containing diagonal checker pattern * with type TYPE_3BYTE_BGR * From ptisnovs at icedtea.classpath.org Fri Aug 2 03:11:12 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 02 Aug 2013 10:11:12 +0000 Subject: /hg/rhino-tests: Added four new tests testGetEnumConstants(), te... Message-ID: changeset ea551c7459e6 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=ea551c7459e6 author: Pavel Tisnovsky date: Fri Aug 02 12:14:48 2013 +0200 Added four new tests testGetEnumConstants(), testGetTypeParameters(), testGetSigners() and testDesiredAssertionStatus() into CompiledScriptClassTest. diffstat: ChangeLog | 7 ++++ src/org/RhinoTests/CompiledScriptClassTest.java | 38 +++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diffs (89 lines): diff -r a73f929dc212 -r ea551c7459e6 ChangeLog --- a/ChangeLog Thu Aug 01 10:25:51 2013 +0200 +++ b/ChangeLog Fri Aug 02 12:14:48 2013 +0200 @@ -1,3 +1,10 @@ +2013-08-02 Pavel Tisnovsky + + * src/org/RhinoTests/CompiledScriptClassTest.java: + Added four new tests testGetEnumConstants(), testGetTypeParameters(), + testGetSigners() and testDesiredAssertionStatus() + into CompiledScriptClassTest. + 2013-08-01 Pavel Tisnovsky * src/org/RhinoTests/ScriptEngineClassTest.java: diff -r a73f929dc212 -r ea551c7459e6 src/org/RhinoTests/CompiledScriptClassTest.java --- a/src/org/RhinoTests/CompiledScriptClassTest.java Thu Aug 01 10:25:51 2013 +0200 +++ b/src/org/RhinoTests/CompiledScriptClassTest.java Fri Aug 02 12:14:48 2013 +0200 @@ -341,6 +341,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(); @@ -385,6 +386,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(); @@ -957,12 +959,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 @@ -1117,6 +1122,39 @@ } /** + * Test for method javax.script.CompiledScript.getClass().getEnumConstants() + */ + protected void testGetEnumConstants() { + Object[] enumConstants = this.compiledScriptClass.getEnumConstants(); + assertNull(enumConstants, "getEnumConstants() does not return null"); + } + + /** + * Test for method javax.script.CompiledScript.getClass().getTypeParameters() + */ + protected void testGetTypeParameters() { + TypeVariable[] typeParameters = this.compiledScriptClass.getTypeParameters(); + assertNotNull(typeParameters, "getTypeParameters() return null"); + assertEquals(0, typeParameters.length, "array of wrong size returned by getTypeParameters() " + typeParameters.length); + } + + /** + * Test for method javax.script.CompiledScript.getClass().getSigners() + */ + protected void testGetSigners() { + Object[] signers = this.compiledScriptClass.getSigners(); + assertNull(signers, "getSigners() does not return null"); + } + + /** + * Test for method javax.script.CompiledScript.getClass().desiredAssertionStatus() + */ + protected void testDesiredAssertionStatus() { + assertFalse(this.compiledScriptClass.desiredAssertionStatus(), + "Method CompiledScript.getClass().desiredAssertionStatus() returns wrong value"); + } + + /** * Test for instanceof operator applied to a class javax.script.CompiledScript */ @SuppressWarnings("cast") From stefan at complang.tuwien.ac.at Fri Aug 2 04:03:56 2013 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Fri, 2 Aug 2013 13:03:56 +0200 Subject: [icedtea6] RFC: Upgrade CACAO to version 1.6.1 Message-ID: Upgrade CACAO to version 1.6.1 * Makefile.am: (CACAO_VERSION): Updated to release. (CACAO_SHA256SUM): Likewise. * NEWS: List changes in CACAO since last revision. You'll need to mirror http://mips.complang.tuwien.ac.at/hg/cacao/archive/0f873f9810f5.tar.gz at http://icedtea.wildebeest.org/download/drops/cacao/ under the same name. If approved, I cannot push the patch myself, but I can promptly prepare a Mercurial changeset for pulling as-is. -------------- next part -------------- A non-text attachment was scrubbed... Name: cacao-upgrade.patch Type: application/octet-stream Size: 1090 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130802/7ccf6069/cacao-upgrade.patch From gnu.andrew at redhat.com Fri Aug 2 04:30:25 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Fri, 2 Aug 2013 07:30:25 -0400 (EDT) Subject: [icedtea6] RFC: Upgrade CACAO to version 1.6.1 In-Reply-To: References: Message-ID: <960761396.11479070.1375443025242.JavaMail.root@redhat.com> ----- Original Message ----- > Upgrade CACAO to version 1.6.1 > * Makefile.am: > (CACAO_VERSION): Updated to release. > (CACAO_SHA256SUM): Likewise. > * NEWS: List changes in CACAO since last revision. > > > You'll need to mirror > http://mips.complang.tuwien.ac.at/hg/cacao/archive/0f873f9810f5.tar.gz > at http://icedtea.wildebeest.org/download/drops/cacao/ under the same > name. If approved, I cannot push the patch myself, but I can promptly > prepare a Mercurial changeset for pulling as-is. > I've been thinking about doing this myself. I'd rather we use the release version and all three major versions should move in sync. -- 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 stefan at complang.tuwien.ac.at Fri Aug 2 04:43:32 2013 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Fri, 2 Aug 2013 13:43:32 +0200 Subject: [icedtea6] RFC: Upgrade CACAO to version 1.6.1 In-Reply-To: <960761396.11479070.1375443025242.JavaMail.root@redhat.com> References: <960761396.11479070.1375443025242.JavaMail.root@redhat.com> Message-ID: > I've been thinking about doing this myself. I'd rather we use the > release version and all three major versions should move in sync. This is the release version. Or do you mean the release tarball? From gnu.andrew at redhat.com Fri Aug 2 05:33:30 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Fri, 2 Aug 2013 08:33:30 -0400 (EDT) Subject: [icedtea6] RFC: Upgrade CACAO to version 1.6.1 In-Reply-To: References: <960761396.11479070.1375443025242.JavaMail.root@redhat.com> Message-ID: <1358814574.11501349.1375446810666.JavaMail.root@redhat.com> ----- Original Message ----- > > I've been thinking about doing this myself. I'd rather we use the > > release version and all three major versions should move in sync. > > This is the release version. Or do you mean the release tarball? > The release tarball. We only ended up using snapshots as there were no current releases. I'd prefer we go back to using releases if possible. -- 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 andrew at icedtea.classpath.org Fri Aug 2 05:53:51 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 02 Aug 2013 12:53:51 +0000 Subject: /hg/icedtea6-hg: Remove upstreamed JDK security patches from 201... Message-ID: changeset 2074ba4e8816 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2074ba4e8816 author: Andrew John Hughes date: Fri Aug 02 13:52:22 2013 +0100 Remove upstreamed JDK security patches from 2013/06/18 erratum. 2013-08-02 Andrew John Hughes * patches/openjdk/6469266-xmlsec_1.4.2.patch, * patches/openjdk/6888167-medialib_memory_leaks.patch, * patches/openjdk/7195301-no_instanceof_node.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-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-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/8009235-improve_tsa_data_handling.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/javac_issue.patch, * Makefile.am: Remove unused patches. * Makefile.am: (SECURITY_PATCHES): Remove upstreamed security patches. diffstat: ChangeLog | 64 + Makefile.am | 56 - patches/openjdk/6469266-xmlsec_1.4.2.patch | 23876 ---------- patches/openjdk/6888167-medialib_memory_leaks.patch | 134 - patches/openjdk/7195301-no_instanceof_node.patch | 86 - patches/security/20130618/6741606-apache_santuario.patch | 8110 --- patches/security/20130618/7170730-windows_network_stack.patch | 1057 - patches/security/20130618/8000638-improve_deserialization.patch | 26 - 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-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 | 6937 -- 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/8009235-improve_tsa_data_handling.patch | 80 - 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/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/diamond_fix.patch | 55 - patches/security/20130618/javac_issue.patch | 60 - 58 files changed, 64 insertions(+), 47459 deletions(-) diffs (truncated from 47766 to 500 lines): diff -r 73409100db47 -r 2074ba4e8816 ChangeLog --- a/ChangeLog Wed Jul 31 18:04:46 2013 +0100 +++ b/ChangeLog Fri Aug 02 13:52:22 2013 +0100 @@ -1,3 +1,67 @@ +2013-08-02 Andrew John Hughes + + * patches/openjdk/6469266-xmlsec_1.4.2.patch, + * patches/openjdk/6888167-medialib_memory_leaks.patch, + * patches/openjdk/7195301-no_instanceof_node.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-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-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/8009235-improve_tsa_data_handling.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/javac_issue.patch, + * Makefile.am: + Remove unused patches. + * Makefile.am: + (SECURITY_PATCHES): Remove upstreamed security + patches. + 2013-07-31 Andrew John Hughes * patches/ecj/jcp-importsources.patch, diff -r 73409100db47 -r 2074ba4e8816 Makefile.am --- a/Makefile.am Wed Jul 31 18:04:46 2013 +0100 +++ b/Makefile.am Fri Aug 02 13:52:22 2013 +0100 @@ -282,64 +282,8 @@ SECURITY_PATCHES = \ patches/security/20120830/7182135-impossible_to_use_some_editors_directly.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/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/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/8000642-better_transportation_handling.patch \ patches/openjdk/6786028-wcag_bold_tags.patch \ patches/openjdk/6786682-wcag_lang.patch \ diff -r 73409100db47 -r 2074ba4e8816 patches/openjdk/6469266-xmlsec_1.4.2.patch --- a/patches/openjdk/6469266-xmlsec_1.4.2.patch Wed Jul 31 18:04:46 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23876 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1371136223 -3600 -# Node ID a955a845f0d1b8e21e0780986d971b3712db26c7 -# Parent 2ae6d8da293f30c94c9478a6634c7a480328c5c5 -6469266: Integrate Apache XMLSec 1.4.2 into JDK 7 -Reviewed-by: valeriep - -diff --git a/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java b/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java ---- openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java -+++ openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java -@@ -20,12 +20,9 @@ - */ - package com.sun.org.apache.xml.internal.security; - -- -- - import java.io.InputStream; - import java.security.AccessController; - import java.security.PrivilegedAction; -- - import javax.xml.parsers.DocumentBuilder; - import javax.xml.parsers.DocumentBuilderFactory; - -@@ -51,7 +48,7 @@ - * done by calling {@link Init#init} which should be done in any static block - * of the files of this library. We ensure that this call is only executed once. - * -- * @author $Author: raul $ -+ * @author $Author: mullan $ - */ - public final class Init { - -@@ -113,20 +110,19 @@ - dbf.setValidating(false); - - DocumentBuilder db = dbf.newDocumentBuilder(); -- - // We don't allow users to override the Apache XML Security - // configuration in the JRE. Users should use the standard security - // provider mechanism instead if implementing their own - // transform or canonicalization algorithms. -- // String cfile = System.getProperty("com.sun.org.apache.xml.internal.security.resource.config"); -- // InputStream is = -- // Class.forName("com.sun.org.apache.xml.internal.security.Init") -- // .getResourceAsStream(cfile != null ? cfile : "resource/config.xml"); -+ // InputStream is = Class.forName("com.sun.org.apache.xml.internal.security.Init").getResourceAsStream("resource/config.xml"); - InputStream is = (InputStream) AccessController.doPrivileged( - new PrivilegedAction() { - public Object run() { -+// String cfile = System.getProperty -+// ("com.sun.org.apache.xml.internal.security.resource.config"); - return getClass().getResourceAsStream -- ("resource/config.xml"); -+// (cfile != null ? cfile : "resource/config.xml"); -+ ("resource/config.xml"); - } - }); - -@@ -167,7 +163,7 @@ - // - // if (tag.equals("ResourceBundles")){ - // XX_configure_i18n_start = System.currentTimeMillis(); --// Element resource=(Element)el; -+// Element resource=(Element)el; - // /* configure internationalization */ - // Attr langAttr = resource.getAttributeNode("defaultLanguageCode"); - // Attr countryAttr = resource.getAttributeNode("defaultCountryCode"); -@@ -202,11 +198,11 @@ - - if (currMeth.getDeclaringClass().getName() - .equals(JAVACLASS)) { -- log.log(java.util.logging.Level.FINE, currMeth.getDeclaringClass().toString()); -+ log.log(java.util.logging.Level.FINE, currMeth.getDe claringClass().toString()); - } - }*/ -- if (true) -- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Canonicalizer.register(" + URI + ", " -+ if (log.isLoggable(java.util.logging.Level.FINE)) -+ log.log(java.util.logging.Level.FINE, "Canonicalizer.register(" + URI + ", " - + JAVACLASS + ")"); - Canonicalizer.register(URI, JAVACLASS); - } catch (ClassNotFoundException e) { -@@ -233,9 +229,8 @@ - "JAVACLASS"); - try { - Class.forName(JAVACLASS); -- if (true) -- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Transform.register(" + URI + ", " + JAVACLASS -- + ")"); -+ if (log.isLoggable(java.util.logging.Level.FINE)) -+ log.log(java.util.logging.Level.FINE, "Transform.register(" + URI + ", " + JAVACLASS + ")"); - Transform.register(URI, JAVACLASS); - } catch (ClassNotFoundException e) { - Object exArgs[] = { URI, JAVACLASS }; -@@ -284,12 +279,11 @@ - // - // if (currMeth.getDeclaringClass().getName() - // .equals(JAVACLASS)) { --// log.log(java.util.logging.Level.FINE, currMeth.getDeclaringClass().toString()); -+// log.log(java.util.logging.Level.FINE, currMeth.getDe claringClass().toString()); - // } - // } -- if (true) -- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "SignatureAlgorithm.register(" + URI + ", " -- + JAVACLASS + ")"); -+ if (log.isLoggable(java.util.logging.Level.FINE)) -+ log.log(java.util.logging.Level.FINE, "SignatureAlgorithm.register(" + URI + ", " + JAVACLASS + ")"); - SignatureAlgorithm.register(URI, JAVACLASS); - } catch (ClassNotFoundException e) { - Object exArgs[] = { URI, JAVACLASS }; -@@ -320,13 +314,11 @@ - "DESCRIPTION"); - - if ((Description != null) && (Description.length() > 0)) { -- if (true) -- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS + ": " -- + Description); -+ if (log.isLoggable(java.util.logging.Level.FINE)) -+ log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS + ": " + Description); - } else { -- if (true) -- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS -- + ": For unknown purposes"); -+ if (log.isLoggable(java.util.logging.Level.FINE)) -+ log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS + ": For unknown purposes"); - } - try { - ResourceResolver.register(JAVACLASS); -@@ -359,13 +351,11 @@ - "DESCRIPTION"); - - if ((Description != null) && (Description.length() > 0)) { -- if (true) -- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS + ": " -- + Description); -+ if (log.isLoggable(java.util.logging.Level.FINE)) -+ log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS + ": " + Description); - } else { -- if (true) -- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS -- + ": For unknown purposes"); -+ if (log.isLoggable(java.util.logging.Level.FINE)) -+ log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS + ": For unknown purposes"); - } - - KeyResolver.register(JAVACLASS); -@@ -376,8 +366,8 @@ - - if (tag.equals("PrefixMappings")){ - XX_configure_reg_prefixes_start = System.currentTimeMillis(); -- if (true) -- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Now I try to bind prefixes:"); -+ if (log.isLoggable(java.util.logging.Level.FINE)) -+ log.log(java.util.logging.Level.FINE, "Now I try to bind prefixes:"); - - Element[] nl = XMLUtils.selectNodes(el.getFirstChild(), CONF_NS,"PrefixMapping"); - -@@ -386,8 +376,8 @@ - "namespace"); - String prefix = nl[i].getAttributeNS(null, - "prefix"); -- if (true) -- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Now I try to bind " + prefix + " to " + namespace); -+ if (log.isLoggable(java.util.logging.Level.FINE)) -+ log.log(java.util.logging.Level.FINE, "Now I try to bind " + prefix + " to " + namespace); - com.sun.org.apache.xml.internal.security.utils.ElementProxy - .setDefaultPrefix(namespace, prefix); - } -@@ -398,19 +388,19 @@ - long XX_init_end = System.currentTimeMillis(); - - //J- -- if (true) { -- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "XX_init " + ((int)(XX_init_end - XX_init_start)) + " ms"); -- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_prng " + ((int)(XX_prng_end - XX_prng_start)) + " ms"); -- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_parsing " + ((int)(XX_parsing_end - XX_parsing_start)) + " ms"); -- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_i18n " + ((int)(XX_configure_i18n_end- XX_configure_i18n_start)) + " ms"); -- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_reg_c14n " + ((int)(XX_configure_reg_c14n_end- XX_configure_reg_c14n_start)) + " ms"); -- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_reg_jcemapper " + ((int)(XX_configure_reg_jcemapper_end- XX_configure_reg_jcemapper_start)) + " ms"); -- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_reg_keyInfo " + ((int)(XX_configure_reg_keyInfo_end- XX_configure_reg_keyInfo_start)) + " ms"); -- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_reg_keyResolver " + ((int)(XX_configure_reg_keyResolver_end- XX_configure_reg_keyResolver_start)) + " ms"); -- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_reg_prefixes " + ((int)(XX_configure_reg_prefixes_end- XX_configure_reg_prefixes_start)) + " ms"); -- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_reg_resourceresolver " + ((int)(XX_configure_reg_resourceresolver_end- XX_configure_reg_resourceresolver_start)) + " ms"); -- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_reg_sigalgos " + ((int)(XX_configure_reg_sigalgos_end- XX_configure_reg_sigalgos_start)) + " ms"); -- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_reg_transforms " + ((int)(XX_configure_reg_transforms_end- XX_configure_reg_transforms_start)) + " ms"); -+ if (log.isLoggable(java.util.logging.Level.FINE)) { -+ log.log(java.util.logging.Level.FINE, "XX_init " + ((int)(XX_init_end - XX_init_start)) + " ms"); -+ log.log(java.util.logging.Level.FINE, " XX_prng " + ((int)(XX_prng_end - XX_prng_start)) + " ms"); -+ log.log(java.util.logging.Level.FINE, " XX_parsing " + ((int)(XX_parsing_end - XX_parsing_start)) + " ms"); -+ log.log(java.util.logging.Level.FINE, " XX_configure_i18n " + ((int)(XX_configure_i18n_end- XX_configure_i18n_start)) + " ms"); -+ log.log(java.util.logging.Level.FINE, " XX_configure_reg_c14n " + ((int)(XX_configure_reg_c14n_end- XX_configure_reg_c14n_start)) + " ms"); -+ log.log(java.util.logging.Level.FINE, " XX_configure_reg_jcemapper " + ((int)(XX_configure_reg_jcemapper_end- XX_configure_reg_jcemapper_start)) + " ms"); -+ log.log(java.util.logging.Level.FINE, " XX_configure_reg_keyInfo " + ((int)(XX_configure_reg_keyInfo_end- XX_configure_reg_keyInfo_start)) + " ms"); -+ log.log(java.util.logging.Level.FINE, " XX_configure_reg_keyResolver " + ((int)(XX_configure_reg_keyResolver_end- XX_configure_reg_keyResolver_start)) + " ms"); -+ log.log(java.util.logging.Level.FINE, " XX_configure_reg_prefixes " + ((int)(XX_configure_reg_prefixes_end- XX_configure_reg_prefixes_start)) + " ms"); -+ log.log(java.util.logging.Level.FINE, " XX_configure_reg_resourceresolver " + ((int)(XX_configure_reg_resourceresolver_end- XX_configure_reg_resourceresolver_start)) + " ms"); -+ log.log(java.util.logging.Level.FINE, " XX_configure_reg_sigalgos " + ((int)(XX_configure_reg_sigalgos_end- XX_configure_reg_sigalgos_start)) + " ms"); -+ log.log(java.util.logging.Level.FINE, " XX_configure_reg_transforms " + ((int)(XX_configure_reg_transforms_end- XX_configure_reg_transforms_start)) + " ms"); - } - } catch (Exception e) { - log.log(java.util.logging.Level.SEVERE, "Bad: ", e); -diff --git a/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/Algorithm.java b/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/Algorithm.java ---- openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/Algorithm.java -+++ openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/Algorithm.java -@@ -24,7 +24,7 @@ - - import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException; - import com.sun.org.apache.xml.internal.security.utils.Constants; --import com.sun.org.apache.xml.internal.security.utils.ElementProxy; -+import com.sun.org.apache.xml.internal.security.utils.SignatureElementProxy; - import org.w3c.dom.Document; - import org.w3c.dom.Element; - -@@ -33,11 +33,7 @@ - * The Algorithm class which stores the Algorithm URI as a string. - * - */ --public abstract class Algorithm extends ElementProxy { -- -- /** {@link java.util.logging} logging facility */ -- static java.util.logging.Logger log = -- java.util.logging.Logger.getLogger(Algorithm.class.getName()); -+public abstract class Algorithm extends SignatureElementProxy { - - /** - * -@@ -79,7 +75,7 @@ - */ - protected void setAlgorithmURI(String algorithmURI) { - -- if ((this._state == MODE_CREATE) && (algorithmURI != null)) { -+ if ( (algorithmURI != null)) { - this._constructionElement.setAttributeNS(null, Constants._ATT_ALGORITHM, - algorithmURI); - } -diff --git a/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java b/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java ---- openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java -+++ openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java -@@ -35,7 +35,7 @@ - /** - * This class maps algorithm identifier URIs to JAVA JCE class names. - * -- * @author $Author: raul $ -+ * @author $Author: mullan $ - */ - public class JCEMapper { - -@@ -45,9 +45,9 @@ - - - -- private static Map uriToJCEName = new HashMap(); -+ private static Map uriToJCEName; - -- private static Map algorithmsMap = new HashMap(); -+ private static Map algorithmsMap; - - private static String providerName = null; - /** -@@ -63,6 +63,8 @@ - - static void loadAlgorithms( Element algorithmsEl) { - Element[] algorithms = XMLUtils.selectNodes(algorithmsEl.getFirstChild(),Init.CONF_NS,"Algorithm"); -+ uriToJCEName = new HashMap( algorithms.length * 2); -+ algorithmsMap = new HashMap( algorithms.length * 2); - for (int i = 0 ;i < algorithms.length ;i ++) { - Element el = algorithms[i]; - String id = el.getAttribute("URI"); -@@ -70,6 +72,7 @@ - uriToJCEName.put(id, jceName); - algorithmsMap.put(id, new Algorithm(el)); - } -+ - } - - static Algorithm getAlgorithmMapping(String algoURI) { -@@ -84,8 +87,8 @@ - * - */ - public static String translateURItoJCEID(String AlgorithmURI) { -- if (true) -- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Request for URI " + AlgorithmURI); -+ if (log.isLoggable(java.util.logging.Level.FINE)) -+ log.log(java.util.logging.Level.FINE, "Request for URI " + AlgorithmURI); - - String jceName = (String) uriToJCEName.get(AlgorithmURI); - return jceName; -@@ -100,8 +103,8 @@ - * - */ - public static String getAlgorithmClassFromURI(String AlgorithmURI) { -- if (true) -- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Request for URI " + AlgorithmURI); -+ if (log.isLoggable(java.util.logging.Level.FINE)) -+ log.log(java.util.logging.Level.FINE, "Request for URI " + AlgorithmURI); - - return ((Algorithm) algorithmsMap.get(AlgorithmURI)).algorithmClass; - } -diff --git a/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java b/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java ---- openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java -+++ openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java -@@ -20,10 +20,10 @@ - */ - package com.sun.org.apache.xml.internal.security.algorithms; - -- -- - import java.security.MessageDigest; - import java.security.NoSuchProviderException; -+import java.util.HashMap; -+import java.util.Map; - - import com.sun.org.apache.xml.internal.security.signature.XMLSignatureException; - import com.sun.org.apache.xml.internal.security.utils.Constants; -@@ -41,11 +41,6 @@ - */ - public class MessageDigestAlgorithm extends Algorithm { - -- /** {@link java.util.logging} logging facility */ -- static java.util.logging.Logger log = -- java.util.logging.Logger.getLogger( -- MessageDigestAlgorithm.class.getName()); -- - /** Message Digest - NOT RECOMMENDED MD5*/ - public static final String ALGO_ID_DIGEST_NOT_RECOMMENDED_MD5 = Constants.MoreAlgorithmsSpecNS + "md5"; - /** Digest - Required SHA1*/ -@@ -76,6 +71,12 @@ - this.algorithm = messageDigest; - } - -+ static ThreadLocal instances=new ThreadLocal() { -+ protected Object initialValue() { -+ return new HashMap(); -+ }; -+ }; -+ - /** - * Factory method for constructing a message digest algorithm by name. - * -@@ -86,8 +87,15 @@ - */ - public static MessageDigestAlgorithm getInstance( - Document doc, String algorithmURI) throws XMLSignatureException { -+ MessageDigest md = getDigestInstance(algorithmURI); -+ return new MessageDigestAlgorithm(doc, md, algorithmURI); -+ } - -- String algorithmID = JCEMapper.translateURItoJCEID(algorithmURI); -+private static MessageDigest getDigestInstance(String algorithmURI) throws XMLSignatureException { -+ MessageDigest result=(MessageDigest) ((Map)instances.get()).get(algorithmURI); -+ if (result!=null) -+ return result; -+ String algorithmID = JCEMapper.translateURItoJCEID(algorithmURI); - - if (algorithmID == null) { - Object[] exArgs = { algorithmURI }; From bugzilla-daemon at icedtea.classpath.org Fri Aug 2 07:14:18 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 02 Aug 2013 14:14:18 +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 --- Comment #4 from Andrew Azores --- I don't see the NoSuchMethodError which you mentioned in your previous comment in the stack trace associated with this crash. It appears that this crash is occurring because your application is trying to write to a file in the root directory of the filesystem. Or, if there are deeper issues, then this is at least the first failure point and we can get to the deeper issues once this is resolved. I would agree with the permission being denied to allow applications, even signed ones, to write to files at that level. Can you try changing your logging directory from "/chipster.log" to somewhere that should be user-writeable? Perhaps you can use something like System.getProperty("user.home") + "/chipster.log", or System.getProperty("java.io.tmpdir") + "/chipster.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/20130802/8c855b30/attachment.html From bugzilla-daemon at icedtea.classpath.org Sat Aug 3 06:42:07 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 03 Aug 2013 13:42:07 +0000 Subject: [Bug 1513] New: Applet fails to load Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1513 Bug ID: 1513 Summary: Applet fails to load Classification: Unclassified Product: IcedTea-Web Version: 1.4 Hardware: x86_64 OS: Linux Status: NEW Severity: critical Priority: P3 Component: Plugin Assignee: dbhole at redhat.com Reporter: multime200 at gmail.com CC: unassigned at icedtea.classpath.org Whenever I try to load the applet at the University of Georgia's Oasis it fails to load and gives me this error IcedTea-Web Plugin version: 1.4 (1.4-3~deb7u1) Sat Aug 03 09:36:01 EDT 2013 net.sourceforge.jnlp.LaunchException: Fatal: Initialization Error: Could not initialize applet. For more information click "more information button". at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:734) at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:662) at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:914) Caused by: net.sourceforge.jnlp.LaunchException: Fatal: Application Error: Unknown Main-Class. Could not determine the main class for this application. at net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeResources(JNLPClassLoader.java:708) at net.sourceforge.jnlp.runtime.JNLPClassLoader.(JNLPClassLoader.java:249) at net.sourceforge.jnlp.runtime.JNLPClassLoader.createInstance(JNLPClassLoader.java:382) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:444) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:420) at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:700) ... 2 more Chain: 1) at Sat Aug 03 09:35:22 EDT 2013 net.sourceforge.jnlp.LaunchException: Fatal: Application Error: Unknown Main-Class. Could not determine the main class for this application. at net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeResources(JNLPClassLoader.java:708) at net.sourceforge.jnlp.runtime.JNLPClassLoader.(JNLPClassLoader.java:249) at net.sourceforge.jnlp.runtime.JNLPClassLoader.createInstance(JNLPClassLoader.java:382) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:444) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:420) at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:700) at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:662) at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:914) 2) at Sat Aug 03 09:35:22 EDT 2013 net.sourceforge.jnlp.LaunchException: Fatal: Initialization Error: Could not initialize applet. For more information click "more information button". at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:734) at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:662) at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:914) Caused by: net.sourceforge.jnlp.LaunchException: Fatal: Application Error: Unknown Main-Class. Could not determine the main class for this application. at net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeResources(JNLPClassLoader.java:708) at net.sourceforge.jnlp.runtime.JNLPClassLoader.(JNLPClassLoader.java:249) at net.sourceforge.jnlp.runtime.JNLPClassLoader.createInstance(JNLPClassLoader.java:382) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:444) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:420) at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:700) ... 2 more -- 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/20130803/0b1e1358/attachment.html From andrew at icedtea.classpath.org Mon Aug 5 03:47:45 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 05 Aug 2013 10:47:45 +0000 Subject: /hg/icedtea6: Sync hs23 with icedtea-2.3.12 tag. Message-ID: changeset 868201fa37c4 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=868201fa37c4 author: Andrew John Hughes date: Mon Aug 05 11:47:08 2013 +0100 Sync hs23 with icedtea-2.3.12 tag. 2013-08-02 Andrew John Hughes * hotspot.map: Bring in hs23 changes to ARM32 port, syncing with 2.3.12 tag. diffstat: ChangeLog | 5 +++++ hotspot.map | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diffs (19 lines): diff -r df51aa5a4270 -r 868201fa37c4 ChangeLog --- a/ChangeLog Tue Jul 23 00:18:28 2013 +0100 +++ b/ChangeLog Mon Aug 05 11:47:08 2013 +0100 @@ -1,3 +1,8 @@ +2013-08-02 Andrew John Hughes + + * hotspot.map: Bring in hs23 changes to ARM32 + port, syncing with 2.3.12 tag. + 2013-07-22 Andrew John Hughes * Makefile.am: diff -r df51aa5a4270 -r 868201fa37c4 hotspot.map --- a/hotspot.map Tue Jul 23 00:18:28 2013 +0100 +++ b/hotspot.map Mon Aug 05 11:47:08 2013 +0100 @@ -1,2 +1,2 @@ # version url changeset sha256sum -hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 4413a836dcc7 f04724b1a971ea9fd12a57ecc0670d88e6f43af8024655173a6df38b8de17305 +hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 37b254871acb 60268f9d792575ec26b8796753246aca70282937327c2fa855b3f0010638605e From andrew at icedtea.classpath.org Mon Aug 5 04:15:13 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 05 Aug 2013 11:15:13 +0000 Subject: /hg/icedtea6-hg: 2 new changesets Message-ID: changeset 868201fa37c4 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=868201fa37c4 author: Andrew John Hughes date: Mon Aug 05 11:47:08 2013 +0100 Sync hs23 with icedtea-2.3.12 tag. 2013-08-02 Andrew John Hughes * hotspot.map: Bring in hs23 changes to ARM32 port, syncing with 2.3.12 tag. changeset c56469bd12cb in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c56469bd12cb author: Andrew John Hughes date: Mon Aug 05 12:14:35 2013 +0100 Merge diffstat: ChangeLog | 211 + Makefile.am | 141 +- hotspot.map | 2 +- patches/copy_memory.patch | 36 - patches/ecj/jcp-importsources.patch | 10 - patches/ecj/override.patch | 51 + patches/hotspot/original/7197906-handle_32_bit_shifts.patch | 33 - patches/hotspot/original/fix_get_stack_bounds_leak.patch | 12 - patches/openjdk/5102804-memory_leak.patch | 429 - patches/openjdk/6469266-xmlsec_1.4.2.patch | 23876 - patches/openjdk/6501644-icu_sync.patch | 8066 - patches/openjdk/6669869-queries_per_appcontext.patch | 355 - patches/openjdk/6886358-layout_update.patch | 13847 - patches/openjdk/6888167-medialib_memory_leaks.patch | 134 - patches/openjdk/6963811-deadlock_fix.patch | 42 - patches/openjdk/7017324-kerning_crash.patch | 101 - patches/openjdk/7036559-concurrenthashmap_improvements.patch | 1436 - patches/openjdk/7064279-fixup.patch | 71 - patches/openjdk/7064279-resource_release.patch | 436 - patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch | 298 - patches/openjdk/7195301-no_instanceof_node.patch | 86 - patches/openjdk/8004302-soap_test_failure.patch | 75 - patches/openjdk/8004341-jck_dialog_failure.patch | 26 - patches/openjdk/8005615-failure_to_load_logger_implementation.patch | 542 - patches/openjdk/8007393.patch | 78 - patches/openjdk/8007611.patch | 24 - patches/openjdk/8009641-8007675_build_fix.patch | 49 - patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch | 449213 ------- patches/openjdk/jaxp144_05.patch | 595589 ---------- patches/security/20130201/6563318.patch | 36 - patches/security/20130201/6664509.patch | 1322 - patches/security/20130201/6776941.patch | 272 - patches/security/20130201/7141694.patch | 87 - patches/security/20130201/7173145.patch | 22 - patches/security/20130201/7186945.patch | 10819 - patches/security/20130201/7186948.patch | 20 - patches/security/20130201/7186952.patch | 127 - patches/security/20130201/7186954.patch | 81 - patches/security/20130201/7192392.patch | 695 - patches/security/20130201/7192393.patch | 60 - patches/security/20130201/7192977.patch | 444 - patches/security/20130201/7197546.patch | 479 - patches/security/20130201/7200491.patch | 49 - patches/security/20130201/7200500.patch | 60 - patches/security/20130201/7201064.patch | 125 - patches/security/20130201/7201066.patch | 66 - patches/security/20130201/7201068.patch | 83 - patches/security/20130201/7201070.patch | 31 - patches/security/20130201/7201071.patch | 553 - patches/security/20130201/8000210.patch | 104 - patches/security/20130201/8000537.patch | 334 - patches/security/20130201/8000540.patch | 187 - patches/security/20130201/8000631.patch | 3964 - patches/security/20130201/8001242.patch | 61 - patches/security/20130201/8001307.patch | 27 - patches/security/20130201/8001972.patch | 438 - patches/security/20130201/8002325.patch | 59 - patches/security/20130219/8006446.patch | 395 - patches/security/20130219/8006777.patch | 1036 - patches/security/20130219/8007688.patch | 130 - patches/security/20130304/8007014.patch | 477 - patches/security/20130304/8007675.patch | 416 - patches/security/20130416/6657673-factory_finder.patch | 54 - patches/security/20130416/6657673-fixup.patch | 229 - patches/security/20130416/6657673.patch | 9494 - patches/security/20130416/7200507.patch | 230 - patches/security/20130416/8000724.patch | 1368 - patches/security/20130416/8001031.patch | 5457 - patches/security/20130416/8001040.patch | 113 - patches/security/20130416/8001322.patch | 61 - patches/security/20130416/8001329.patch | 32 - patches/security/20130416/8003335.patch | 63 - patches/security/20130416/8003445.patch | 77 - patches/security/20130416/8003543.patch | 236 - patches/security/20130416/8004261.patch | 142 - patches/security/20130416/8004336.patch | 29 - patches/security/20130416/8004986.patch | 374 - patches/security/20130416/8005432.patch | 518 - patches/security/20130416/8005943.patch | 202 - patches/security/20130416/8006309.patch | 22 - patches/security/20130416/8006435.patch | 76 - patches/security/20130416/8006790.patch | 166 - patches/security/20130416/8006795.patch | 35 - patches/security/20130416/8007406.patch | 31 - patches/security/20130416/8007617.patch | 376 - patches/security/20130416/8007667.patch | 579 - patches/security/20130416/8007918.patch | 357 - patches/security/20130416/8009063.patch | 67 - patches/security/20130416/8009305.patch | 68 - patches/security/20130416/8009699.patch | 25 - patches/security/20130416/8009814.patch | 27 - patches/security/20130416/8009857.patch | 66 - patches/security/20130618/6741606-apache_santuario.patch | 8110 - patches/security/20130618/7170730-windows_network_stack.patch | 1057 - patches/security/20130618/8000638-improve_deserialization.patch | 26 - 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-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 | 6937 - 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/8009235-improve_tsa_data_handling.patch | 80 - 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/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/diamond_fix.patch | 55 - patches/security/20130618/javac_issue.patch | 60 - 145 files changed, 265 insertions(+), 1161944 deletions(-) diffs (truncated from 1162878 to 500 lines): diff -r df51aa5a4270 -r c56469bd12cb ChangeLog --- a/ChangeLog Tue Jul 23 00:18:28 2013 +0100 +++ b/ChangeLog Mon Aug 05 12:14:35 2013 +0100 @@ -1,3 +1,119 @@ +2013-08-02 Andrew John Hughes + + * hotspot.map: Bring in hs23 changes to ARM32 + port, syncing with 2.3.12 tag. + +2013-08-02 Andrew John Hughes + + * patches/openjdk/6469266-xmlsec_1.4.2.patch, + * patches/openjdk/6888167-medialib_memory_leaks.patch, + * patches/openjdk/7195301-no_instanceof_node.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-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-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/8009235-improve_tsa_data_handling.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/javac_issue.patch, + * Makefile.am: + Remove unused patches. + * Makefile.am: + (SECURITY_PATCHES): Remove upstreamed security + patches. + +2013-07-31 Andrew John Hughes + + * patches/ecj/jcp-importsources.patch, + * patches/openjdk/5102804-memory_leak.patch, + * patches/openjdk/6501644-icu_sync.patch, + * patches/openjdk/6669869-queries_per_appcontext.patch, + * patches/openjdk/6886358-layout_update.patch, + * patches/openjdk/6963811-deadlock_fix.patch, + * patches/openjdk/7017324-kerning_crash.patch, + * patches/openjdk/7064279-fixup.patch, + * patches/openjdk/7064279-resource_release.patch, + * patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch, + * patches/security/20130416/6657673-factory_finder.patch, + * patches/security/20130416/6657673-fixup.patch, + * patches/security/20130416/6657673.patch, + * patches/security/20130416/7200507.patch, + * patches/security/20130416/8000724.patch, + * patches/security/20130416/8001031.patch, + * patches/security/20130416/8001040.patch, + * patches/security/20130416/8001322.patch, + * patches/security/20130416/8001329.patch, + * patches/security/20130416/8003335.patch, + * patches/security/20130416/8003445.patch, + * patches/security/20130416/8003543.patch, + * patches/security/20130416/8004261.patch, + * patches/security/20130416/8004336.patch, + * patches/security/20130416/8004986.patch, + * patches/security/20130416/8005432.patch, + * patches/security/20130416/8005943.patch, + * patches/security/20130416/8006309.patch, + * patches/security/20130416/8006435.patch, + * patches/security/20130416/8006790.patch, + * patches/security/20130416/8006795.patch, + * patches/security/20130416/8007406.patch, + * patches/security/20130416/8007617.patch, + * patches/security/20130416/8007667.patch, + * patches/security/20130416/8007918.patch, + * patches/security/20130416/8009063.patch, + * patches/security/20130416/8009305.patch, + * patches/security/20130416/8009699.patch, + * patches/security/20130416/8009814.patch, + * patches/security/20130416/8009857.patch: + Remove unused patches. + * Makefile.am: + (SECURITY_PATCHES): Remove upstreamed security + patches. + 2013-07-22 Andrew John Hughes * Makefile.am: @@ -58,6 +174,13 @@ 2013-07-11 Andrew John Hughes + * patches/openjdk/7036559-concurrenthashmap_improvements.patch: + Remove upstreamed patch. + * Makefile.am: + (ICEDTEA_PATCHES): Drop upstreamed patches. + +2013-07-11 Andrew John Hughes + * NEWS: Add 1.11.12 and 1.12.6 release notes. @@ -353,6 +476,15 @@ * patches/security/20130618/langtools_merge-03.patch: 2013/06/18 security patches. +2013-05-31 Andrew John Hughes + + * patches/copy_memory.patch, + * patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch: + Drop upstreamed patches. + * Makefile.am: + (DROP_PATCHES): Remove JAXP patch. + (ICEDTEA_PATCHES): Remove OpenJDK6-4 patch. + 2013-05-28 Xerxes R??nby PR1188: ASM Interpreter and Thumb2 JIT javac miscompile @@ -418,6 +550,18 @@ * patches/jtreg-TextLayoutBoundsChecks.patch: Fixed wrong JTreg test name in @run annotation. +2013-05-17 Andrew John Hughes + + * patches/hotspot/original/7197906-handle_32_bit_shifts.patch, + * patches/hotspot/original/fix_get_stack_bounds_leak.patch, + * patches/openjdk/8004302-soap_test_failure.patch, + * patches/openjdk/jaxp144_05.patch: + Removed as available upstream. + * Makefile.am: Remove patches. + * patches/security/20130416/6657673.patch, + * patches/security/20130416/8005432.patch: + Regenerated against upstream. + 2013-05-17 Pavel Tisnovsky * patches/componentOrientationTests.patch: @@ -435,6 +579,12 @@ * Makefile.am: Renamed three patches to be more consistent with other JTreg-related patches. +2013-05-15 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Remove reference to removed + patch patches/openjdk/8009641-8007675_build_fix.patch. + 2013-05-15 Pavel Tisnovsky * Makefile.am: @@ -811,6 +961,62 @@ * patches/jvmtiEnv.patch: Moved to... * patches/hotspot/original/jvmtiEnv.patch: here. +2013-03-19 Andrew John Hughes + + * patches/openjdk/8004341-jck_dialog_failure.patch, + * patches/openjdk/8005615-failure_to_load_logger_implementation.patch, + * patches/openjdk/8007393.patch, + * patches/openjdk/8007611.patch, + * patches/openjdk/8009641-8007675_build_fix.patch, + * patches/security/20130201/6563318.patch, + * patches/security/20130201/6664509.patch, + * patches/security/20130201/6776941.patch, + * patches/security/20130201/7141694.patch, + * patches/security/20130201/7173145.patch, + * patches/security/20130201/7186945.patch, + * patches/security/20130201/7186948.patch, + * patches/security/20130201/7186952.patch, + * patches/security/20130201/7186954.patch, + * patches/security/20130201/7192392.patch, + * patches/security/20130201/7192393.patch, + * patches/security/20130201/7192977.patch, + * patches/security/20130201/7197546.patch, + * patches/security/20130201/7200491.patch, + * patches/security/20130201/7200500.patch, + * patches/security/20130201/7201064.patch, + * patches/security/20130201/7201066.patch, + * patches/security/20130201/7201068.patch, + * patches/security/20130201/7201070.patch, + * patches/security/20130201/7201071.patch, + * patches/security/20130201/8000210.patch, + * patches/security/20130201/8000537.patch, + * patches/security/20130201/8000540.patch, + * patches/security/20130201/8000631.patch, + * patches/security/20130201/8001235.patch, + * patches/security/20130201/8001242.patch, + * patches/security/20130201/8001307.patch, + * patches/security/20130201/8001972.patch, + * patches/security/20130201/8002325.patch, + * patches/security/20130219/8006446.patch, + * patches/security/20130219/8006777.patch, + * patches/security/20130219/8007688.patch, + * patches/security/20130304/8007014.patch, + * patches/security/20130304/8007675.patch: + Remove patches available upstream. + * Makefile.am: + (JAXP_DROP_ZIP): Update to jaxp144_05.zip + with latest security fix included. + (JAXP_DROP_SHA256SUM): Likewise. + (SECURITY_PATCHES): Remove ones available + upstream (all from 2013/02/01, 2013/02/19 + and 2013/03/04). + (ICEDTEA_PATCHES): Remove patches for + 8005615, 8004341, 8007393 & 8007611 + available upstream. + * patches/ecj/override.patch: + Add new case introduced by upstream version + of security patches (sigh...) + 2013-03-18 Andrew John Hughes * Makefile.am: @@ -1412,6 +1618,11 @@ 2012-10-31 Andrew John Hughes + * Makefile.am: + (OPENJDK_VERSION): Bump to next release, b28. + +2012-10-31 Andrew John Hughes + * generated/com/sun/corba/se/impl/logging/ActivationSystemException.java, * generated/com/sun/corba/se/impl/logging/IORSystemException.java, * generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java, diff -r df51aa5a4270 -r c56469bd12cb Makefile.am --- a/Makefile.am Tue Jul 23 00:18:28 2013 +0100 +++ b/Makefile.am Mon Aug 05 12:14:35 2013 +0100 @@ -2,7 +2,7 @@ OPENJDK_DATE = 26_oct_2012 OPENJDK_SHA256SUM = 044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0 -OPENJDK_VERSION = b27 +OPENJDK_VERSION = b28 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ CACAO_VERSION = 68fe50ac34ec @@ -278,144 +278,12 @@ ICEDTEA_FSG_PATCHES = -DROP_PATCHES = \ - patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch \ - patches/openjdk/jaxp144_05.patch +DROP_PATCHES = SECURITY_PATCHES = \ patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \ - patches/security/20130201/7201068.patch \ - patches/security/20130201/6563318.patch \ - patches/security/20130201/6664509.patch \ - patches/security/20130201/6776941.patch \ - patches/security/20130201/7141694.patch \ - patches/security/20130201/7173145.patch \ - patches/security/20130201/7186945.patch \ - patches/security/20130201/7186948.patch \ - patches/security/20130201/7186952.patch \ - patches/security/20130201/7186954.patch \ - patches/security/20130201/7192392.patch \ - patches/security/20130201/7192393.patch \ - patches/security/20130201/7192977.patch \ - patches/security/20130201/7197546.patch \ - patches/security/20130201/7200491.patch \ - patches/security/20130201/7200500.patch \ - patches/security/20130201/7201064.patch \ - patches/security/20130201/7201066.patch \ - patches/security/20130201/7201070.patch \ - patches/security/20130201/7201071.patch \ - patches/security/20130201/8000210.patch \ - patches/security/20130201/8000537.patch \ - patches/security/20130201/8000540.patch \ - patches/security/20130201/8000631.patch \ - patches/security/20130201/8001242.patch \ - patches/security/20130201/8001972.patch \ - patches/security/20130201/8002325.patch \ - patches/security/20130219/8006446.patch \ - patches/security/20130219/8006777.patch \ - patches/security/20130219/8007688.patch \ - patches/security/20130304/8007014.patch \ - patches/security/20130304/8007675.patch \ - patches/openjdk/8009641-8007675_build_fix.patch \ - patches/openjdk/7036559-concurrenthashmap_improvements.patch \ - patches/security/20130416/8009063.patch \ - patches/openjdk/8004302-soap_test_failure.patch \ - patches/security/20130416/6657673.patch \ - patches/security/20130416/6657673-fixup.patch \ - patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch \ - patches/security/20130416/6657673-factory_finder.patch \ - patches/openjdk/6669869-queries_per_appcontext.patch \ - patches/openjdk/5102804-memory_leak.patch \ - patches/openjdk/6963811-deadlock_fix.patch \ - patches/openjdk/7064279-resource_release.patch \ - patches/openjdk/7064279-fixup.patch \ - patches/security/20130416/7200507.patch \ - patches/security/20130416/8000724.patch \ - patches/security/20130416/8004986.patch \ - patches/openjdk/6501644-icu_sync.patch \ - patches/openjdk/6886358-layout_update.patch \ - patches/security/20130416/8001031.patch \ - patches/openjdk/7017324-kerning_crash.patch \ - patches/security/20130416/8001040.patch \ - patches/security/20130416/8001322.patch \ - patches/security/20130416/8001329.patch \ - patches/security/20130416/8003335.patch \ - patches/security/20130416/8003445.patch \ - patches/security/20130416/8003543.patch \ - patches/security/20130416/8004261.patch \ - patches/security/20130416/8005432.patch \ - patches/security/20130416/8005943.patch \ - patches/security/20130416/8006435.patch \ - patches/security/20130416/8006790.patch \ - patches/security/20130416/8006795.patch \ - patches/security/20130416/8007406.patch \ - patches/security/20130416/8007617.patch \ - patches/security/20130416/8007667.patch \ - patches/security/20130416/8007918.patch \ - patches/security/20130416/8009305.patch \ - patches/security/20130416/8009814.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/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/8000642-better_transportation_handling.patch \ patches/openjdk/6786028-wcag_bold_tags.patch \ patches/openjdk/6786682-wcag_lang.patch \ @@ -435,7 +303,6 @@ if !WITH_ALT_HSBUILD SECURITY_PATCHES += \ - patches/security/20130201/8001307.patch \ patches/security/20130416/8004336.patch \ patches/security/20130416/8006309.patch \ patches/security/20130416/8009699.patch \ @@ -648,9 +515,7 @@ patches/openjdk/6980681-corba_deadlock.patch \ patches/openjdk/7162902-corba_fixes.patch \ patches/traceable.patch \ - patches/openjdk/8004341-jck_dialog_failure.patch \ patches/pr1319-support_giflib_5.patch \ - patches/copy_memory.patch \ patches/openjdk/6718364-inference_failure.patch \ patches/openjdk/6682380-foreach_crash.patch \ patches/openjdk/7046929-fix_t6397104_test_failure.patch \ @@ -763,8 +628,6 @@ patches/pr696-zero-fast_aldc-hs20.patch \ patches/arm-debug.patch \ patches/openjdk/7010849-modernise_sa.patch \ - patches/hotspot/original/7197906-handle_32_bit_shifts.patch \ - patches/hotspot/original/fix_get_stack_bounds_leak.patch \ patches/hotspot/original/jvmtiEnv.patch \ patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch \ patches/hotspot/original/aarch64.patch \ diff -r df51aa5a4270 -r c56469bd12cb hotspot.map --- a/hotspot.map Tue Jul 23 00:18:28 2013 +0100 +++ b/hotspot.map Mon Aug 05 12:14:35 2013 +0100 @@ -1,2 +1,2 @@ # version url changeset sha256sum -hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 4413a836dcc7 f04724b1a971ea9fd12a57ecc0670d88e6f43af8024655173a6df38b8de17305 +hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 37b254871acb 60268f9d792575ec26b8796753246aca70282937327c2fa855b3f0010638605e diff -r df51aa5a4270 -r c56469bd12cb patches/copy_memory.patch --- a/patches/copy_memory.patch Tue Jul 23 00:18:28 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -diff --git a/src/share/classes/sun/misc/Unsafe.java b/src/share/classes/sun/misc/Unsafe.java ---- openjdk/jdk/src/share/classes/sun/misc/Unsafe.java -+++ openjdk/jdk/src/share/classes/sun/misc/Unsafe.java -@@ -504,9 +504,31 @@ - /** - * Sets all bytes in a given block of memory to a copy of another - * block. -+ * -+ *

This method determines each block's base address by means of two parameters, -+ * and so it provides (in effect) a double-register addressing mode, -+ * as discussed in {@link #getInt(Object,long)}. When the object reference is null, -+ * the offset supplies an absolute base address. -+ * -+ *

The transfers are in coherent (atomic) units of a size determined -+ * by the address and length parameters. If the effective addresses and -+ * length are all even modulo 8, the transfer takes place in 'long' units. -+ * If the effective addresses and length are (resp.) even modulo 4 or 2, -+ * the transfer takes place in units of 'int' or 'short'. - */ -- public native void copyMemory(long srcAddress, long destAddress, -+ public native void copyMemory(Object srcBase, long srcOffset, -+ Object destBase, long destOffset, - long bytes); -+ /** -+ * Sets all bytes in a given block of memory to a copy of another -+ * block. This provides a single-register addressing mode, -+ * as discussed in {@link #getInt(Object,long)}. -+ * -+ * Equivalent to copyMemory(null, srcAddress, null, destAddress, bytes). -+ */ -+ public void copyMemory(long srcAddress, long destAddress, long bytes) { -+ copyMemory(null, srcAddress, null, destAddress, bytes); -+ } - - /** - * Disposes of a block of native memory, as obtained from {@link diff -r df51aa5a4270 -r c56469bd12cb patches/ecj/jcp-importsources.patch --- a/patches/ecj/jcp-importsources.patch Tue Jul 23 00:18:28 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ ---- openjdk-ecj/jdk/make/org/jcp/Makefile.orig 2013-07-10 10:02:13.715336690 +0100 -+++ openjdk-ecj/jdk/make/org/jcp/Makefile 2013-07-10 10:02:55.359996584 +0100 -@@ -31,6 +31,7 @@ - PACKAGE = org.jcp From mrsanna1 at gmail.com Mon Aug 5 11:20:46 2013 From: mrsanna1 at gmail.com (Mauro Sanna) Date: Mon, 5 Aug 2013 20:20:46 +0200 Subject: bug in openjdk package for debian sid and ubuntu 13.04? Message-ID: Hello. I'm using java version "1.7.0_25" OpenJDK Runtime Environment (IcedTea 2.3.12) (7u25-2.3.12-2) OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) in ubuntu raring 13.04. As you see here http://jira.grails.org/browse/GRAILS-10183 it seems that openjdk has a bug that prevents grails to run. Oracle JDK seems to have solved this bug, why openJDK still not? -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130805/3965514d/attachment.html From aph at redhat.com Mon Aug 5 11:49:13 2013 From: aph at redhat.com (Andrew Haley) Date: Mon, 05 Aug 2013 19:49:13 +0100 Subject: bug in openjdk package for debian sid and ubuntu 13.04? In-Reply-To: References: Message-ID: <51FFF3A9.7030408@redhat.com> On 08/05/2013 07:20 PM, Mauro Sanna wrote: > I'm using > java version "1.7.0_25" > OpenJDK Runtime Environment (IcedTea 2.3.12) (7u25-2.3.12-2) > OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) > > in ubuntu raring 13.04. > > As you see here http://jira.grails.org/browse/GRAILS-10183 it seems that > openjdk has a bug that prevents grails to run. > Oracle JDK seems to have solved this bug, why openJDK still not? Probably because no-one understands what the cause of the bug might be. Andrew. From mrsanna1 at gmail.com Mon Aug 5 12:51:09 2013 From: mrsanna1 at gmail.com (Mauro Sanna) Date: Mon, 5 Aug 2013 21:51:09 +0200 Subject: bug in openjdk package for debian sid and ubuntu 13.04? In-Reply-To: <51FFF3A9.7030408@redhat.com> References: <51FFF3A9.7030408@redhat.com> Message-ID: On 5 August 2013 20:49, Andrew Haley wrote: > On 08/05/2013 07:20 PM, Mauro Sanna wrote: > > > I'm using > > java version "1.7.0_25" > > OpenJDK Runtime Environment (IcedTea 2.3.12) (7u25-2.3.12-2) > > OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) > > > > in ubuntu raring 13.04. > > > > As you see here http://jira.grails.org/browse/GRAILS-10183 it seems that > > openjdk has a bug that prevents grails to run. > > Oracle JDK seems to have solved this bug, why openJDK still not? > > Probably because no-one understands what the cause of the bug might be. > Is seems that oracle jdk has solved the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130805/d0bc16eb/attachment.html From gnu.andrew at redhat.com Mon Aug 5 13:11:19 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Mon, 5 Aug 2013 16:11:19 -0400 (EDT) Subject: bug in openjdk package for debian sid and ubuntu 13.04? In-Reply-To: References: Message-ID: <1442967542.12784332.1375733479119.JavaMail.root@redhat.com> ----- Original Message ----- > Hello. > I'm using > java version "1.7.0_25" > OpenJDK Runtime Environment (IcedTea 2.3.12) (7u25-2.3.12-2) > OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) > > in ubuntu raring 13.04. > > As you see here http://jira.grails.org/browse/GRAILS-10183 it seems that > openjdk has a bug that prevents grails to run. > Oracle JDK seems to have solved this bug, why openJDK still not? > Ask Oracle. They clearly haven't published all their patches to OpenJDK. -- 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 mrsanna1 at gmail.com Mon Aug 5 13:18:20 2013 From: mrsanna1 at gmail.com (Mauro Sanna) Date: Mon, 5 Aug 2013 22:18:20 +0200 Subject: bug in openjdk package for debian sid and ubuntu 13.04? In-Reply-To: <1442967542.12784332.1375733479119.JavaMail.root@redhat.com> References: <1442967542.12784332.1375733479119.JavaMail.root@redhat.com> Message-ID: On 5 August 2013 22:11, Andrew Hughes wrote: > > > ----- Original Message ----- > > Hello. > > I'm using > > java version "1.7.0_25" > > OpenJDK Runtime Environment (IcedTea 2.3.12) (7u25-2.3.12-2) > > OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) > > > > in ubuntu raring 13.04. > > > > As you see here http://jira.grails.org/browse/GRAILS-10183 it seems that > > openjdk has a bug that prevents grails to run. > > Oracle JDK seems to have solved this bug, why openJDK still not? > > > > Ask Oracle. They clearly haven't published all their patches to OpenJDK. > I'm only saying that it seems that there is a problem using openjdk and that problem there isnt't using oracle jdk. Applying http://www.oleastre.be/export/springloaded-1.1.3.jar to grails seems solve the problem. I'm not an expert to identify the problem, I'm only reporting it. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130805/bd394d75/attachment.html From gnu.andrew at redhat.com Mon Aug 5 13:40:49 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Mon, 5 Aug 2013 16:40:49 -0400 (EDT) Subject: bug in openjdk package for debian sid and ubuntu 13.04? In-Reply-To: References: <1442967542.12784332.1375733479119.JavaMail.root@redhat.com> Message-ID: <1519037368.12793580.1375735249946.JavaMail.root@redhat.com> ----- Original Message ----- > On 5 August 2013 22:11, Andrew Hughes wrote: > > > > > > > ----- Original Message ----- > > > Hello. > > > I'm using > > > java version "1.7.0_25" > > > OpenJDK Runtime Environment (IcedTea 2.3.12) (7u25-2.3.12-2) > > > OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) > > > > > > in ubuntu raring 13.04. > > > > > > As you see here http://jira.grails.org/browse/GRAILS-10183 it seems that > > > openjdk has a bug that prevents grails to run. > > > Oracle JDK seems to have solved this bug, why openJDK still not? > > > > > > > Ask Oracle. They clearly haven't published all their patches to OpenJDK. > > > > I'm only saying that it seems that there is a problem using openjdk and > that problem there isnt't using oracle jdk. > Applying http://www.oleastre.be/export/springloaded-1.1.3.jar to grails > seems solve the problem. > I'm not an expert to identify the problem, I'm only reporting it. > Yes, but you need to report it to Oracle as they handle OpenJDK releases. It's also probably worth reporting to your distro provider and asking them to use a newer release of IcedTea (2.4.1). -- 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 Aug 5 13:58:49 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 05 Aug 2013 20:58:49 +0000 Subject: [Bug 1492] icedtea-web does not work with openjdk-7.25.15 on FreeBSD 9.1-STABLE In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1492 Richard changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |rullger at gmail.com --- Comment #5 from Richard --- While the patch applied to the Arch package icedtea-web-java7 1.4-2 fixes the NullPointerException error, a further error is present when installed with openjdk packages 7.u40_2.4.1-1 and 7.u40_2.4.1-2. The errors occur when running the ProRealTime charting software and appear as a dialogue window with the title 'Calculation error' and message 'Error in the indicator: Moving average. Null'. In this case the error is with a moving average, but the error occurs for all indicators added to a chart. The errors can appear for new indicators being added and also for existing indicators that have been saved with a chart. The errors do not always appear immediately. Once an error has been generated, that particular indicator disappears from the chart. The software is run from a jnlp file downloaded from an IG Index account. When run from the CLI no errors are output. The software can also be run from the ProRealTime website with free registration. The last versions of Arch packages that work without any errors are: jdk7-openjdk 7.u40_2.4.0-1 jre7-openjdk 7.u40_2.4.0-1 jre7-openjdk-headless 7.u40_2.4.0-1 icedtea-web-java7 1.4-1 Please let me know if there is any further information I can provide. -- 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/20130805/ef7979dd/attachment.html From aph at redhat.com Mon Aug 5 13:01:40 2013 From: aph at redhat.com (Andrew Haley) Date: Mon, 05 Aug 2013 21:01:40 +0100 Subject: bug in openjdk package for debian sid and ubuntu 13.04? In-Reply-To: References: <51FFF3A9.7030408@redhat.com> Message-ID: <520004A4.2010703@redhat.com> On 08/05/2013 08:51 PM, Mauro Sanna wrote: > On 5 August 2013 20:49, Andrew Haley wrote: > >> On 08/05/2013 07:20 PM, Mauro Sanna wrote: >> >>> I'm using >>> java version "1.7.0_25" >>> OpenJDK Runtime Environment (IcedTea 2.3.12) (7u25-2.3.12-2) >>> OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) >>> >>> in ubuntu raring 13.04. >>> >>> As you see here http://jira.grails.org/browse/GRAILS-10183 it seems that >>> openjdk has a bug that prevents grails to run. >>> Oracle JDK seems to have solved this bug, why openJDK still not? >> >> Probably because no-one understands what the cause of the bug might be. > > Is seems that oracle jdk has solved the bug. Well, yes. But what is the bug? Have you investigated it? You have to do your part too. Andrew. From bugzilla-daemon at icedtea.classpath.org Tue Aug 6 03:02:17 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 06 Aug 2013 10:02:17 +0000 Subject: [Bug 1515] New: An unecessary net.sourceforge.jnlp.LaunchException is reported when clicking on Cancel Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1515 Bug ID: 1515 Summary: An unecessary net.sourceforge.jnlp.LaunchException is reported when clicking on Cancel 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: mvyskocil at suse.cz CC: unassigned at icedtea.classpath.org When visiting http://www.java-gaming.de/javaspiel-ufoattack.htm a security dialog "An unasigned Java application wants to run" pop ups and clicking on "Cancel" raises a window with a following trace, which is not relevant in a case user refused to run the app. IcedTea-Web Plugin version: 1.4 (suse-0.10.1-i386) Fri Aug 02 13:47:39 CEST 2013 net.sourceforge.jnlp.LaunchException: Fatal: Initialization Error: Could not initialize applet. For more information click "more information button". at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:789) at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:717) at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:969) Caused by: net.sourceforge.jnlp.LaunchException: Fatal: Application Error: The applet was unsigned. The applet was unsigned, and was not trusted. at net.sourceforge.jnlp.security.appletextendedsecurity.UnsignedAppletTrustConfirmation.checkUnsignedWithUserIfRequired(UnsignedAppletTrustConfirmation.java:204) at net.sourceforge.jnlp.runtime.JNLPClassLoader.createInstance(JNLPClassLoader.java:388) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:444) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:420) at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:755) ... 2 more Chain: 1) at Fri Aug 02 13:47:32 CEST 2013 net.sourceforge.jnlp.LaunchException: Fatal: Application Error: The applet was unsigned. The applet was unsigned, and was not trusted. at net.sourceforge.jnlp.security.appletextendedsecurity.UnsignedAppletTrustConfirmation.checkUnsignedWithUserIfRequired(UnsignedAppletTrustConfirmation.java:204) at net.sourceforge.jnlp.runtime.JNLPClassLoader.createInstance(JNLPClassLoader.java:388) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:444) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:420) at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:755) at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:717) at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:969) 2) at Fri Aug 02 13:47:32 CEST 2013 net.sourceforge.jnlp.LaunchException: Fatal: Initialization Error: Could not initialize applet. For more information click "more information button". at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:789) at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:717) at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:969) Caused by: net.sourceforge.jnlp.LaunchException: Fatal: Application Error: The applet was unsigned. The applet was unsigned, and was not trusted. at net.sourceforge.jnlp.security.appletextendedsecurity.UnsignedAppletTrustConfirmation.checkUnsignedWithUserIfRequired(UnsignedAppletTrustConfirmation.java:204) at net.sourceforge.jnlp.runtime.JNLPClassLoader.createInstance(JNLPClassLoader.java:388) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:444) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:420) at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:755) ... 2 more -- 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/20130806/cdb0ea10/attachment.html From andrew at icedtea.classpath.org Tue Aug 6 03:40:12 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 06 Aug 2013 10:40:12 +0000 Subject: /hg/release/icedtea7-forest-2.3/jdk: 2 new changesets Message-ID: changeset 6ae667b931d5 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=6ae667b931d5 author: mchung date: Tue Jun 25 16:12:47 2013 -0700 8016814: sun.reflect.Reflection.getCallerClass returns the frame off by 1 Reviewed-by: jrose, alanb, chegar, twisti changeset 64c0a3fb78cd in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=64c0a3fb78cd author: mchung date: Tue Jul 02 13:23:35 2013 -0700 8014925: Disable sun.reflect.Reflection.getCallerClass(int) with a temporary switch to re-enable it Reviewed-by: jrose, alanb, chegar, twisti diffstat: src/share/classes/sun/misc/VM.java | 20 ++++ src/share/classes/sun/reflect/Reflection.java | 10 ++- test/sun/reflect/GetCallerClass.java | 105 ++++++++++++++++++++++++++ 3 files changed, 134 insertions(+), 1 deletions(-) diffs (166 lines): diff -r 8c388c89a45c -r 64c0a3fb78cd src/share/classes/sun/misc/VM.java --- a/src/share/classes/sun/misc/VM.java Thu Jul 25 20:48:39 2013 +0100 +++ b/src/share/classes/sun/misc/VM.java Tue Jul 02 13:23:35 2013 -0700 @@ -216,6 +216,16 @@ return allowArraySyntax; } + private static boolean allowGetCallerClass = false; + + // Reflection.getCallerClass(int) is disabled by default. + // It can be enabled by setting the system property + // "jdk.reflect.allowGetCallerClass" and also used by + // logging stack walk of a resource bundle if it is turned on. + public static boolean allowGetCallerClass() { + return allowGetCallerClass; + } + /** * Returns the system property of the specified key saved at * system initialization time. This method should only be used @@ -280,6 +290,16 @@ ? defaultAllowArraySyntax : Boolean.parseBoolean(s)); + // Reflection.getCallerClass(int) is disabled by default. + // It can be enabled by setting the system property + // "jdk.reflect.allowGetCallerClass" and also used by + // logging stack walk of a resource bundle if it is turned on. + s = props.getProperty("jdk.reflect.allowGetCallerClass"); + allowGetCallerClass = (s != null + ? (s.isEmpty() || Boolean.parseBoolean(s)) + : false) || + Boolean.valueOf(props.getProperty("jdk.logging.allowStackWalkSearch")); + // Remove other private system properties // used by java.lang.Integer.IntegerCache props.remove("java.lang.Integer.IntegerCache.high"); diff -r 8c388c89a45c -r 64c0a3fb78cd src/share/classes/sun/reflect/Reflection.java --- a/src/share/classes/sun/reflect/Reflection.java Thu Jul 25 20:48:39 2013 +0100 +++ b/src/share/classes/sun/reflect/Reflection.java Tue Jul 02 13:23:35 2013 -0700 @@ -65,7 +65,15 @@ @Deprecated @CallerSensitive public static Class getCallerClass(int depth) { - return getCallerClass0(depth); + if (sun.misc.VM.allowGetCallerClass()) { + return getCallerClass0(depth+1); + } + throw new UnsupportedOperationException("This method is in the sun.* " + + "namespace so it is not a supported, public interface. " + + "The 7u40 release notes describe a temporary mechanism " + + "to reenable the historical functionality of this method. " + + "Update code to function properly and this method will be " + + "removed without further warning in a subsequent 7 update release."); } // If the VM enforces getting caller class with @CallerSensitive, diff -r 8c388c89a45c -r 64c0a3fb78cd test/sun/reflect/GetCallerClass.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/sun/reflect/GetCallerClass.java Tue Jul 02 13:23:35 2013 -0700 @@ -0,0 +1,105 @@ +/* + * Copyright (c) 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. + * + * 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. + */ + +/* + * @test + * @bug 8016814 8014925 + * @summary Test sun.reflect.Reflection.getCallerClass(int) disabled by default + * @compile -XDignore.symbol.file GetCallerClass.java + * @run main/othervm GetCallerClass + * @run main/othervm -Djdk.reflect.allowGetCallerClass GetCallerClass + * @run main/othervm -Djdk.reflect.allowGetCallerClass=true GetCallerClass + * @run main/othervm -Djdk.reflect.allowGetCallerClass=false GetCallerClass + */ + +public class GetCallerClass { + public static void main(String[] args) throws Exception { + String s = System.getProperty("jdk.reflect.allowGetCallerClass"); + boolean allowed; + if (s == null || s.equals("false")) { + allowed = false; + } else if (s.equals("") || s.equals("true")) { + allowed = true; + } else { + throw new RuntimeException("Unsupported test setting"); + } + + try { + Class c = Test.test(); + if (!allowed) { + throw new RuntimeException("Reflection.getCallerClass should not be allowed"); + } + Class caller = Test.caller(); + if (c != GetCallerClass.class || caller != c) { + throw new RuntimeException("Incorrect caller: " + c); + } + Test.selfTest(); + } catch (UnsupportedOperationException e) { + if (allowed) throw e; + } + } + + @sun.reflect.CallerSensitive + public Class getCallerClass() { + // 0: Reflection 1: getCallerClass 2: Test.test 3: main + return sun.reflect.Reflection.getCallerClass(3); + } + + static class Test { + // Returns the caller of this method + public static Class test() { + return new GetCallerClass().getCallerClass(); + } + @sun.reflect.CallerSensitive + public static Class caller() { + return sun.reflect.Reflection.getCallerClass(); + } + @sun.reflect.CallerSensitive + public static void selfTest() { + // 0: Reflection 1: Test.selfTest + Class c = sun.reflect.Reflection.getCallerClass(1); + if (c != Test.class || caller() != c) { + throw new RuntimeException("Incorrect caller: " + c); + } + Inner1.deep(); + } + + static class Inner1 { + static void deep() { + deeper(); + } + static void deeper() { + Inner2.deepest(); + } + static class Inner2 { + static void deepest() { + // 0: Reflection 1: deepest 2: deeper 3: deep 4: Test.selfTest + Class c = sun.reflect.Reflection.getCallerClass(4); + if (c != Test.class) { + throw new RuntimeException("Incorrect caller: " + c); + } + } + } + } + } +} From bugzilla-daemon at icedtea.classpath.org Tue Aug 6 06:31:30 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 06 Aug 2013 13:31:30 +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 --- Comment #5 from Aleksi Kallio --- As mentioned, there are two different problems that I have encountered: AccessControlException and NoSuchMethodError. I am suspecting that both could be related to SecurityManager, but of course they might not. I have now changed the example to reproduce that NoSuchMethodError, see below. My code is not trying to write to root of the filesystem, log4j error reporting is just a bit confusing. It gives only the last part of the path. I have verified this with debug, the path is correct. So the AccessControlException seems incorrect. And it goes away if the same JAR is copied locally and JNLP modified accordingly. $ javaws http://chipster.csc.fi/chipster-broken.jnlp trying to call PropertyConfigurator.configure java.lang.NoSuchMethodError: org.apache.log4j.PropertyConfigurator.configure(Ljava/io/InputStream;)V at fi.csc.microarray.config.DirectoryLayout.(DirectoryLayout.java:143) at fi.csc.microarray.config.DirectoryLayout.initialiseClientLayout(DirectoryLayout.java:113) at fi.csc.microarray.client.SwingClientApplication.start(SwingClientApplication.java:1344) at fi.csc.microarray.MicroarrayMain.main(MicroarrayMain.java:165) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at net.sourceforge.jnlp.Launcher.launchApplication(Launcher.java:594) at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:889) -- 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/20130806/de809ce4/attachment.html From andrew at icedtea.classpath.org Tue Aug 6 06:43:04 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 06 Aug 2013 13:43:04 +0000 Subject: /hg/release/icedtea7-2.3: Bring in 8014925 and 8016814 from forest. Message-ID: changeset 9f0405f155d9 in /hg/release/icedtea7-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=9f0405f155d9 author: Andrew John Hughes date: Tue Aug 06 14:42:42 2013 +0100 Bring in 8014925 and 8016814 from forest. 2013-08-06 Andrew John Hughes * Makefile.am: (CORBA_CHANGESET): Update to IcedTea 2.3 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: Add changes from forest. * hotspot.map: Update default to IcedTea 2.3 HotSpot HEAD. diffstat: ChangeLog | 19 +++++++++++++++++++ Makefile.am | 24 ++++++++++++------------ NEWS | 6 ++++++ hotspot.map | 2 +- 4 files changed, 38 insertions(+), 13 deletions(-) diffs (84 lines): diff -r 63207151eedc -r 9f0405f155d9 ChangeLog --- a/ChangeLog Thu Jan 17 00:39:24 2013 +0000 +++ b/ChangeLog Tue Aug 06 14:42:42 2013 +0100 @@ -1,3 +1,22 @@ +2013-08-06 Andrew John Hughes + + * Makefile.am: + (CORBA_CHANGESET): Update to IcedTea 2.3 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: Add changes from forest. + * hotspot.map: Update default to IcedTea 2.3 HotSpot + HEAD. + 2013-01-16 Andrew John Hughes * acinclude.m4: diff -r 63207151eedc -r 9f0405f155d9 Makefile.am --- a/Makefile.am Thu Jan 17 00:39:24 2013 +0000 +++ b/Makefile.am Tue Aug 06 14:42:42 2013 +0100 @@ -4,19 +4,19 @@ JDK_UPDATE_VERSION = 25 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = ea108ff3be9a -JAXP_CHANGESET = 332f0234a53e -JAXWS_CHANGESET = fdc4ad9f30c6 -JDK_CHANGESET = 4a0cf2c05cc6 -LANGTOOLS_CHANGESET = 6c9b532f4281 -OPENJDK_CHANGESET = e62743867f54 +CORBA_CHANGESET = 7f6068c72726 +JAXP_CHANGESET = 5393f32bae76 +JAXWS_CHANGESET = ab28ab1e1484 +JDK_CHANGESET = 64c0a3fb78cd +LANGTOOLS_CHANGESET = 7bd72dadca4a +OPENJDK_CHANGESET = 8f7b2e697b59 -CORBA_SHA256SUM = 818f5613b218fe2a2036e6c65622b970839986c0c1ca95563f911b379a52b765 -JAXP_SHA256SUM = a3f99615331cdc3d5e38e7169bb4b03dc43ede25c73834114240b8768207b9dc -JAXWS_SHA256SUM = b149c1fab323a586eae9b4459ccd929f0db8b35769e42dd7f4fbadc48b803dab -JDK_SHA256SUM = badbbf50c820325ffe592762a2eff3414df71e286460b75716a2100d7f6f2aa0 -LANGTOOLS_SHA256SUM = b9e2e3c97393f566b0c4dc2b0ca826bfb3b3841f5522a850b82d1ff23745839b -OPENJDK_SHA256SUM = 7bc64e2285b5bfefeb6a3900729c58beb2f04f2c57184a4fe48341c5087c3f61 +CORBA_SHA256SUM = 2ce092d00be6c04fb6f3bdba8d9ffb0efcf8da339a3be3d124603faf61e62ba5 +JAXP_SHA256SUM = 1017d087c3c6b89c1b20bcf7802d384db492cfc7e5ba998e11124330ea8623f1 +JAXWS_SHA256SUM = b9bb3c916abb5dfe80c48c4918a2e52ee488404db10927b7c3a85b40f7215225 +JDK_SHA256SUM = 221a2961a004d45b1cfb5ce7d08225dca46a8bef1930f26fb1cf10c52a29e9d5 +LANGTOOLS_SHA256SUM = 160b1d61c22c5d4d6bc63c80acc7926791310b0ee8827ba5e15c5b36123dc012 +OPENJDK_SHA256SUM = 2b12839074a86cafbe78b5fc8a8c36cc9e8f3d497079a9c45a3c0bf9fe8a8644 CACAO_VERSION = a567bcb7f589 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 diff -r 63207151eedc -r 9f0405f155d9 NEWS --- a/NEWS Thu Jan 17 00:39:24 2013 +0000 +++ b/NEWS Tue Aug 06 14:42:42 2013 +0100 @@ -12,6 +12,12 @@ New in release 2.3.13 (2013-XX-XX): +* Backports + - S8014925: Disable sun.reflect.Reflection.getCallerClass(int) with a temporary switch to re-enable it + - S8016814: sun.reflect.Reflection.getCallerClass returns the frame off by 1 +* Bug fixes + - Enable Zero when there is no HotSpot JIT and an alternate VM has not been explictly enabled. + New in release 2.3.12 (2013-07-26): * ARM Port diff -r 63207151eedc -r 9f0405f155d9 hotspot.map --- a/hotspot.map Thu Jan 17 00:39:24 2013 +0000 +++ b/hotspot.map Tue Aug 06 14:42:42 2013 +0100 @@ -1,2 +1,2 @@ # version url changeset sha256sum -default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 37b254871acb 60268f9d792575ec26b8796753246aca70282937327c2fa855b3f0010638605e +default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot a6502a8a6b31 5c73225a03c33109a4cbea6274bf5af634a14feddb80ed7471af0c1445c93204 From dalibor.topic at oracle.com Tue Aug 6 07:08:37 2013 From: dalibor.topic at oracle.com (Dalibor Topic) Date: Tue, 06 Aug 2013 16:08:37 +0200 Subject: /hg/release/icedtea7-2.3: Bring in 8014925 and 8016814 from forest. In-Reply-To: References: Message-ID: <52010365.1070009@oracle.com> On 8/6/13 3:43 PM, andrew at icedtea.classpath.org wrote: > +* Backports > + - S8014925: Disable sun.reflect.Reflection.getCallerClass(int) with a temporary switch to re-enable it > + - S8016814: sun.reflect.Reflection.getCallerClass returns the frame off by 1 Like I said on jdk7u-dev already, making a release with 8014925 but without 8021946 may not be such a good idea. cheers, dalibor topic -- Oracle Dalibor Topic | Principal Product Manager Phone: +494089091214 | Mobile: +491737185961 Oracle Java Platform Group ORACLE Deutschland B.V. & Co. KG | K?hneh?fe 5 | 22761 Hamburg ORACLE Deutschland B.V. & Co. KG Hauptverwaltung: Riesstr. 25, D-80992 M?nchen Registergericht: Amtsgericht M?nchen, HRA 95603 Gesch?ftsf?hrer: J?rgen Kunz Komplement?rin: ORACLE Deutschland Verwaltung B.V. Hertogswetering 163/167, 3543 AS Utrecht, Niederlande Handelsregister der Handelskammer Midden-Niederlande, Nr. 30143697 Gesch?ftsf?hrer: Alexander van der Ven, Astrid Kepper, Val Maher Green Oracle Oracle is committed to developing practices and products that help protect the environment From andrew at icedtea.classpath.org Tue Aug 6 08:36:52 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 06 Aug 2013 15:36:52 +0000 Subject: /hg/icedtea6-hg: Remove upstreamed CORBA patches from the 2013/0... Message-ID: changeset 7307b283e366 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=7307b283e366 author: Andrew John Hughes date: Tue Aug 06 16:34:58 2013 +0100 Remove upstreamed CORBA patches from the 2013/06/18 erratum. 2013-08-06 Andrew John Hughes * patches/security/20130618/8000642-better_transportation_handling.patch, * patches/security/20130618/8001032-restrict_object_access-corba.patch: Removed. * Makefile.am: (ICEDTEA_PATCHES): Remove upstreamed patches. diffstat: ChangeLog | 8 + Makefile.am | 2 - patches/security/20130618/8000642-better_transportation_handling.patch | 808 ---------- patches/security/20130618/8001032-restrict_object_access-corba.patch | 544 ------ 4 files changed, 8 insertions(+), 1354 deletions(-) diffs (truncated from 1388 to 500 lines): diff -r c56469bd12cb -r 7307b283e366 ChangeLog --- a/ChangeLog Mon Aug 05 12:14:35 2013 +0100 +++ b/ChangeLog Tue Aug 06 16:34:58 2013 +0100 @@ -1,3 +1,11 @@ +2013-08-06 Andrew John Hughes + + * patches/security/20130618/8000642-better_transportation_handling.patch, + * patches/security/20130618/8001032-restrict_object_access-corba.patch: + Removed. + * Makefile.am: + (ICEDTEA_PATCHES): Remove upstreamed patches. + 2013-08-02 Andrew John Hughes * hotspot.map: Bring in hs23 changes to ARM32 diff -r c56469bd12cb -r 7307b283e366 Makefile.am --- a/Makefile.am Mon Aug 05 12:14:35 2013 +0100 +++ b/Makefile.am Tue Aug 06 16:34:58 2013 +0100 @@ -282,9 +282,7 @@ SECURITY_PATCHES = \ patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \ - patches/security/20130618/8001032-restrict_object_access-corba.patch \ patches/security/20130618/handle_npe.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 \ diff -r c56469bd12cb -r 7307b283e366 patches/security/20130618/8000642-better_transportation_handling.patch --- a/patches/security/20130618/8000642-better_transportation_handling.patch Mon Aug 05 12:14:35 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,808 +0,0 @@ -# HG changeset patch -# User Severin Gehwolf -# Date 1371488468 -7200 -# Node ID bec83758f55670cdb7865e8103f8100dc6f4f0fb -# Parent 1260b4e54a2373aac77afdcdeb3f7ac8e6319c9e -8000642: Better handling of objects for transportation -Summary: Also reviewed by alexander.fomin -Reviewed-by: alanb, mchung, skoivu - -diff --git a/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java b/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java ---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java -+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java -@@ -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,12 @@ - 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() { -+ public AnyOutputStream run() { -+ return new AnyOutputStream(finalorb); -+ } -+ }); - } - - /** -diff --git a/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java b/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java ---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java -+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java -@@ -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 --git a/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java b/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java ---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java -+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java -@@ -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 --git a/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java b/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java ---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java -+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java -@@ -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 --git a/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java b/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java ---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java -+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java -@@ -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 --git a/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java b/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java ---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java -+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java -@@ -655,7 +655,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(); -@@ -691,8 +692,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 --git a/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java b/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java ---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java -+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java -@@ -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 --git a/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java b/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java ---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java -+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java -@@ -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 --git a/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java b/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java ---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java -+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java -@@ -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 --git a/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java b/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java ---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java -+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java -@@ -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 --git a/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java b/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java ---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java -+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java -@@ -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 --git a/src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java b/src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java ---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java -+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java -@@ -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 --git a/src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java b/src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java ---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java -+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java -@@ -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 --git a/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java b/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java ---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java -+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java -@@ -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 --git a/src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java b/src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java ---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java -+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java -@@ -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 --git a/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java b/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java ---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java -+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java -@@ -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 --git a/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java b/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java ---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java -+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java -@@ -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 --git a/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java b/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java ---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java -+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java -@@ -564,7 +564,7 @@ - public synchronized org.omg.CORBA.portable.OutputStream create_output_stream() - { - checkShutdownState(); -- return new EncapsOutputStream(this); -+ return sun.corba.OutputStreamFactory.newEncapsOutputStream(this); - } - - /** -diff --git a/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java b/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java ---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java -+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2006, 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 -@@ -149,7 +149,7 @@ - } - - public OutputStream create_output_stream() { -- return new EncapsOutputStream(this); -+ return sun.corba.OutputStreamFactory.newEncapsOutputStream(this); - } - - public TypeCode create_struct_tc(String id, -diff --git a/src/share/classes/com/sun/corba/se/impl/protocol/CorbaMessageMediatorImpl.java b/src/share/classes/com/sun/corba/se/impl/protocol/CorbaMessageMediatorImpl.java ---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaMessageMediatorImpl.java -+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaMessageMediatorImpl.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2001, 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 -@@ -1792,8 +1792,7 @@ - - if (msg.getGIOPVersion().lessThan(GIOPVersion.V1_2)) { - // locate msgs 1.0 & 1.1 :=> grow, -- // REVISIT - build from factory -- outputObject = new CDROutputObject( -+ outputObject = sun.corba.OutputStreamFactory.newCDROutputObject( - (ORB) messageMediator.getBroker(), - this, - GIOPVersion.V1_0, -@@ -1802,8 +1801,7 @@ - ORBConstants.STREAM_FORMAT_VERSION_1); - } else { - // 1.2 :=> stream -- // REVISIT - build from factory -- outputObject = new CDROutputObject( -+ outputObject = sun.corba.OutputStreamFactory.newCDROutputObject( - (ORB) messageMediator.getBroker(), - messageMediator, - reply, -@@ -1957,7 +1955,8 @@ - ReplyMessage.NEEDS_ADDRESSING_MODE, - null, null); - // REVISIT: via acceptor factory. -- CDROutputObject outputObject = new CDROutputObject( -+ CDROutputObject outputObject = -+ sun.corba.OutputStreamFactory.newCDROutputObject( - (ORB)messageMediator.getBroker(), - this, - messageMediator.getGIOPVersion(), -@@ -2124,7 +2123,7 @@ - ex.printStackTrace(pw); - pw.flush(); // NOTE: you must flush or baos will be empty. - EncapsOutputStream encapsOutputStream = -- new EncapsOutputStream((ORB)mediator.getBroker()); -+ sun.corba.OutputStreamFactory.newEncapsOutputStream((ORB)mediator.getBroker()); - encapsOutputStream.putEndian(); - encapsOutputStream.write_wstring(baos.toString()); - UnknownServiceContext serviceContext = -@@ -2201,12 +2200,11 @@ - // REVISIT = do not use null. - // - if (messageMediator.getConnection() == null) { -- // REVISIT - needs factory - replyOutputObject = From bugzilla-daemon at icedtea.classpath.org Tue Aug 6 11:29:00 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 06 Aug 2013 18:29:00 +0000 Subject: [Bug 1513] Applet fails to load In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1513 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|dbhole 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/20130806/0ee66401/attachment.html From adomurad at redhat.com Tue Aug 6 12:36:13 2013 From: adomurad at redhat.com (Adam Domurad) Date: Tue, 06 Aug 2013 15:36:13 -0400 Subject: [rfc][icedtea-web] Fix NPE on Applet launch due to missing AppletStub Message-ID: <5201502D.9060707@redhat.com> Hi all. There is a problem that sometimes a showStatus() on an applet results in an NPE on applet load, due to a missing AppletStub. This patch sets it to NetxPanel (the container) as soon as possible. This helps stabilize a test case I'm working on. Cheers, -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: fix-show-status-null.patch Type: text/x-patch Size: 1242 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130806/3b793005/fix-show-status-null.patch From adomurad at redhat.com Tue Aug 6 12:51:08 2013 From: adomurad at redhat.com (Adam Domurad) Date: Tue, 06 Aug 2013 15:51:08 -0400 Subject: [rfc][icedtea-web] PR1271, Handle 'javascript:' urls, with tests Message-ID: <520153AC.1010000@redhat.com> This fixes this bug http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1271 Note the test case sometimes fails if the fix from '[rfc][icedtea-web] Fix NPE on Applet launch due to missing AppletStub' is not applied. ChangeLog: 2013-XX-XX Adam Domurad * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Evaluate javascript when it shows up in a 'showDocument' call. * plugin/icedteanp/java/sun/applet/PluginMain.java: Install arbitrary 'javascript:' protocol handler. * tests/rproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.html: Tests if javascript is run from a test applet using showDocument. * tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.js: Same. * tests/reproducers/simple/JavascriptURLProtocol/srcs/JavascriptProtocol.java: Same. * tests/reproducers/simple/JavascriptURLProtocol/testcases/JavascriptProtocolTest.java: Same. Cheers, -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: JavascriptURLProtocol.patch Type: text/x-patch Size: 11220 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130806/206e6100/JavascriptURLProtocol.patch From gitne at excite.co.jp Tue Aug 6 14:12:01 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Wed, 7 Aug 2013 06:12:01 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtyZmNdW2ljZWR0ZWEtd2ViXSBGaXggTlBFIG9uIEFwcGxldCBsYXVuY2ggZHVlIHRvIG1pc3NpbmcgQXBwbGV0U3R1Yg==?= Message-ID: <201308062112.r76LC1ae023806@mail-web01.excite.co.jp> Hello there! > @@ -716,6 +717,7 @@ public class Launcher { > String appletName = file.getApplet().getMainClass(); > Class appletClass = loader.loadClass(appletName); > Applet applet = (Applet) appletClass.newInstance(); > + applet.setStub((AppletStub)cont); You may want to catch a possible SecurityException in case the AppletStub has already been set. Malicious code may attach to the JVM process executing the Launcher and try either to replace the AppletStub or render the Launcher effectively inoperable by intentionally causing an unhandled SecurityException every time a specific applet or any applet is run and hence terminate the attacked JVM. Regards, Jacob > // Finish setting up appletInstance. > appletInstance.setApplet(applet); > appletInstance.getAppletEnvironment().setApplet(applet); "Adam Domurad" wrote: > Hi all. There is a problem that sometimes a showStatus() on an applet > results in an NPE on applet load, due to a missing AppletStub. This > patch sets it to NetxPanel (the container) as soon as possible. > > This helps stabilize a test case I'm working on. > > Cheers, > -Adam From gitne at excite.co.jp Tue Aug 6 14:26:28 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Wed, 7 Aug 2013 06:26:28 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtyZmNdW2ljZWR0ZWEtd2ViXSBQUjEyNzEsIEhhbmRsZSAnamF2YXNjcmlwdDonIHVybHMsIHdpdGggdGVzdHM=?= Message-ID: <201308062126.r76LQS1v024270@mail-web01.excite.co.jp> Hello! My usual nit picks: > + static private void installDummyJavascriptProtocolHandler() { > + try { > + Field handlersField = URL.class.getDeclaredField("handlers"); > + handlersField.setAccessible(true); > + > + @SuppressWarnings("unchecked") > + Hashtable handlers = (Hashtable)handlersField.get(null); You can make the compiler happy by checking the return value with the instanceof operator. ;) > + > + // Place an arbitrary handler, we only need the URL construction to not error-out > + handlers.put("javascript", new sun.net.www.protocol.http.Handler()); > + } catch (Exception e) { Uhh ahh, there are good reasons not to do this :) > + PluginDebug.debug("Unable to install 'javascript:' URL protocol handler!"); > + } > + } Regards, Jacob "Adam Domurad" wrote: > This fixes this bug > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1271 > > Note the test case sometimes fails if the fix from '[rfc][icedtea-web] > Fix NPE on Applet launch due to missing AppletStub' is not applied. > > ChangeLog: > > 2013-XX-XX Adam Domurad > * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: > Evaluate > javascript when it shows up in a 'showDocument' call. > * plugin/icedteanp/java/sun/applet/PluginMain.java: Install > arbitrary > 'javascript:' protocol handler. > * > tests/rproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.html: > Tests if javascript is run from a test applet using showDocument. > * > tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.js: > Same. > * > tests/reproducers/simple/JavascriptURLProtocol/srcs/JavascriptProtocol.java: > Same. > * > tests/reproducers/simple/JavascriptURLProtocol/testcases/JavascriptProtocolTest.java: > Same. > > Cheers, > -Adam > > From andrew at icedtea.classpath.org Wed Aug 7 04:57:42 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 07 Aug 2013 11:57:42 +0000 Subject: /hg/icedtea6: 2 new changesets Message-ID: changeset 4b4d78563ff0 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4b4d78563ff0 author: Andrew John Hughes date: Tue Aug 06 15:07:45 2013 +0100 Add dependencies of 8013196 and remove SharedSecrets fragment of 8013196 which causes a TCK regression. 2013-08-05 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch, * patches/openjdk/6636370-appcontext_simplification.patch, * patches/openjdk/7196533-timezone_bottleneck.patch: Backport additional patches which relate to changes in 8013196. * patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch: Drop SharedSecrets changes which cause a TCK regression. changeset 8c5e1cbc7ce7 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8c5e1cbc7ce7 author: Andrew John Hughes date: Tue Aug 06 15:10:46 2013 +0100 Fix naming of patch. 2013-08-06 Andrew John Hughes * 8013196-TimeZone_getDefault_throws_exception.patch: Renamed to... * 8013196-timezone_getdefault_throws_exception.patch: ...this. * Makefile.am: (ICEDTEA_PATCHES): Fix name of patch. diffstat: ChangeLog | 20 + Makefile.am | 8 +- patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch | 24 + patches/openjdk/6636370-appcontext_simplification.patch | 178 ++++++++++ patches/openjdk/7196533-timezone_bottleneck.patch | 66 +++ patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch | 58 --- patches/openjdk/8013196-timezone_getdefault_throws_exception.patch | 39 ++ 7 files changed, 332 insertions(+), 61 deletions(-) diffs (437 lines): diff -r 868201fa37c4 -r 8c5e1cbc7ce7 ChangeLog --- a/ChangeLog Mon Aug 05 11:47:08 2013 +0100 +++ b/ChangeLog Tue Aug 06 15:10:46 2013 +0100 @@ -1,3 +1,23 @@ +2013-08-06 Andrew John Hughes + + * 8013196-TimeZone_getDefault_throws_exception.patch: + Renamed to... + * 8013196-timezone_getdefault_throws_exception.patch: + ...this. + * Makefile.am: + (ICEDTEA_PATCHES): Fix name of patch. + +2013-08-05 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patches. + * patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch, + * patches/openjdk/6636370-appcontext_simplification.patch, + * patches/openjdk/7196533-timezone_bottleneck.patch: + Backport additional patches which relate to changes in 8013196. + * patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch: + Drop SharedSecrets changes which cause a TCK regression. + 2013-08-02 Andrew John Hughes * hotspot.map: Bring in hs23 changes to ARM32 diff -r 868201fa37c4 -r 8c5e1cbc7ce7 Makefile.am --- a/Makefile.am Mon Aug 05 11:47:08 2013 +0100 +++ b/Makefile.am Tue Aug 06 15:10:46 2013 +0100 @@ -681,7 +681,7 @@ patches/openjdk/8012112-MlibOpsTest_fails.patch \ patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch \ patches/openjdk/8012933-appcontext_disposed_too_early.patch \ - patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch \ + patches/openjdk/8013196-timezone_getdefault_throws_exception.patch \ patches/openjdk/8014205-blank_swing_dialogs_windows.patch \ patches/openjdk/8014427-raster_regression.patch \ patches/openjdk/8014676-javadebugger_space_in_paths.patch \ @@ -714,8 +714,10 @@ patches/openjdk/7158483-tzdata2012c.patch \ patches/openjdk/7198570-tzdata2012f.patch \ patches/openjdk/8002225-tzdata2012i.patch \ - patches/openjdk/8009987-tzdata2013b.patch - + patches/openjdk/8009987-tzdata2013b.patch \ + patches/openjdk/7196533-timezone_bottleneck.patch \ + patches/openjdk/6636370-appcontext_simplification.patch \ + patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r 868201fa37c4 -r 8c5e1cbc7ce7 patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch Tue Aug 06 15:10:46 2013 +0100 @@ -0,0 +1,24 @@ +# HG changeset patch +# User son +# Date 1205416264 -10800 +# Thu Mar 13 16:51:04 2008 +0300 +# Node ID c9ee9428aea9baa8e32691db1e14744002c70def +# Parent bbd8e20d50523bbd89d10204e4f337a844f3cef1 +6636331: ConcurrentModificationException in AppContext code +Summary: Added synchronization to AppContext.getAppContexts() +Reviewed-by: art + +diff --git a/src/share/classes/sun/awt/AppContext.java b/src/share/classes/sun/awt/AppContext.java +--- openjdk/jdk/src/share/classes/sun/awt/AppContext.java ++++ openjdk/jdk/src/share/classes/sun/awt/AppContext.java +@@ -146,7 +146,9 @@ + * Returns a set containing all AppContexts. + */ + public static Set getAppContexts() { +- return new HashSet(threadGroup2appContext.values()); ++ synchronized (threadGroup2appContext) { ++ return new HashSet(threadGroup2appContext.values()); ++ } + } + + /* The main "system" AppContext, used by everything not otherwise diff -r 868201fa37c4 -r 8c5e1cbc7ce7 patches/openjdk/6636370-appcontext_simplification.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6636370-appcontext_simplification.patch Tue Aug 06 15:10:46 2013 +0100 @@ -0,0 +1,178 @@ +diff -Nru openjdk.orig/jdk/src/share/classes/sun/awt/AppContext.java openjdk/jdk/src/share/classes/sun/awt/AppContext.java +--- openjdk.orig/jdk/src/share/classes/sun/awt/AppContext.java 2013-08-05 16:49:37.120128300 +0100 ++++ openjdk/jdk/src/share/classes/sun/awt/AppContext.java 2013-08-05 17:02:51.304664462 +0100 +@@ -151,7 +151,7 @@ + contained in another AppContext. It is implicitly created for + standalone apps only (i.e. not applets) + */ +- private static AppContext mainAppContext = null; ++ private static volatile AppContext mainAppContext = null; + + /* + * The hash map associated with this AppContext. A private delegate +@@ -223,14 +223,15 @@ + threadGroup2appContext.put(threadGroup, this); + + this.contextClassLoader = +- (ClassLoader) AccessController.doPrivileged(new PrivilegedAction() { +- public Object run() { ++ AccessController.doPrivileged(new PrivilegedAction() { ++ public ClassLoader run() { + return Thread.currentThread().getContextClassLoader(); + } + }); + } + +- private static MostRecentThreadAppContext mostRecentThreadAppContext = null; ++ private static final ThreadLocal threadAppContext = ++ new ThreadLocal(); + + private final static void initMainAppContext() { + // On the main Thread, we get the ThreadGroup, make a corresponding +@@ -270,30 +271,18 @@ + return mainAppContext; + } + +- final Thread currentThread = Thread.currentThread(); ++ AppContext appContext = threadAppContext.get(); + +- AppContext appContext = null; +- +- // Note: this most recent Thread/AppContext caching is thread-hot. +- // A simple test using SwingSet found that 96.8% of lookups +- // were matched using the most recent Thread/AppContext. By +- // instantiating a simple MostRecentThreadAppContext object on +- // cache misses, the cache hits can be processed without +- // synchronization. +- +- MostRecentThreadAppContext recent = mostRecentThreadAppContext; +- if ((recent != null) && (recent.thread == currentThread)) { +- appContext = recent.appContext; // Cache hit +- } else { +- appContext = (AppContext)AccessController.doPrivileged( +- new PrivilegedAction() { +- public Object run() { +- // Get the current ThreadGroup, and look for it and its +- // parents in the hash from ThreadGroup to AppContext -- +- // it should be found, because we use createNewContext() +- // when new AppContext objects are created. +- ThreadGroup currentThreadGroup = currentThread.getThreadGroup(); +- ThreadGroup threadGroup = currentThreadGroup; ++ if (null == appContext) { ++ appContext = AccessController.doPrivileged(new PrivilegedAction() ++ { ++ public AppContext run() { ++ // Get the current ThreadGroup, and look for it and its ++ // parents in the hash from ThreadGroup to AppContext -- ++ // it should be found, because we use createNewContext() ++ // when new AppContext objects are created. ++ ThreadGroup currentThreadGroup = Thread.currentThread().getThreadGroup(); ++ ThreadGroup threadGroup = currentThreadGroup; + + // Special case: we implicitly create the main app context + // if no contexts have been created yet. This covers standalone apps +@@ -308,28 +297,29 @@ + } + } + +- AppContext context = threadGroup2appContext.get(threadGroup); +- while (context == null) { +- threadGroup = threadGroup.getParent(); +- if (threadGroup == null) { +- return null; ++ AppContext context = threadGroup2appContext.get(threadGroup); ++ while (context == null) { ++ threadGroup = threadGroup.getParent(); ++ if (threadGroup == null) { ++ return null; ++ } ++ context = threadGroup2appContext.get(threadGroup); ++ } ++ ++ // In case we did anything in the above while loop, we add ++ // all the intermediate ThreadGroups to threadGroup2appContext ++ // so we won't spin again. ++ for (ThreadGroup tg = currentThreadGroup; tg != threadGroup; tg = tg.getParent()) { ++ threadGroup2appContext.put(tg, context); ++ } ++ ++ // Now we're done, so we cache the latest key/value pair. ++ threadAppContext.set(context); ++ ++ ++ return context; + } +- context = threadGroup2appContext.get(threadGroup); +- } +- // In case we did anything in the above while loop, we add +- // all the intermediate ThreadGroups to threadGroup2appContext +- // so we won't spin again. +- for (ThreadGroup tg = currentThreadGroup; tg != threadGroup; tg = tg.getParent()) { +- threadGroup2appContext.put(tg, context); +- } +- +- // Now we're done, so we cache the latest key/value pair. +- mostRecentThreadAppContext = +- new MostRecentThreadAppContext(currentThread, context); +- +- return context; +- } +- }); ++ }); + } + + return appContext; +@@ -473,7 +463,7 @@ + // Threads in the ThreadGroup to exit. + + long startTime = System.currentTimeMillis(); +- long endTime = startTime + (long)THREAD_INTERRUPT_TIMEOUT; ++ long endTime = startTime + THREAD_INTERRUPT_TIMEOUT; + while ((this.threadGroup.activeCount() > 0) && + (System.currentTimeMillis() < endTime)) { + try { +@@ -488,7 +478,7 @@ + // Threads in the ThreadGroup to die. + + startTime = System.currentTimeMillis(); +- endTime = startTime + (long)THREAD_INTERRUPT_TIMEOUT; ++ endTime = startTime + THREAD_INTERRUPT_TIMEOUT; + while ((this.threadGroup.activeCount() > 0) && + (System.currentTimeMillis() < endTime)) { + try { +@@ -507,10 +497,7 @@ + } + threadGroup2appContext.remove(this.threadGroup); + +- MostRecentThreadAppContext recent = mostRecentThreadAppContext; +- if ((recent != null) && (recent.appContext == this)) +- mostRecentThreadAppContext = null; +- // If the "most recent" points to this, clear it for GC ++ threadAppContext.set(null); + + // Finally, we destroy the ThreadGroup entirely. + try { +@@ -693,6 +680,7 @@ + * Returns a string representation of this AppContext. + * @since 1.2 + */ ++ @Override + public String toString() { + return getClass().getName() + "[threadGroup=" + threadGroup.getName() + "]"; + } +@@ -842,15 +830,6 @@ + } + } + +-final class MostRecentThreadAppContext { +- final Thread thread; +- final AppContext appContext; +- MostRecentThreadAppContext(Thread key, AppContext value) { +- thread = key; +- appContext = value; +- } +-} +- + final class MostRecentKeyValue { + Object key; + Object value; diff -r 868201fa37c4 -r 8c5e1cbc7ce7 patches/openjdk/7196533-timezone_bottleneck.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7196533-timezone_bottleneck.patch Tue Aug 06 15:10:46 2013 +0100 @@ -0,0 +1,66 @@ +diff -Nru openjdk.orig/jdk/src/share/classes/java/util/TimeZone.java openjdk/jdk/src/share/classes/java/util/TimeZone.java +--- openjdk.orig/jdk/src/share/classes/java/util/TimeZone.java 2012-10-26 19:25:53.000000000 +0100 ++++ openjdk/jdk/src/share/classes/java/util/TimeZone.java 2013-08-05 14:46:18.022264343 +0100 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1996, 2011, 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 +@@ -646,9 +646,15 @@ + * Returns the default TimeZone in an AppContext if any AppContext + * has ever used. null is returned if any AppContext hasn't been + * used or if the AppContext doesn't have the default TimeZone. ++ * ++ * Note that javaAWTAccess may be null if sun.awt.AppContext class hasn't ++ * been loaded. If so, it implies that AWTSecurityManager is not our ++ * SecurityManager and we can use a local static variable. ++ * This works around a build time issue. + */ +- private synchronized static TimeZone getDefaultInAppContext() { +- javaAWTAccess = SharedSecrets.getJavaAWTAccess(); ++ private static TimeZone getDefaultInAppContext() { ++ // JavaAWTAccess provides access implementation-private methods without using reflection. ++ JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess(); + if (javaAWTAccess == null) { + return mainAppContextDefault; + } else { +@@ -670,9 +676,15 @@ + * tz. null is handled special: do nothing if any AppContext + * hasn't been used, remove the default TimeZone in the + * AppContext otherwise. ++ * ++ * Note that javaAWTAccess may be null if sun.awt.AppContext class hasn't ++ * been loaded. If so, it implies that AWTSecurityManager is not our ++ * SecurityManager and we can use a local static variable. ++ * This works around a build time issue. + */ +- private synchronized static void setDefaultInAppContext(TimeZone tz) { +- javaAWTAccess = SharedSecrets.getJavaAWTAccess(); ++ private static void setDefaultInAppContext(TimeZone tz) { ++ // JavaAWTAccess provides access implementation-private methods without using reflection. ++ JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess(); + if (javaAWTAccess == null) { + mainAppContextDefault = tz; + } else { +@@ -736,18 +748,8 @@ + static final String GMT_ID = "GMT"; + private static final int GMT_ID_LENGTH = 3; + +- /* +- * Provides access implementation-private methods without using reflection +- * +- * Note that javaAWTAccess may be null if sun.awt.AppContext class hasn't +- * been loaded. If so, it implies that AWTSecurityManager is not our +- * SecurityManager and we can use a local static variable. +- * This works around a build time issue. +- */ +- private static JavaAWTAccess javaAWTAccess; +- + // a static TimeZone we can reference if no AppContext is in place +- private static TimeZone mainAppContextDefault; ++ private static volatile TimeZone mainAppContextDefault; + + + /** diff -r 868201fa37c4 -r 8c5e1cbc7ce7 patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch --- a/patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch Mon Aug 05 11:47:08 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -# HG changeset patch -# User coffeys -# Date 1367438524 -3600 -# Node ID 0f93d6b18a16bf893b152a46df0e22e32666f7ce -# Parent 55eaa0da2a8f6d9fe4966d3d9940258a1b0d4399 -8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext() -Reviewed-by: mchung, okutsu - ---- openjdk/jdk/src/share/classes/sun/awt/AppContext.java -+++ openjdk/jdk/src/share/classes/sun/awt/AppContext.java -@@ -813,16 +813,24 @@ - static { - sun.misc.SharedSecrets.setJavaAWTAccess(new sun.misc.JavaAWTAccess() { - public Object get(Object key) { -- return getAppContext().get(key); -+ AppContext ac = getAppContext(); -+ return (ac == null) ? null : ac.get(key); - } - public void put(Object key, Object value) { -- getAppContext().put(key, value); -+ AppContext ac = getAppContext(); -+ if (ac != null) { -+ ac.put(key, value); -+ } - } - public void remove(Object key) { -- getAppContext().remove(key); -+ AppContext ac = getAppContext(); -+ if (ac != null) { -+ ac.remove(key); -+ } - } - public boolean isDisposed() { -- return getAppContext().isDisposed(); -+ AppContext ac = getAppContext(); -+ return (ac == null) ? true : ac.isDisposed(); - } - public boolean isMainAppContext() { - return (numAppContexts.get() == 1 && mainAppContext != null); ---- openjdk/jdk/src/share/classes/sun/misc/SharedSecrets.java -+++ openjdk/jdk/src/share/classes/sun/misc/SharedSecrets.java -@@ -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 -@@ -174,6 +174,9 @@ - public static JavaAWTAccess getJavaAWTAccess() { - // this may return null in which case calling code needs to - // provision for. -+ if (javaAWTAccess == null || javaAWTAccess.getContext() == null) { -+ return null; -+ } - return javaAWTAccess; - } - } diff -r 868201fa37c4 -r 8c5e1cbc7ce7 patches/openjdk/8013196-timezone_getdefault_throws_exception.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/8013196-timezone_getdefault_throws_exception.patch Tue Aug 06 15:10:46 2013 +0100 @@ -0,0 +1,39 @@ +# HG changeset patch +# User coffeys +# Date 1367438524 -3600 +# Node ID 0f93d6b18a16bf893b152a46df0e22e32666f7ce +# Parent 55eaa0da2a8f6d9fe4966d3d9940258a1b0d4399 +8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext() +Reviewed-by: mchung, okutsu + +--- openjdk/jdk/src/share/classes/sun/awt/AppContext.java ++++ openjdk/jdk/src/share/classes/sun/awt/AppContext.java +@@ -813,16 +813,24 @@ + static { + sun.misc.SharedSecrets.setJavaAWTAccess(new sun.misc.JavaAWTAccess() { + public Object get(Object key) { +- return getAppContext().get(key); ++ AppContext ac = getAppContext(); ++ return (ac == null) ? null : ac.get(key); + } + public void put(Object key, Object value) { +- getAppContext().put(key, value); ++ AppContext ac = getAppContext(); ++ if (ac != null) { ++ ac.put(key, value); ++ } + } + public void remove(Object key) { +- getAppContext().remove(key); ++ AppContext ac = getAppContext(); ++ if (ac != null) { ++ ac.remove(key); ++ } + } + public boolean isDisposed() { +- return getAppContext().isDisposed(); ++ AppContext ac = getAppContext(); ++ return (ac == null) ? true : ac.isDisposed(); + } + public boolean isMainAppContext() { + return (numAppContexts.get() == 1 && mainAppContext != null); From andrew at icedtea.classpath.org Wed Aug 7 05:03:35 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 07 Aug 2013 12:03:35 +0000 Subject: /hg/icedtea6: Sync hotspot.map with 2.3. Message-ID: changeset ae086ffdfa67 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ae086ffdfa67 author: Andrew John Hughes date: Wed Aug 07 13:03:24 2013 +0100 Sync hotspot.map with 2.3. 2013-08-07 Andrew John Hughes * hotspot.map: Bring in 2.3.12 tag. diffstat: ChangeLog | 4 ++++ hotspot.map | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diffs (18 lines): diff -r 8c5e1cbc7ce7 -r ae086ffdfa67 ChangeLog --- a/ChangeLog Tue Aug 06 15:10:46 2013 +0100 +++ b/ChangeLog Wed Aug 07 13:03:24 2013 +0100 @@ -1,3 +1,7 @@ +2013-08-07 Andrew John Hughes + + * hotspot.map: Bring in 2.3.12 tag. + 2013-08-06 Andrew John Hughes * 8013196-TimeZone_getDefault_throws_exception.patch: diff -r 8c5e1cbc7ce7 -r ae086ffdfa67 hotspot.map --- a/hotspot.map Tue Aug 06 15:10:46 2013 +0100 +++ b/hotspot.map Wed Aug 07 13:03:24 2013 +0100 @@ -1,2 +1,2 @@ # version url changeset sha256sum -hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 37b254871acb 60268f9d792575ec26b8796753246aca70282937327c2fa855b3f0010638605e +hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot a6502a8a6b31 5c73225a03c33109a4cbea6274bf5af634a14feddb80ed7471af0c1445c93204 From adomurad at redhat.com Wed Aug 7 07:08:23 2013 From: adomurad at redhat.com (Adam Domurad) Date: Wed, 07 Aug 2013 10:08:23 -0400 Subject: [rfc][icedtea-web] PR1271, Handle 'javascript:' urls, with tests In-Reply-To: <201308062126.r76LQS1v024270@mail-web01.excite.co.jp> References: <201308062126.r76LQS1v024270@mail-web01.excite.co.jp> Message-ID: <520254D7.2040704@redhat.com> On 08/06/2013 05:26 PM, Jacob Wisor wrote: > Hello! Hi! Can you please try and find a mailer that properly responds to emails ? It is quite hard to follow your responses. > > My usual nit picks: > >> + static private void installDummyJavascriptProtocolHandler() { >> + try { >> + Field handlersField = URL.class.getDeclaredField("handlers"); >> + handlersField.setAccessible(true); >> + >> + @SuppressWarnings("unchecked") >> + Hashtable handlers = (Hashtable)handlersField.get(null); > You can make the compiler happy by checking the return value with the instanceof operator. ;) No you cannot, it is complaining that it is impossible to tell Hashtable and Hashtable apart, which is just how Java works. >> + >> + // Place an arbitrary handler, we only need the URL construction to not error-out >> + handlers.put("javascript", new sun.net.www.protocol.http.Handler()); >> + } catch (Exception e) { > Uhh ahh, there are good reasons not to do this :) Indeed, unless there are no better ideas. There isn't exactly an API for doing this. Happy hacking, -Adam From adomurad at redhat.com Wed Aug 7 07:36:14 2013 From: adomurad at redhat.com (Adam Domurad) Date: Wed, 07 Aug 2013 10:36:14 -0400 Subject: [rfc][icedtea-web] Fix NPE on Applet launch due to missing AppletStub In-Reply-To: <201308062112.r76LC1ae023806@mail-web01.excite.co.jp> References: <201308062112.r76LC1ae023806@mail-web01.excite.co.jp> Message-ID: <52025B5E.7040704@redhat.com> On 08/06/2013 05:12 PM, Jacob Wisor wrote: > Hello there! > >> @@ -716,6 +717,7 @@ public class Launcher { >> String appletName = file.getApplet().getMainClass(); >> Class appletClass = loader.loadClass(appletName); >> Applet applet = (Applet) appletClass.newInstance(); >> + applet.setStub((AppletStub)cont); > > You may want to catch a possible SecurityException in case the AppletStub has already been set. Malicious code may attach to the JVM process executing the Launcher and try either to replace the AppletStub or render the Launcher effectively inoperable by intentionally causing an unhandled SecurityException every time a specific applet or any applet is run and hence terminate the attacked JVM. > I don't think so. setAppletStub is a public final method that we can always make use of, since we will have necessary permissions here. There is nothing malicious about trying to set your own AppletStub before we do. Regards, -Adam > Regards, > Jacob > >> // Finish setting up appletInstance. >> appletInstance.setApplet(applet); >> appletInstance.getAppletEnvironment().setApplet(applet); > > "Adam Domurad" wrote: >> Hi all. There is a problem that sometimes a showStatus() on an applet >> results in an NPE on applet load, due to a missing AppletStub. This >> patch sets it to NetxPanel (the container) as soon as possible. >> >> This helps stabilize a test case I'm working on. >> >> Cheers, >> -Adam From bugzilla-daemon at icedtea.classpath.org Wed Aug 7 08:33:43 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 07 Aug 2013 15:33:43 +0000 Subject: [Bug 1492] icedtea-web does not work with openjdk-7.25.15 on FreeBSD 9.1-STABLE In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1492 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|dbhole at redhat.com |adomurad at redhat.com --- Comment #6 from Deepak Bhole --- Assigning to Adam to take a look. -- 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/20130807/6b9bc418/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Aug 7 10:36:07 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 07 Aug 2013 17:36:07 +0000 Subject: [Bug 1516] New: Multiple AWT event queues in 1.12.6 security update broke Java applications (NetBeans, VisualVM, JOSM) Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1516 Bug ID: 1516 Summary: Multiple AWT event queues in 1.12.6 security update broke Java applications (NetBeans, VisualVM, JOSM) Classification: Unclassified Product: IcedTea Version: 6-1.12.6 Hardware: x86 OS: Linux Status: NEW Severity: blocker Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: vincent.privat at gmail.com CC: unassigned at icedtea.classpath.org The latest security update (1.12.6) of IcedTea 6 appears to have broken several Java applications. This is an upstream file bug report of the one reported at Ubuntu launchpad: https://bugs.launchpad.net/ubuntu/+source/openjdk-6/+bug/1204906 And JOSM trac: http://josm.openstreetmap.de/ticket/8921 As stated in original bug report: Manifests as UI issues, NPE's and lockups (eg. find usages dialog hangs NetBeans). One stack trace shows EventQueue.isDispatchThread() returning false from within the dispatch thread. -- 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/20130807/e6b27334/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Aug 7 10:46:04 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 07 Aug 2013 17:46:04 +0000 Subject: [Bug 1516] [IcedTea6] Multiple AWT event queues in 1.12.6 security update broke Java applications (NetBeans, VisualVM, JOSM) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1516 vincent.privat at gmail.com changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|Multiple AWT event queues |[IcedTea6] Multiple AWT |in 1.12.6 security update |event queues in 1.12.6 |broke Java applications |security update broke Java |(NetBeans, VisualVM, JOSM) |applications (NetBeans, | |VisualVM, JOSM) -- 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/20130807/dfb241c9/attachment.html From andrew at icedtea.classpath.org Thu Aug 8 05:35:40 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 08 Aug 2013 12:35:40 +0000 Subject: /hg/release/icedtea7-forest-2.3/jdk: Fix merge issues caused by ... Message-ID: changeset 6f1a1e26f521 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=6f1a1e26f521 author: andrew date: Thu Aug 08 01:48:56 2013 +0100 Fix merge issues caused by faulty AOT 8010118 patch. diffstat: src/share/classes/sun/reflect/misc/ReflectUtil.java | 8 -------- src/share/native/sun/reflect/Reflection.c | 4 +--- 2 files changed, 1 insertions(+), 11 deletions(-) diffs (32 lines): diff -r 64c0a3fb78cd -r 6f1a1e26f521 src/share/classes/sun/reflect/misc/ReflectUtil.java --- a/src/share/classes/sun/reflect/misc/ReflectUtil.java Tue Jul 02 13:23:35 2013 -0700 +++ b/src/share/classes/sun/reflect/misc/ReflectUtil.java Thu Aug 08 01:48:56 2013 +0100 @@ -47,14 +47,6 @@ return cls.newInstance(); } - public static void ensureClassAccess(Class clazz) - throws IllegalAccessException - { - int mod = clazz.getModifiers(); - if ( ! Modifier.isPublic(mod) ){ - throw new IllegalAccessException("Class is not public and can't be instantiated"); - } - } /* * Reflection.ensureMemberAccess is overly-restrictive * due to a bug. We awkwardly work around it for now. diff -r 64c0a3fb78cd -r 6f1a1e26f521 src/share/native/sun/reflect/Reflection.c --- a/src/share/native/sun/reflect/Reflection.c Tue Jul 02 13:23:35 2013 -0700 +++ b/src/share/native/sun/reflect/Reflection.c Thu Aug 08 01:48:56 2013 +0100 @@ -37,9 +37,7 @@ JNIEXPORT jclass JNICALL Java_sun_reflect_Reflection_getCallerClass0 (JNIEnv *env, jclass unused, jint depth) { - // Until there is hotspot @CallerSensitive support, - // depth must always be 2 to get the immediate caller - return JVM_GetCallerClass(env, 2); + return JVM_GetCallerClass(env, depth); } JNIEXPORT jint JNICALL Java_sun_reflect_Reflection_getClassAccessFlags From andrew at icedtea.classpath.org Thu Aug 8 05:51:37 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 08 Aug 2013 12:51:37 +0000 Subject: /hg/icedtea6-hg: 4 new changesets Message-ID: changeset 4b4d78563ff0 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=4b4d78563ff0 author: Andrew John Hughes date: Tue Aug 06 15:07:45 2013 +0100 Add dependencies of 8013196 and remove SharedSecrets fragment of 8013196 which causes a TCK regression. 2013-08-05 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch, * patches/openjdk/6636370-appcontext_simplification.patch, * patches/openjdk/7196533-timezone_bottleneck.patch: Backport additional patches which relate to changes in 8013196. * patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch: Drop SharedSecrets changes which cause a TCK regression. changeset 8c5e1cbc7ce7 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8c5e1cbc7ce7 author: Andrew John Hughes date: Tue Aug 06 15:10:46 2013 +0100 Fix naming of patch. 2013-08-06 Andrew John Hughes * 8013196-TimeZone_getDefault_throws_exception.patch: Renamed to... * 8013196-timezone_getdefault_throws_exception.patch: ...this. * Makefile.am: (ICEDTEA_PATCHES): Fix name of patch. changeset ae086ffdfa67 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ae086ffdfa67 author: Andrew John Hughes date: Wed Aug 07 13:03:24 2013 +0100 Sync hotspot.map with 2.3. 2013-08-07 Andrew John Hughes * hotspot.map: Bring in 2.3.12 tag. changeset 55b0d105e57a in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=55b0d105e57a author: Andrew John Hughes date: Wed Aug 07 13:07:02 2013 +0100 Merge diffstat: ChangeLog | 238 + Makefile.am | 151 +- hotspot.map | 2 +- patches/copy_memory.patch | 36 - patches/ecj/jcp-importsources.patch | 10 - patches/ecj/override.patch | 51 + patches/hotspot/original/7197906-handle_32_bit_shifts.patch | 33 - patches/hotspot/original/fix_get_stack_bounds_leak.patch | 12 - patches/openjdk/5102804-memory_leak.patch | 429 - patches/openjdk/6469266-xmlsec_1.4.2.patch | 23876 - patches/openjdk/6501644-icu_sync.patch | 8066 - patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch | 24 + patches/openjdk/6636370-appcontext_simplification.patch | 178 + patches/openjdk/6669869-queries_per_appcontext.patch | 355 - patches/openjdk/6886358-layout_update.patch | 13847 - patches/openjdk/6888167-medialib_memory_leaks.patch | 134 - patches/openjdk/6963811-deadlock_fix.patch | 42 - patches/openjdk/7017324-kerning_crash.patch | 101 - patches/openjdk/7036559-concurrenthashmap_improvements.patch | 1436 - patches/openjdk/7064279-fixup.patch | 71 - patches/openjdk/7064279-resource_release.patch | 436 - patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch | 298 - patches/openjdk/7195301-no_instanceof_node.patch | 86 - patches/openjdk/7196533-timezone_bottleneck.patch | 66 + patches/openjdk/8004302-soap_test_failure.patch | 75 - patches/openjdk/8004341-jck_dialog_failure.patch | 26 - patches/openjdk/8005615-failure_to_load_logger_implementation.patch | 542 - patches/openjdk/8007393.patch | 78 - patches/openjdk/8007611.patch | 24 - patches/openjdk/8009641-8007675_build_fix.patch | 49 - patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch | 58 - patches/openjdk/8013196-timezone_getdefault_throws_exception.patch | 39 + patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch | 449213 ------- patches/openjdk/jaxp144_05.patch | 595589 ---------- patches/security/20130201/6563318.patch | 36 - patches/security/20130201/6664509.patch | 1322 - patches/security/20130201/6776941.patch | 272 - patches/security/20130201/7141694.patch | 87 - patches/security/20130201/7173145.patch | 22 - patches/security/20130201/7186945.patch | 10819 - patches/security/20130201/7186948.patch | 20 - patches/security/20130201/7186952.patch | 127 - patches/security/20130201/7186954.patch | 81 - patches/security/20130201/7192392.patch | 695 - patches/security/20130201/7192393.patch | 60 - patches/security/20130201/7192977.patch | 444 - patches/security/20130201/7197546.patch | 479 - patches/security/20130201/7200491.patch | 49 - patches/security/20130201/7200500.patch | 60 - patches/security/20130201/7201064.patch | 125 - patches/security/20130201/7201066.patch | 66 - patches/security/20130201/7201068.patch | 83 - patches/security/20130201/7201070.patch | 31 - patches/security/20130201/7201071.patch | 553 - patches/security/20130201/8000210.patch | 104 - patches/security/20130201/8000537.patch | 334 - patches/security/20130201/8000540.patch | 187 - patches/security/20130201/8000631.patch | 3964 - patches/security/20130201/8001242.patch | 61 - patches/security/20130201/8001307.patch | 27 - patches/security/20130201/8001972.patch | 438 - patches/security/20130201/8002325.patch | 59 - patches/security/20130219/8006446.patch | 395 - patches/security/20130219/8006777.patch | 1036 - patches/security/20130219/8007688.patch | 130 - patches/security/20130304/8007014.patch | 477 - patches/security/20130304/8007675.patch | 416 - patches/security/20130416/6657673-factory_finder.patch | 54 - patches/security/20130416/6657673-fixup.patch | 229 - patches/security/20130416/6657673.patch | 9494 - patches/security/20130416/7200507.patch | 230 - patches/security/20130416/8000724.patch | 1368 - patches/security/20130416/8001031.patch | 5457 - patches/security/20130416/8001040.patch | 113 - patches/security/20130416/8001322.patch | 61 - patches/security/20130416/8001329.patch | 32 - patches/security/20130416/8003335.patch | 63 - patches/security/20130416/8003445.patch | 77 - patches/security/20130416/8003543.patch | 236 - patches/security/20130416/8004261.patch | 142 - patches/security/20130416/8004336.patch | 29 - patches/security/20130416/8004986.patch | 374 - patches/security/20130416/8005432.patch | 518 - patches/security/20130416/8005943.patch | 202 - patches/security/20130416/8006309.patch | 22 - patches/security/20130416/8006435.patch | 76 - patches/security/20130416/8006790.patch | 166 - patches/security/20130416/8006795.patch | 35 - patches/security/20130416/8007406.patch | 31 - patches/security/20130416/8007617.patch | 376 - patches/security/20130416/8007667.patch | 579 - patches/security/20130416/8007918.patch | 357 - patches/security/20130416/8009063.patch | 67 - patches/security/20130416/8009305.patch | 68 - patches/security/20130416/8009699.patch | 25 - patches/security/20130416/8009814.patch | 27 - patches/security/20130416/8009857.patch | 66 - patches/security/20130618/6741606-apache_santuario.patch | 8110 - 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-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 | 6937 - 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/8009235-improve_tsa_data_handling.patch | 80 - 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/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/diamond_fix.patch | 55 - patches/security/20130618/javac_issue.patch | 60 - 152 files changed, 604 insertions(+), 1163359 deletions(-) diffs (truncated from 1164678 to 500 lines): diff -r 868201fa37c4 -r 55b0d105e57a ChangeLog --- a/ChangeLog Mon Aug 05 11:47:08 2013 +0100 +++ b/ChangeLog Wed Aug 07 13:07:02 2013 +0100 @@ -1,8 +1,151 @@ +2013-08-07 Andrew John Hughes + + * hotspot.map: Bring in 2.3.12 tag. + +2013-08-06 Andrew John Hughes + + * patches/security/20130618/8000642-better_transportation_handling.patch, + * patches/security/20130618/8001032-restrict_object_access-corba.patch: + Removed. + * Makefile.am: + (ICEDTEA_PATCHES): Remove upstreamed patches. + +2013-08-06 Andrew John Hughes + + * 8013196-TimeZone_getDefault_throws_exception.patch: + Renamed to... + * 8013196-timezone_getdefault_throws_exception.patch: + ...this. + * Makefile.am: + (ICEDTEA_PATCHES): Fix name of patch. + +2013-08-05 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patches. + * patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch, + * patches/openjdk/6636370-appcontext_simplification.patch, + * patches/openjdk/7196533-timezone_bottleneck.patch: + Backport additional patches which relate to changes in 8013196. + * patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch: + Drop SharedSecrets changes which cause a TCK regression. + 2013-08-02 Andrew John Hughes * hotspot.map: Bring in hs23 changes to ARM32 port, syncing with 2.3.12 tag. +2013-08-02 Andrew John Hughes + + * patches/openjdk/6469266-xmlsec_1.4.2.patch, + * patches/openjdk/6888167-medialib_memory_leaks.patch, + * patches/openjdk/7195301-no_instanceof_node.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-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-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/8009235-improve_tsa_data_handling.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/javac_issue.patch, + * Makefile.am: + Remove unused patches. + * Makefile.am: + (SECURITY_PATCHES): Remove upstreamed security + patches. + +2013-07-31 Andrew John Hughes + + * patches/ecj/jcp-importsources.patch, + * patches/openjdk/5102804-memory_leak.patch, + * patches/openjdk/6501644-icu_sync.patch, + * patches/openjdk/6669869-queries_per_appcontext.patch, + * patches/openjdk/6886358-layout_update.patch, + * patches/openjdk/6963811-deadlock_fix.patch, + * patches/openjdk/7017324-kerning_crash.patch, + * patches/openjdk/7064279-fixup.patch, + * patches/openjdk/7064279-resource_release.patch, + * patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch, + * patches/security/20130416/6657673-factory_finder.patch, + * patches/security/20130416/6657673-fixup.patch, + * patches/security/20130416/6657673.patch, + * patches/security/20130416/7200507.patch, + * patches/security/20130416/8000724.patch, + * patches/security/20130416/8001031.patch, + * patches/security/20130416/8001040.patch, + * patches/security/20130416/8001322.patch, + * patches/security/20130416/8001329.patch, + * patches/security/20130416/8003335.patch, + * patches/security/20130416/8003445.patch, + * patches/security/20130416/8003543.patch, + * patches/security/20130416/8004261.patch, + * patches/security/20130416/8004336.patch, + * patches/security/20130416/8004986.patch, + * patches/security/20130416/8005432.patch, + * patches/security/20130416/8005943.patch, + * patches/security/20130416/8006309.patch, + * patches/security/20130416/8006435.patch, + * patches/security/20130416/8006790.patch, + * patches/security/20130416/8006795.patch, + * patches/security/20130416/8007406.patch, + * patches/security/20130416/8007617.patch, + * patches/security/20130416/8007667.patch, + * patches/security/20130416/8007918.patch, + * patches/security/20130416/8009063.patch, + * patches/security/20130416/8009305.patch, + * patches/security/20130416/8009699.patch, + * patches/security/20130416/8009814.patch, + * patches/security/20130416/8009857.patch: + Remove unused patches. + * Makefile.am: + (SECURITY_PATCHES): Remove upstreamed security + patches. + 2013-07-22 Andrew John Hughes * Makefile.am: @@ -63,6 +206,13 @@ 2013-07-11 Andrew John Hughes + * patches/openjdk/7036559-concurrenthashmap_improvements.patch: + Remove upstreamed patch. + * Makefile.am: + (ICEDTEA_PATCHES): Drop upstreamed patches. + +2013-07-11 Andrew John Hughes + * NEWS: Add 1.11.12 and 1.12.6 release notes. @@ -358,6 +508,15 @@ * patches/security/20130618/langtools_merge-03.patch: 2013/06/18 security patches. +2013-05-31 Andrew John Hughes + + * patches/copy_memory.patch, + * patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch: + Drop upstreamed patches. + * Makefile.am: + (DROP_PATCHES): Remove JAXP patch. + (ICEDTEA_PATCHES): Remove OpenJDK6-4 patch. + 2013-05-28 Xerxes R??nby PR1188: ASM Interpreter and Thumb2 JIT javac miscompile @@ -423,6 +582,18 @@ * patches/jtreg-TextLayoutBoundsChecks.patch: Fixed wrong JTreg test name in @run annotation. +2013-05-17 Andrew John Hughes + + * patches/hotspot/original/7197906-handle_32_bit_shifts.patch, + * patches/hotspot/original/fix_get_stack_bounds_leak.patch, + * patches/openjdk/8004302-soap_test_failure.patch, + * patches/openjdk/jaxp144_05.patch: + Removed as available upstream. + * Makefile.am: Remove patches. + * patches/security/20130416/6657673.patch, + * patches/security/20130416/8005432.patch: + Regenerated against upstream. + 2013-05-17 Pavel Tisnovsky * patches/componentOrientationTests.patch: @@ -440,6 +611,12 @@ * Makefile.am: Renamed three patches to be more consistent with other JTreg-related patches. +2013-05-15 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Remove reference to removed + patch patches/openjdk/8009641-8007675_build_fix.patch. + 2013-05-15 Pavel Tisnovsky * Makefile.am: @@ -816,6 +993,62 @@ * patches/jvmtiEnv.patch: Moved to... * patches/hotspot/original/jvmtiEnv.patch: here. +2013-03-19 Andrew John Hughes + + * patches/openjdk/8004341-jck_dialog_failure.patch, + * patches/openjdk/8005615-failure_to_load_logger_implementation.patch, + * patches/openjdk/8007393.patch, + * patches/openjdk/8007611.patch, + * patches/openjdk/8009641-8007675_build_fix.patch, + * patches/security/20130201/6563318.patch, + * patches/security/20130201/6664509.patch, + * patches/security/20130201/6776941.patch, + * patches/security/20130201/7141694.patch, + * patches/security/20130201/7173145.patch, + * patches/security/20130201/7186945.patch, + * patches/security/20130201/7186948.patch, + * patches/security/20130201/7186952.patch, + * patches/security/20130201/7186954.patch, + * patches/security/20130201/7192392.patch, + * patches/security/20130201/7192393.patch, + * patches/security/20130201/7192977.patch, + * patches/security/20130201/7197546.patch, + * patches/security/20130201/7200491.patch, + * patches/security/20130201/7200500.patch, + * patches/security/20130201/7201064.patch, + * patches/security/20130201/7201066.patch, + * patches/security/20130201/7201068.patch, + * patches/security/20130201/7201070.patch, + * patches/security/20130201/7201071.patch, + * patches/security/20130201/8000210.patch, + * patches/security/20130201/8000537.patch, + * patches/security/20130201/8000540.patch, + * patches/security/20130201/8000631.patch, + * patches/security/20130201/8001235.patch, + * patches/security/20130201/8001242.patch, + * patches/security/20130201/8001307.patch, + * patches/security/20130201/8001972.patch, + * patches/security/20130201/8002325.patch, + * patches/security/20130219/8006446.patch, + * patches/security/20130219/8006777.patch, + * patches/security/20130219/8007688.patch, + * patches/security/20130304/8007014.patch, + * patches/security/20130304/8007675.patch: + Remove patches available upstream. + * Makefile.am: + (JAXP_DROP_ZIP): Update to jaxp144_05.zip + with latest security fix included. + (JAXP_DROP_SHA256SUM): Likewise. + (SECURITY_PATCHES): Remove ones available + upstream (all from 2013/02/01, 2013/02/19 + and 2013/03/04). + (ICEDTEA_PATCHES): Remove patches for + 8005615, 8004341, 8007393 & 8007611 + available upstream. + * patches/ecj/override.patch: + Add new case introduced by upstream version + of security patches (sigh...) + 2013-03-18 Andrew John Hughes * Makefile.am: @@ -1417,6 +1650,11 @@ 2012-10-31 Andrew John Hughes + * Makefile.am: + (OPENJDK_VERSION): Bump to next release, b28. + +2012-10-31 Andrew John Hughes + * generated/com/sun/corba/se/impl/logging/ActivationSystemException.java, * generated/com/sun/corba/se/impl/logging/IORSystemException.java, * generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java, diff -r 868201fa37c4 -r 55b0d105e57a Makefile.am --- a/Makefile.am Mon Aug 05 11:47:08 2013 +0100 +++ b/Makefile.am Wed Aug 07 13:07:02 2013 +0100 @@ -2,7 +2,7 @@ OPENJDK_DATE = 26_oct_2012 OPENJDK_SHA256SUM = 044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0 -OPENJDK_VERSION = b27 +OPENJDK_VERSION = b28 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ CACAO_VERSION = 68fe50ac34ec @@ -278,145 +278,11 @@ ICEDTEA_FSG_PATCHES = -DROP_PATCHES = \ - patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch \ - patches/openjdk/jaxp144_05.patch +DROP_PATCHES = SECURITY_PATCHES = \ patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \ - patches/security/20130201/7201068.patch \ - patches/security/20130201/6563318.patch \ - patches/security/20130201/6664509.patch \ - patches/security/20130201/6776941.patch \ - patches/security/20130201/7141694.patch \ - patches/security/20130201/7173145.patch \ - patches/security/20130201/7186945.patch \ - patches/security/20130201/7186948.patch \ - patches/security/20130201/7186952.patch \ - patches/security/20130201/7186954.patch \ - patches/security/20130201/7192392.patch \ - patches/security/20130201/7192393.patch \ - patches/security/20130201/7192977.patch \ - patches/security/20130201/7197546.patch \ - patches/security/20130201/7200491.patch \ - patches/security/20130201/7200500.patch \ - patches/security/20130201/7201064.patch \ - patches/security/20130201/7201066.patch \ - patches/security/20130201/7201070.patch \ - patches/security/20130201/7201071.patch \ - patches/security/20130201/8000210.patch \ - patches/security/20130201/8000537.patch \ - patches/security/20130201/8000540.patch \ - patches/security/20130201/8000631.patch \ - patches/security/20130201/8001242.patch \ - patches/security/20130201/8001972.patch \ - patches/security/20130201/8002325.patch \ - patches/security/20130219/8006446.patch \ - patches/security/20130219/8006777.patch \ - patches/security/20130219/8007688.patch \ - patches/security/20130304/8007014.patch \ - patches/security/20130304/8007675.patch \ - patches/openjdk/8009641-8007675_build_fix.patch \ - patches/openjdk/7036559-concurrenthashmap_improvements.patch \ - patches/security/20130416/8009063.patch \ - patches/openjdk/8004302-soap_test_failure.patch \ - patches/security/20130416/6657673.patch \ - patches/security/20130416/6657673-fixup.patch \ - patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch \ - patches/security/20130416/6657673-factory_finder.patch \ - patches/openjdk/6669869-queries_per_appcontext.patch \ - patches/openjdk/5102804-memory_leak.patch \ - patches/openjdk/6963811-deadlock_fix.patch \ - patches/openjdk/7064279-resource_release.patch \ - patches/openjdk/7064279-fixup.patch \ - patches/security/20130416/7200507.patch \ - patches/security/20130416/8000724.patch \ - patches/security/20130416/8004986.patch \ - patches/openjdk/6501644-icu_sync.patch \ - patches/openjdk/6886358-layout_update.patch \ - patches/security/20130416/8001031.patch \ - patches/openjdk/7017324-kerning_crash.patch \ - patches/security/20130416/8001040.patch \ - patches/security/20130416/8001322.patch \ - patches/security/20130416/8001329.patch \ - patches/security/20130416/8003335.patch \ - patches/security/20130416/8003445.patch \ - patches/security/20130416/8003543.patch \ - patches/security/20130416/8004261.patch \ - patches/security/20130416/8005432.patch \ - patches/security/20130416/8005943.patch \ - patches/security/20130416/8006435.patch \ - patches/security/20130416/8006790.patch \ - patches/security/20130416/8006795.patch \ - patches/security/20130416/8007406.patch \ - patches/security/20130416/8007617.patch \ - patches/security/20130416/8007667.patch \ - patches/security/20130416/8007918.patch \ - patches/security/20130416/8009305.patch \ - patches/security/20130416/8009814.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/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/8000642-better_transportation_handling.patch \ patches/openjdk/6786028-wcag_bold_tags.patch \ patches/openjdk/6786682-wcag_lang.patch \ patches/openjdk/6802694-no_deprecated.patch \ @@ -435,7 +301,6 @@ if !WITH_ALT_HSBUILD SECURITY_PATCHES += \ - patches/security/20130201/8001307.patch \ patches/security/20130416/8004336.patch \ patches/security/20130416/8006309.patch \ patches/security/20130416/8009699.patch \ @@ -648,9 +513,7 @@ patches/openjdk/6980681-corba_deadlock.patch \ patches/openjdk/7162902-corba_fixes.patch \ patches/traceable.patch \ - patches/openjdk/8004341-jck_dialog_failure.patch \ patches/pr1319-support_giflib_5.patch \ - patches/copy_memory.patch \ patches/openjdk/6718364-inference_failure.patch \ patches/openjdk/6682380-foreach_crash.patch \ patches/openjdk/7046929-fix_t6397104_test_failure.patch \ @@ -681,7 +544,7 @@ patches/openjdk/8012112-MlibOpsTest_fails.patch \ patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch \ patches/openjdk/8012933-appcontext_disposed_too_early.patch \ - patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch \ + patches/openjdk/8013196-timezone_getdefault_throws_exception.patch \ patches/openjdk/8014205-blank_swing_dialogs_windows.patch \ patches/openjdk/8014427-raster_regression.patch \ patches/openjdk/8014676-javadebugger_space_in_paths.patch \ @@ -714,8 +577,10 @@ patches/openjdk/7158483-tzdata2012c.patch \ patches/openjdk/7198570-tzdata2012f.patch \ patches/openjdk/8002225-tzdata2012i.patch \ - patches/openjdk/8009987-tzdata2013b.patch - + patches/openjdk/8009987-tzdata2013b.patch \ + patches/openjdk/7196533-timezone_bottleneck.patch \ + patches/openjdk/6636370-appcontext_simplification.patch \ + patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ @@ -763,8 +628,6 @@ patches/pr696-zero-fast_aldc-hs20.patch \ patches/arm-debug.patch \ patches/openjdk/7010849-modernise_sa.patch \ - patches/hotspot/original/7197906-handle_32_bit_shifts.patch \ - patches/hotspot/original/fix_get_stack_bounds_leak.patch \ patches/hotspot/original/jvmtiEnv.patch \ patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch \ patches/hotspot/original/aarch64.patch \ From andrew at icedtea.classpath.org Thu Aug 8 07:24:29 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 08 Aug 2013 14:24:29 +0000 Subject: /hg/icedtea6-hg: Remove upstreamed langtools patches from the 20... Message-ID: changeset 2a39fbf2cf14 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2a39fbf2cf14 author: Andrew John Hughes date: Thu Aug 08 15:24:00 2013 +0100 Remove upstreamed langtools patches from the 2013/06/18 erratum. 2013-08-07 Andrew John Hughes * 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-handle_renames.patch, * patches/openjdk/6851834-restructure.patch, * patches/openjdk/6961178-doclet_xml.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_generics.patch, * patches/security/20130618/langtools_merge-01.patch, * patches/security/20130618/langtools_merge-02.patch, * patches/security/20130618/langtools_merge-03.patch: Removed. * Makefile.am: (ICEDTEA_PATCHES): Remove upstreamed patches. diffstat: ChangeLog | 21 + Makefile.am | 17 +- 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-handle_renames.patch | 605 - patches/openjdk/6851834-restructure.patch | 26853 ---------- patches/openjdk/6961178-doclet_xml.patch | 1989 - patches/openjdk/7006270-regressions.patch | 299 - patches/security/20130618/8012375-javadoc_framing.patch | 61 - patches/security/20130618/8015997-more_javadoc_framing.patch | 21 - 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 - 17 files changed, 22 insertions(+), 40369 deletions(-) diffs (truncated from 40479 to 500 lines): diff -r 55b0d105e57a -r 2a39fbf2cf14 ChangeLog --- a/ChangeLog Wed Aug 07 13:07:02 2013 +0100 +++ b/ChangeLog Thu Aug 08 15:24:00 2013 +0100 @@ -1,3 +1,24 @@ +2013-08-07 Andrew John Hughes + + * 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-handle_renames.patch, + * patches/openjdk/6851834-restructure.patch, + * patches/openjdk/6961178-doclet_xml.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_generics.patch, + * patches/security/20130618/langtools_merge-01.patch, + * patches/security/20130618/langtools_merge-02.patch, + * patches/security/20130618/langtools_merge-03.patch: + Removed. + * Makefile.am: + (ICEDTEA_PATCHES): Remove upstreamed patches. + 2013-08-07 Andrew John Hughes * hotspot.map: Bring in 2.3.12 tag. diff -r 55b0d105e57a -r 2a39fbf2cf14 Makefile.am --- a/Makefile.am Wed Aug 07 13:07:02 2013 +0100 +++ b/Makefile.am Thu Aug 08 15:24:00 2013 +0100 @@ -282,22 +282,7 @@ SECURITY_PATCHES = \ patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \ - patches/security/20130618/handle_npe.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/6851834-handle_renames.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 + patches/security/20130618/handle_npe.patch if !WITH_ALT_HSBUILD SECURITY_PATCHES += \ diff -r 55b0d105e57a -r 2a39fbf2cf14 patches/openjdk/6786028-wcag_bold_tags.patch --- a/patches/openjdk/6786028-wcag_bold_tags.patch Wed Aug 07 13:07:02 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2914 +0,0 @@ -# HG changeset patch -# User bpatel -# Date 1231460819 28800 -# Node ID a50f3556d6954decf0897aa984c8ba43def77b9e -# Parent 4ab5d66aaf2b9e5c09ab54748f6e2615b7818b12 -6786028: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - Bold tags should be strong -Reviewed-by: jjg - -diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java ---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java -+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java -@@ -71,7 +71,7 @@ - member.position().line() != classdoc.position().line()) { - writer.printSrcLink(member, member.name()); - } else { -- bold(member.name()); -+ strong(member.name()); - } - writeParameters(member); - writeExceptions(member); -@@ -87,10 +87,10 @@ - protected void writeSummaryLink(int context, ClassDoc cd, ProgramElementDoc member) { - ExecutableMemberDoc emd = (ExecutableMemberDoc)member; - String name = emd.name(); -- writer.bold(); -+ writer.strong(); - writer.printDocLink(context, cd, (MemberDoc) emd, - name, false); -- writer.boldEnd(); -+ writer.strongEnd(); - writer.displayLength = name.length(); - writeParameters(emd, false); - } -diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java ---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java -+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java -@@ -78,12 +78,12 @@ - } - - /** -- * Print the text "Index" in bold format in the navigation bar. -+ * Print the text "Index" in strong format in the navigation bar. - */ - protected void navLinkIndex() { - navCellRevStart(); - fontStyle("NavBarFont1Rev"); -- boldText("doclet.Index"); -+ strongText("doclet.Index"); - fontEnd(); - navCellEnd(); - } -@@ -98,7 +98,7 @@ - protected void generateContents(Character unicode, List memberlist) { - anchor("_" + unicode + "_"); - h2(); -- bold(unicode.toString()); -+ strong(unicode.toString()); - h2End(); - dl(); - for (int i = 0; i < memberlist.size(); i++) { -@@ -195,14 +195,14 @@ - protected void printComment(ProgramElementDoc element) { - Tag[] tags; - if (Util.isDeprecated(element)) { -- boldText("doclet.Deprecated"); space(); -+ strongText("doclet.Deprecated"); space(); - if ((tags = element.tags("deprecated")).length > 0) - printInlineDeprecatedComment(element, tags[0]); - } else { - ClassDoc cont = element.containingClass(); - while (cont != null) { - if (Util.isDeprecated(cont)) { -- boldText("doclet.Deprecated"); space(); -+ strongText("doclet.Deprecated"); space(); - break; - } - cont = cont.containingClass(); -diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java ---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java -+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java -@@ -98,8 +98,8 @@ - writer.displayLength++; - } - -- protected void bold(String str) { -- writer.bold(str); -+ protected void strong(String str) { -+ writer.strong(str); - writer.displayLength += str.length(); - } - -@@ -321,7 +321,7 @@ - if (deprmembers.size() > 0) { - writer.tableIndexSummary(); - writer.tableHeaderStart("#CCCCFF"); -- writer.boldText(headingKey); -+ writer.strongText(headingKey); - writer.tableHeaderEnd(); - for (int i = 0; i < deprmembers.size(); i++) { - ProgramElementDoc member =(ProgramElementDoc)deprmembers.get(i); -@@ -363,7 +363,7 @@ - if (cd != null && !(pgmdoc instanceof ConstructorDoc) - && !(pgmdoc instanceof ClassDoc)) { - // Add class context -- writer.bold(cd.name() + "."); -+ writer.strong(cd.name() + "."); - } - writeSummaryLink( - pgmdoc instanceof ClassDoc ? -diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java ---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java -+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java -@@ -137,13 +137,13 @@ - } - - /** -- * Highlight "Overview" in the bold format, in the navigation bar as this -+ * Highlight "Overview" in the strong format, in the navigation bar as this - * is the overview page. - */ - protected void navLinkContents() { - navCellRevStart(); - fontStyle("NavBarFont1Rev"); -- boldText("doclet.Overview"); -+ strongText("doclet.Overview"); - fontEnd(); - navCellEnd(); - } -diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java ---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java -+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java -@@ -173,7 +173,7 @@ - */ - protected void printPartialInfo(ClassDoc cd) { - li("circle"); -- printPreQualifiedBoldClassLink(LinkInfoImpl.CONTEXT_TREE, cd); -+ printPreQualifiedStrongClassLink(LinkInfoImpl.CONTEXT_TREE, cd); - } - - /** -@@ -193,7 +193,7 @@ - protected void navLinkTree() { - navCellRevStart(); - fontStyle("NavBarFont1Rev"); -- boldText("doclet.Tree"); -+ strongText("doclet.Tree"); - fontEnd(); - navCellEnd(); - } -diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java ---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java -+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java -@@ -160,7 +160,7 @@ - */ - protected void printAllClassesTableHeader() { - fontSizeStyle("+1", "FrameHeadingFont"); -- boldText("doclet.All_Classes"); -+ strongText("doclet.All_Classes"); - fontEnd(); - br(); - table(); -diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java ---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java -+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java -@@ -65,7 +65,7 @@ - public void writeDefaultValueInfo(MemberDoc member) { - writer.dl(); - writer.dt(); -- writer.bold(ConfigurationImpl.getInstance(). -+ writer.strong(ConfigurationImpl.getInstance(). - getText("doclet.Default")); - writer.dd(); - writer.print(((AnnotationTypeElementDoc) member).defaultValue()); -@@ -84,7 +84,7 @@ - * {@inheritDoc} - */ - public void printSummaryLabel(ClassDoc cd) { -- writer.boldText("doclet.Annotation_Type_Optional_Member_Summary"); -+ writer.strongText("doclet.Annotation_Type_Optional_Member_Summary"); - } - - /** -diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java ---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java -+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java -@@ -131,7 +131,7 @@ - if (configuration().linksource) { - writer.printSrcLink(member, member.name()); - } else { -- bold(member.name()); -+ strong(member.name()); - } - writer.preEnd(); - writer.dl(); -@@ -183,7 +183,7 @@ - * {@inheritDoc} - */ - public void printSummaryLabel(ClassDoc cd) { -- writer.boldText("doclet.Annotation_Type_Required_Member_Summary"); -+ writer.strongText("doclet.Annotation_Type_Required_Member_Summary"); - } - - /** -@@ -210,9 +210,9 @@ - * {@inheritDoc} - */ - protected void writeSummaryLink(int context, ClassDoc cd, ProgramElementDoc member) { -- writer.bold(); -+ writer.strong(); - writer.printDocLink(context, (MemberDoc) member, member.name(), false); -- writer.boldEnd(); -+ writer.strongEnd(); - } - - /** -diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java ---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java -+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java -@@ -84,7 +84,7 @@ - protected void navLinkClass() { - navCellRevStart(); - fontStyle("NavBarFont1Rev"); -- boldText("doclet.Class"); -+ strongText("doclet.Class"); - fontEnd(); - navCellEnd(); - } -@@ -176,7 +176,7 @@ - if (configuration().linksource) { - printSrcLink(annotationType, name); - } else { -- bold(name); -+ strong(name); - } - dlEnd(); - preEnd(); -@@ -220,7 +220,7 @@ - hr(); - Tag[] deprs = annotationType.tags("deprecated"); - if (Util.isDeprecated(annotationType)) { -- boldText("doclet.Deprecated"); -+ strongText("doclet.Deprecated"); - if (deprs.length > 0) { - Tag[] commentTags = deprs[0].inlineTags(); - if (commentTags.length > 0) { -@@ -330,9 +330,9 @@ - dl(); - dt(); - if (annotationType.isInterface()) { -- boldText("doclet.Enclosing_Interface"); -+ strongText("doclet.Enclosing_Interface"); - } else { -- boldText("doclet.Enclosing_Class"); -+ strongText("doclet.Enclosing_Class"); - } - dd(); - printLink(new LinkInfoImpl(LinkInfoImpl.CONTEXT_CLASS, outerClass, -diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java ---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java -+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java -@@ -394,7 +394,7 @@ - hr(); - center(); - h2(); -- boldText("doclet.ClassUse_Title", cltype, clname); -+ strongText("doclet.ClassUse_Title", cltype, clname); - h2End(); - centerEnd(); - } -@@ -436,7 +436,7 @@ - protected void navLinkClassUse() { - navCellRevStart(); - fontStyle("NavBarFont1Rev"); -- boldText("doclet.navClassUse"); -+ strongText("doclet.navClassUse"); - fontEnd(); - navCellEnd(); - } -diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java b/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java ---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java -+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java -@@ -91,7 +91,7 @@ - protected void navLinkClass() { - navCellRevStart(); - fontStyle("NavBarFont1Rev"); -- boldText("doclet.Class"); -+ strongText("doclet.Class"); - fontEnd(); - navCellEnd(); - } -@@ -185,7 +185,7 @@ - if (configuration().linksource) { - printSrcLink(classDoc, name); - } else { -- bold(name); -+ strong(name); - } - if (!isInterface) { - Type superclass = Util.getFirstVisibleSuperClass(classDoc, -@@ -258,7 +258,7 @@ - hr(); - Tag[] deprs = classDoc.tags("deprecated"); - if (Util.isDeprecated(classDoc)) { -- boldText("doclet.Deprecated"); -+ strongText("doclet.Deprecated"); - if (deprs.length > 0) { - Tag[] commentTags = deprs[0].inlineTags(); - if (commentTags.length > 0) { -@@ -307,9 +307,9 @@ - classDoc, false)); - if (configuration.shouldExcludeQualifier( - classDoc.containingPackage().name())) { -- bold(type.asClassDoc().name() + typeParameters); -+ strong(type.asClassDoc().name() + typeParameters); - } else { -- bold(type.asClassDoc().qualifiedName() + typeParameters); -+ strong(type.asClassDoc().qualifiedName() + typeParameters); - } - } else { - print(getLink(new LinkInfoImpl(LinkInfoImpl.CONTEXT_CLASS_TREE_PARENT, -@@ -359,7 +359,7 @@ - if (subclasses.size() > 0) { - dl(); - dt(); -- boldText("doclet.Subclasses"); -+ strongText("doclet.Subclasses"); - writeClassLinks(LinkInfoImpl.CONTEXT_SUBCLASSES, - subclasses); - } -@@ -375,7 +375,7 @@ - if (subInterfaces.size() > 0) { - dl(); - dt(); -- boldText("doclet.Subinterfaces"); -+ strongText("doclet.Subinterfaces"); - writeClassLinks(LinkInfoImpl.CONTEXT_SUBINTERFACES, - subInterfaces); - } -@@ -397,7 +397,7 @@ - if (implcl.size() > 0) { - dl(); - dt(); -- boldText("doclet.Implementing_Classes"); -+ strongText("doclet.Implementing_Classes"); - writeClassLinks(LinkInfoImpl.CONTEXT_IMPLEMENTED_CLASSES, - implcl); - } -@@ -413,7 +413,7 @@ - if (classDoc.isClass() && interfaceArray.size() > 0) { - dl(); - dt(); -- boldText("doclet.All_Implemented_Interfaces"); -+ strongText("doclet.All_Implemented_Interfaces"); - writeClassLinks(LinkInfoImpl.CONTEXT_IMPLEMENTED_INTERFACES, - interfaceArray); - } -@@ -429,7 +429,7 @@ - if (classDoc.isInterface() && interfaceArray.size() > 0) { - dl(); - dt(); -- boldText("doclet.All_Superinterfaces"); -+ strongText("doclet.All_Superinterfaces"); - writeClassLinks(LinkInfoImpl.CONTEXT_SUPER_INTERFACES, - interfaceArray); - } -@@ -570,9 +570,9 @@ - dl(); - dt(); - if (outerClass.isInterface()) { -- boldText("doclet.Enclosing_Interface"); -+ strongText("doclet.Enclosing_Interface"); - } else { -- boldText("doclet.Enclosing_Class"); -+ strongText("doclet.Enclosing_Class"); - } - dd(); - printLink(new LinkInfoImpl(LinkInfoImpl.CONTEXT_CLASS, outerClass, -diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java b/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java ---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java -+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java -@@ -92,7 +92,7 @@ - * {@inheritDoc} - */ - public void writeContentsHeader() { -- bold(configuration.getText("doclet.Contents")); -+ strong(configuration.getText("doclet.Contents")); - ul(); - } - -diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java b/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java ---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java -+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java -@@ -144,7 +144,7 @@ - if (configuration().linksource) { - writer.printSrcLink(constructor, constructor.name()); - } else { -- bold(constructor.name()); -+ strong(constructor.name()); - } - writeParameters(constructor); - writeExceptions(constructor); -@@ -220,7 +220,7 @@ - } - - public void printSummaryLabel(ClassDoc cd) { -- writer.boldText("doclet.Constructor_Summary"); -+ writer.strongText("doclet.Constructor_Summary"); - } - - public void printSummaryAnchor(ClassDoc cd) { -diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java ---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java -+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java -@@ -111,7 +111,7 @@ - throws IOException { - writeHeader(); - -- bold(configuration.getText("doclet.Contents")); -+ strong(configuration.getText("doclet.Contents")); - ul(); - for (int i = 0; i < DeprecatedAPIListBuilder.NUM_TYPES; i++) { - writeIndexLink(deprapi, i); -@@ -156,7 +156,7 @@ - hr(); - center(); - h2(); -- boldText("doclet.Deprecated_API"); -+ strongText("doclet.Deprecated_API"); - h2End(); - centerEnd(); - -@@ -180,7 +180,7 @@ - protected void navLinkDeprecated() { - navCellRevStart(); - fontStyle("NavBarFont1Rev"); -- boldText("doclet.navDeprecated"); -+ strongText("doclet.navDeprecated"); - fontEnd(); - navCellEnd(); - } -diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java b/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java From plugwash at p10link.net Thu Aug 8 12:49:10 2013 From: plugwash at p10link.net (peter green) Date: Thu, 08 Aug 2013 20:49:10 +0100 Subject: Problems with openjdk crash when building eclipse for raspbian and possiblly debian armhf Message-ID: <5203F636.6060309@p10link.net> I maintain a debian derivative called raspbian which aims to rebuild debian for the raspberry pi and other armv6 hardware (though other than the Pi there doesn't seem to be much popular armv6 hardware arround). Note that while we target armv6 hardware we use armv7 hardware for our build machines. Recently i've been trying to build eclipse for raspbian jessie and getting errors like. post.compile. at dot: init: # # A fatal error has been detected by the Java Runtime Environment: # # Internal Error (os_linux_zero.cpp:285), pid=29049, tid=1092191344 # fatal error: caught unhandled signal 11 # # JRE version: 7.0_25-b30 # Java VM: OpenJDK Zero VM (23.7-b01 mixed mode linux-arm ) # 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: # /eclipse-3.8.1/hs_err_pid29049.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 # dh_auto_build: ant provision.cvs died with signal 6 make[1]: *** [override_dh_auto_build] Error 2 make[1]: Leaving directory `/eclipse-3.8.1' make: *** [build] Error 2 dpkg-buildpackage: error: debian/rules build gave error exit status 2 root at plugwash:/eclipse-3.8.1# That particular error is from an attempt with an openjdk-7 package based on the latest version in debian sid with a minor patch to stop it setting off our armv7 contamination checker (versioned as 7u25-2.3.12-1+rpi1)but i've also had similar failures with older versions of openjdk-7 and with openjdk-6. I've also seen similar issues over in debian sid. The most recent eclipse upload succeeded but the previous two failed so I'm not sure if that was a fluke. There don't appear to have been any relavent changes to the eclipse package in the most recent upload and previous versions that failed. Anyone have any thoughts on this? -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: hs_err_pid29049.log Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130808/ba15197c/hs_err_pid29049.log From andrew at icedtea.classpath.org Fri Aug 9 04:21:57 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 09 Aug 2013 11:21:57 +0000 Subject: /hg/release/icedtea7-forest-2.3: 62 new changesets Message-ID: changeset 412afd871a67 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=412afd871a67 author: katleman date: Fri Aug 17 11:58:00 2012 -0700 Added tag jdk7u6-b31 for changeset 43775eae8df6 changeset f27dbede2b43 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=f27dbede2b43 author: asaha date: Thu Sep 13 18:15:15 2012 -0700 Merge changeset 81f8b620894e in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=81f8b620894e author: asaha date: Fri Oct 12 12:32:06 2012 -0700 Merge changeset 933d424580f9 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=933d424580f9 author: katleman date: Fri Mar 01 11:55:08 2013 -0800 Added tag jdk7u17-b02 for changeset 8e49ff2feda3 changeset 0201e35d7311 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=0201e35d7311 author: katleman date: Thu Feb 07 14:19:51 2013 -0800 Added tag jdk7u21-b01 for changeset 527d3cf769ec changeset bc264b362dc7 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=bc264b362dc7 author: ewendeli date: Mon Feb 11 21:05:57 2013 +0100 Merge changeset 20603c659295 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=20603c659295 author: katleman date: Thu Feb 14 14:10:47 2013 -0800 Added tag jdk7u21-b02 for changeset bc264b362dc7 changeset 18be0eedaa4f in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=18be0eedaa4f author: katleman date: Tue Feb 19 17:13:10 2013 -0800 Added tag jdk7u21-b03 for changeset 20603c659295 changeset ab9dea896baa in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=ab9dea896baa author: ohair date: Thu May 10 08:26:26 2012 -0700 7167593: Changed get_source.sh to allow for getting full oracle jdk repo forest Reviewed-by: erikj, asaha, chegar, sla, dholmes, mbykov, coleenp changeset a2d8b628b24b in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=a2d8b628b24b author: ohair date: Fri May 11 17:52:57 2012 -0700 7167976: Fix broken get_source.sh script Reviewed-by: tbell changeset dd037cebb1da in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=dd037cebb1da author: ohair date: Fri Jun 08 17:25:46 2012 -0700 7170091: Fix missing wait between repo cloning in hgforest.sh Reviewed-by: strarup changeset d2b1fdd8ee0a in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=d2b1fdd8ee0a author: ohair date: Mon Jul 16 11:37:13 2012 -0700 7184406: Adjust get_source/hgforest script to allow for trailing // characters Reviewed-by: tbell changeset df8768f7e1a4 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=df8768f7e1a4 author: katleman date: Tue Feb 26 12:44:51 2013 -0800 Added tag jdk7u21-b04 for changeset d2b1fdd8ee0a changeset d247cdeb828f in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=d247cdeb828f author: katleman date: Tue Oct 16 14:54:17 2012 -0700 Added tag jdk7u9-b31 for changeset 81f8b620894e changeset 701b88b298ca in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=701b88b298ca author: katleman date: Wed Oct 31 10:10:17 2012 -0700 Added tag jdk7u9-b32 for changeset d247cdeb828f changeset bfa3eca34a8c in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=bfa3eca34a8c author: asaha date: Tue Dec 04 11:38:26 2012 -0800 Merge changeset 337ce65c8c35 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=337ce65c8c35 author: asaha date: Wed Dec 05 15:22:05 2012 -0800 Merge changeset df3d89e37fa0 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=df3d89e37fa0 author: katleman date: Fri Dec 07 08:18:53 2012 -0800 Added tag jdk7u10-b31 for changeset 337ce65c8c35 changeset 7c0710ed65b0 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=7c0710ed65b0 author: ewendeli date: Tue Jan 15 08:20:58 2013 +0100 Merge changeset 61cee7a518a4 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=61cee7a518a4 author: katleman date: Wed Jan 16 13:56:59 2013 -0800 Added tag jdk7u11-b32 for changeset 7c0710ed65b0 changeset 450ec9324779 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=450ec9324779 author: katleman date: Tue Jan 29 14:10:09 2013 -0800 Added tag jdk7u11-b33 for changeset 61cee7a518a4 changeset 842639ef7d4d in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=842639ef7d4d author: asaha date: Fri Feb 08 19:09:38 2013 -0800 Merge changeset 5c1b2900a65b in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=5c1b2900a65b author: asaha date: Mon Feb 11 11:13:27 2013 -0800 Merge changeset c90cc9883460 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=c90cc9883460 author: katleman date: Tue Feb 12 12:32:26 2013 -0800 Added tag jdk7u15-b31 for changeset 5c1b2900a65b changeset e7adbfbcd837 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=e7adbfbcd837 author: asaha date: Thu Feb 14 13:17:03 2013 -0800 Merge changeset 769634fc19c3 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=769634fc19c3 author: katleman date: Tue Feb 19 12:02:51 2013 -0800 Added tag jdk7u15-b33 for changeset e7adbfbcd837 changeset 617616a02705 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=617616a02705 author: asaha date: Fri Mar 01 16:05:40 2013 -0800 Merge changeset b9bb888ef4e5 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=b9bb888ef4e5 author: cl date: Sat Mar 02 09:47:23 2013 -0800 Added tag jdk7u17-b30 for changeset 933d424580f9 changeset 790582955edb in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=790582955edb author: asaha date: Sat Mar 02 14:33:28 2013 -0800 Merge changeset 941539a9f644 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=941539a9f644 author: cl date: Sat Mar 02 18:53:53 2013 -0800 Added tag jdk7u17-b31 for changeset 790582955edb changeset 2d6657f92359 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=2d6657f92359 author: asaha date: Mon Mar 04 10:34:06 2013 -0800 Merge changeset 14522481739d in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=14522481739d author: katleman date: Tue Mar 05 16:45:01 2013 -0800 Added tag jdk7u21-b05 for changeset 2d6657f92359 changeset 0df382e8c17b in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=0df382e8c17b author: katleman date: Tue Mar 12 14:43:56 2013 -0700 Added tag jdk7u21-b06 for changeset 14522481739d changeset 1aff32a21aba in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=1aff32a21aba author: katleman date: Tue Mar 19 14:33:20 2013 -0700 Added tag jdk7u21-b07 for changeset 0df382e8c17b changeset a2e0099b4cf7 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=a2e0099b4cf7 author: katleman date: Wed Mar 20 14:47:06 2013 -0700 Added tag jdk7u21-b08 for changeset 1aff32a21aba changeset 602ad1a5b09f in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=602ad1a5b09f author: katleman date: Tue Mar 26 15:00:04 2013 -0700 Added tag jdk7u21-b09 for changeset a2e0099b4cf7 changeset fa322ca37832 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=fa322ca37832 author: katleman date: Sun Mar 31 03:46:21 2013 -0700 Added tag jdk7u21-b10 for changeset 602ad1a5b09f changeset 450e8dde919d in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=450e8dde919d author: katleman date: Thu Apr 04 15:47:56 2013 -0700 Added tag jdk7u21-b11 for changeset fa322ca37832 changeset 170520883597 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=170520883597 author: katleman date: Fri Apr 05 12:48:37 2013 -0700 Added tag jdk7u21-b30 for changeset 450e8dde919d changeset 83925fc0e910 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=83925fc0e910 author: katleman date: Sun Apr 07 16:34:45 2013 -0700 Added tag jdk7u21-b12 for changeset 170520883597 changeset 15f63bdeb041 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=15f63bdeb041 author: katleman date: Tue Mar 12 14:45:04 2013 -0700 Added tag jdk7u25-b01 for changeset df8768f7e1a4 changeset 21289816b9dd in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=21289816b9dd author: katleman date: Tue Mar 19 14:31:12 2013 -0700 Added tag jdk7u25-b02 for changeset 15f63bdeb041 changeset 50bfbd21bf42 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=50bfbd21bf42 author: coffeys date: Thu Mar 21 22:28:45 2013 +0000 Merge changeset a94c9aa356bb in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=a94c9aa356bb author: katleman date: Tue Mar 26 14:17:31 2013 -0700 Added tag jdk7u25-b03 for changeset 50bfbd21bf42 changeset d2153eb0d2f5 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=d2153eb0d2f5 author: katleman date: Tue Apr 02 12:11:52 2013 -0700 Added tag jdk7u25-b04 for changeset a94c9aa356bb changeset 575cc17424d2 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=575cc17424d2 author: coffeys date: Fri Apr 05 21:33:22 2013 +0100 Merge changeset c254ab44bd14 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=c254ab44bd14 author: katleman date: Mon Mar 04 14:17:07 2013 -0800 Added tag jdk7u17-b32 for changeset 941539a9f644 changeset 9e433dafde35 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=9e433dafde35 author: asaha date: Mon Apr 08 15:40:23 2013 -0700 Merge changeset 29a789ae14dc in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=29a789ae14dc author: asaha date: Mon Apr 08 16:25:00 2013 -0700 Merge changeset 8a7c657b7536 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=8a7c657b7536 author: katleman date: Wed Apr 10 12:42:38 2013 -0700 Added tag jdk7u25-b05 for changeset 29a789ae14dc changeset d45374e7c7ee in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=d45374e7c7ee author: katleman date: Tue Apr 16 11:27:51 2013 -0700 Added tag jdk7u25-b06 for changeset 8a7c657b7536 changeset b01002577912 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=b01002577912 author: katleman date: Thu Apr 18 11:44:13 2013 -0700 Added tag jdk7u25-b07 for changeset d45374e7c7ee changeset 84285f4e0aa2 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=84285f4e0aa2 author: katleman date: Tue Apr 23 16:19:54 2013 -0700 Added tag jdk7u25-b08 for changeset b01002577912 changeset aae1e27d347b in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=aae1e27d347b author: katleman date: Tue Apr 30 12:24:55 2013 -0700 Added tag jdk7u25-b09 for changeset 84285f4e0aa2 changeset 039f12124903 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=039f12124903 author: katleman date: Tue May 07 12:56:03 2013 -0700 Added tag jdk7u25-b10 for changeset aae1e27d347b changeset 2d0251896005 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=2d0251896005 author: katleman date: Wed May 15 13:30:30 2013 -0700 Added tag jdk7u25-b11 for changeset 039f12124903 changeset 37c4268341d7 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=37c4268341d7 author: katleman date: Wed May 22 15:44:42 2013 -0700 Added tag jdk7u25-b12 for changeset 2d0251896005 changeset 9de1fc3635de in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=9de1fc3635de author: katleman date: Fri May 24 16:20:21 2013 -0700 Added tag jdk7u25-b13 for changeset 37c4268341d7 changeset 2197dde87712 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=2197dde87712 author: katleman date: Tue Jun 04 10:47:26 2013 -0700 Added tag jdk7u25-b14 for changeset 9de1fc3635de changeset 9846c505054f in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=9846c505054f author: katleman date: Thu Jun 06 11:41:26 2013 -0700 Added tag jdk7u25-b15 for changeset 2197dde87712 changeset 12c2f4ce55d0 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=12c2f4ce55d0 author: katleman date: Tue Jun 11 11:45:08 2013 -0700 Added tag jdk7u25-b30 for changeset 9846c505054f changeset 2ce335eb4926 in /hg/release/icedtea7-forest-2.3 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=2ce335eb4926 author: andrew date: Thu Aug 08 23:20:11 2013 +0100 Merge jdk7u25-b16 diffstat: .hgtags | 104 +++++++++++++++++++++++++++++++++++++++++++++++ .jcheck/conf | 2 - get_source.sh | 4 +- make/Defs-internal.gmk | 3 +- make/scripts/hgforest.sh | 72 +++++++++++++++++++++++++------- 5 files changed, 164 insertions(+), 21 deletions(-) diffs (335 lines): diff -r 43775eae8df6 -r 2ce335eb4926 .hgtags --- a/.hgtags Mon Aug 13 14:19:44 2012 -0700 +++ b/.hgtags Thu Aug 08 23:20:11 2013 +0100 @@ -50,6 +50,7 @@ 3ac6dcf7823205546fbbc3d4ea59f37358d0b0d4 jdk7-b73 2c88089b6e1c053597418099a14232182c387edc jdk7-b74 d1516b9f23954b29b8e76e6f4efc467c08c78133 jdk7-b75 +f0bfd9bd1a0e674288a8a4d17dcbb9e632b42e6d icedtea7-1.12 c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76 1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77 ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78 @@ -63,6 +64,7 @@ 433a60a9c0bf1b26ee7e65cebaa89c541f497aed jdk7-b86 6b1069f53fbc30663ccef49d78c31bb7d6967bde jdk7-b87 82135c848d5fcddb065e98ae77b81077c858f593 jdk7-b88 +195fcceefddce1963bb26ba32920de67806ed2db icedtea7-1.13 7f1ba4459972bf84b8201dc1cc4f62b1fe1c74f4 jdk7-b89 425ba3efabbfe0b188105c10aaf7c3c8fa8d1a38 jdk7-b90 97d8b6c659c29c8493a8b2b72c2796a021a8cf79 jdk7-b91 @@ -111,6 +113,7 @@ ddc2fcb3682ffd27f44354db666128827be7e3c3 jdk7-b134 783bd02b4ab4596059c74b10a1793d7bd2f1c157 jdk7-b135 2fe76e73adaa5133ac559f0b3c2c0707eca04580 jdk7-b136 +d4aea1a51d625f5601c840714c7c94f1de5bc1af icedtea-1.14 7654afc6a29e43cb0a1343ce7f1287bf690d5e5f jdk7-b137 fc47c97bbbd91b1f774d855c48a7e285eb1a351a jdk7-b138 7ed6d0b9aaa12320832a7ddadb88d6d8d0dda4c1 jdk7-b139 @@ -123,6 +126,7 @@ 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146 3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01 d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147 +3defd24c2671eb2e7796b5dc45b98954341d73a7 icedtea-2.0-branchpoint 34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02 bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03 f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04 @@ -141,6 +145,7 @@ b2deaf5bde5ec455a06786e8e2aea2e673be13aa jdk7u2-b12 c95558e566ac3605c480a3d070b1102088dab07f jdk7u2-b13 e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u2-b21 +a66b58021165f5a43e3974fe5fb9fead29824098 icedtea-2.1-branchpoint e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u3-b02 becd013ae6072a6633ba015fc4f5862fca589cee jdk7u3-b03 d64361a28584728aa25dca3781cffbaf4199e088 jdk7u3-b04 @@ -157,6 +162,7 @@ 2b07c262a8a9ff78dc908efb9d7b3bb099df9ac4 jdk7u4-b10 1abfee16e8cc7e3950052befa78dbf14a5ca9cfc jdk7u4-b11 e6f915094dccbba16df6ebeb002e6867392eda40 jdk7u4-b12 +e7886f5ad6cc837092386fa513e670d4a770456c icedtea-2.2-branchpoint 9108e3c2f07ffa218641d93893ac9928e95d213a jdk7u4-b13 d9580838fd08872fc0da648ecfc6782704b4aac1 jdk7u4-b14 008753000680a2008175d14b25373356f531aa07 jdk7u4-b15 @@ -191,6 +197,7 @@ 528f1589f5f2adf18d5d21384ba668b9aa79841e jdk7u6-b15 7b77364eb09faac4c37ce9dd2c2308ca5525f18f jdk7u6-b16 b7c1b441d131c70278de299b5d1e59dce0755dc5 jdk7u6-b17 +0e7b94bd450d4270d4e9bd6c040c94fa4be714a6 icedtea-2.3-branchpoint 9c41f7b1460b106d18676899d24b6ea07de5a369 jdk7u6-b18 56291720b5e578046bc02761dcad2a575f99fd8e jdk7u6-b19 e79fa743fe5a801db4acc7a7daa68f581423e5d3 jdk7u6-b20 @@ -199,3 +206,100 @@ d1c709f1196a73d1df10d04a221b10e30fd2eb48 jdk7u6-b23 e4def733cc8c58e83b7cefa7edd89a3e2b793520 jdk7u6-b24 f5f546dba006778854e7a81141fc1b44acd257a4 jdk7u6-b30 +dda13866dd2855c304ba3801194f7ca3cffc3535 icedtea-2.3 +2783cace584cbfa3ed52774185859faf41569f8e icedtea-2.3.1 +a3fa5d49d528c32ad5d4b49e7241696a672ffe18 icedtea-2.3.2 +acba2d30209d19a87dbc0d2a6e366f09f01a210d icedtea-2.3.3 +301e79a966b4627af0113e30f65409baf9ebf1ce icedtea-2.3.4 +8bd8e70d4a032ea3d3642b247dddc0882850ebe0 icedtea-2.3.5 +02128561d696aaaa1a12b0ebfad2580cbbe04b87 icedtea-2.3.6 +02128561d696aaaa1a12b0ebfad2580cbbe04b87 icedtea-2.3.6 +0000000000000000000000000000000000000000 icedtea-2.3.6 +43775eae8df6c874fb3631c86009505cf3821b1f jdk7u6-b31 +43775eae8df6c874fb3631c86009505cf3821b1f jdk7u7-b10 +a380c75873bfb578e605d4362edb18c08698cc3e jdk7u7-b30 +d7f2b3949f9c9ff1115ea61c496d3cd4c62e2759 jdk7u7-b11 +82c51e6a3bea0dd8feb1bd3033e847dbdc5d9f99 jdk7u7-b31 +5ca487420f9c2cf6d39acf1e842d13bf8ef0ca07 jdk7u7-b01 +dbfa9c57853c2dd9cd4e4a139d83b519573d8031 jdk7u7-b02 +bae912f95f2aa1d22dbc0ff62816b71861965cd6 jdk7u9-b03 +0000000000000000000000000000000000000000 jdk7u7-b01 +5ca487420f9c2cf6d39acf1e842d13bf8ef0ca07 jdk7u9-b01 +0000000000000000000000000000000000000000 jdk7u7-b02 +dbfa9c57853c2dd9cd4e4a139d83b519573d8031 jdk7u9-b02 +3159fbe20e2d9501007aae8ca3db58978d754561 jdk7u9-b04 +d9c8fa0606fdfff242175ce904c525a6fc40d6e5 jdk7u9-b05 +81f8b620894e275012a1b447f13319b7d2148b28 jdk7u9-b31 +d247cdeb828f4463b55ea53c4b2d6346f7706c3c jdk7u9-b32 +d934ce27cddbc9ba7236791f177872491204a41e jdk7u10-b10 +5a5ee5b70d563d5817b6ec023d275e9b17256459 jdk7u10-b11 +48b58c2d665c9a1d3598b981e46f87f9bcdd5b46 jdk7u10-b12 +1b9618b61e29c09b92f83956c613acf36ccabb38 jdk7u10-b13 +c50e1a044e4fcc1a94b79b42f3629beb07624010 jdk7u10-b14 +137087461db28f935493940658f31be760098f00 jdk7u10-b15 +c8a37a49fc90ae31b864544d6d4a9f6137d4995d jdk7u10-b16 +494e838439db7f0f4e36f7dcfeba06d2bef78c8d jdk7u10-b17 +dce9058d2151e6b5c84898c13cfd1521a627a296 jdk7u10-b18 +b5fb925394331313dbe3859fdc408bfd37193476 jdk7u10-b30 +337ce65c8c356766212812b78f49f5632995987d jdk7u10-b31 +c2d5141baeda6c9b5bbc83c21eff9c3940fefae4 jdk7u11-b20 +168aa0f1417b3651a955ae66068dc148b660f829 jdk7u11-b21 +7c0710ed65b097d415f772ff4fb58c4822890aa3 jdk7u11-b32 +61cee7a518a4ae05439490ec388c3ab1d1d899f2 jdk7u11-b33 +c8a37a49fc90ae31b864544d6d4a9f6137d4995d jdk7u11-b03 +0b418e2ccf9093718609144689d1a8b316ad951f jdk7u11-b04 +e127e6c94b56f7348df67d9672c16a7dc9c5ec5e jdk7u11-b05 +f6abff072aabfee866342d9f7f4aac7d13450ddf jdk7u11-b06 +80a3d0bcd3d4c9e83b75416178bdd60a2d23ebbc jdk7u11-b07 +e7c55def6796d3c426631b5717084ef122908847 jdk7u11-b08 +2412f7b8551ede5296cb6e1d6189f40aad9eeffe jdk7u13-b09 +0000000000000000000000000000000000000000 icedtea-2.3.6 +0e569b50110e197ae20f7b8ef0a26e41f987fee6 icedtea-2.3.6 +dd8d1a8f222f0e93db652cd5127644ab737eef5d icedtea-2.3.7 +506161df1c48a9c9f7f0d8db7108a0b1ab83493b icedtea-2.3.8 +3b7815df113f8044039739276237b964ee8fa015 jdk7u13-b10 +527d3cf769ec073d7348e4c31f97c47c943c96b6 jdk7u13-b30 +3b7815df113f8044039739276237b964ee8fa015 jdk7u13-b20 +0e52db2d9bb8bc789f6c66f2cfb7cd2d3b0b16c6 jdk7u15-b01 +0324fca94d073b3aad77658224f17679f25c18b1 jdk7u15-b02 +25a9d44cebf2a7ac6dd1748c94e00b242403acb1 jdk7u15-b30 +5c1b2900a65b5ebe9d2a5c9b48903081c8196b04 jdk7u15-b31 +e7adbfbcd837ad4e9f88db45612e5704b7a249fd jdk7u15-b33 +f37a75bd39595ba38bdc53ee957c63bbb3cbb12d jdk7u15-b03 +2412f7b8551ede5296cb6e1d6189f40aad9eeffe jdk7u15-b32 +0c2b2dae93e7a720bbcc2e13a1913a2264335554 jdk7u17-b01 +12b96a57263c1215818f4d1abfb6dc8b4bc6b436 icedtea-2.3.9 +fb1ac57ada6c9de6313982f0ab63276547b8819b icedtea-2.3.10 +f143f229bd127586e9553378c115136f461e58c2 icedtea-2.3.11 +e62743867f54fd52b397541a266cc1c35f25ee3c icedtea-2.3.12 +8e49ff2feda30801d7826ca1778eb7b901a7089c jdk7u17-b02 +933d424580f967ed11eda2bbfd690f985a72df6e jdk7u17-b30 +790582955edb617b41abbc73cf82544dbf8c1d97 jdk7u17-b31 +941539a9f6441f053e8e7f31064944b2fc08879f jdk7u17-b32 +527d3cf769ec073d7348e4c31f97c47c943c96b6 jdk7u21-b01 +bc264b362dc7b4f2bda34e1a5b87a4f0c2bd4d82 jdk7u21-b02 +20603c659295a40c7f16259cb08c91475092efed jdk7u21-b03 +d2b1fdd8ee0affe640c7493ab3ae04fcc1961446 jdk7u21-b04 +2d6657f92359d1d46b355fd0c99b8aa5f34832e4 jdk7u21-b05 +14522481739dc6981beb5cc55d543dcc62cda067 jdk7u21-b06 +0df382e8c17bf817d55fc8759c7f5c9e9d0337f0 jdk7u21-b07 +1aff32a21aba64c3767e9a72ebf1b8ba490e99ec jdk7u21-b08 +a2e0099b4cf70be026a7a0ba7918fcd71d57fdce jdk7u21-b09 +602ad1a5b09fb9136e8bf1b708e0524fbdb35324 jdk7u21-b10 +fa322ca378324750ea049f2e92357e51eca27ae4 jdk7u21-b11 +450e8dde919df278fe75ae95e0eb0a6464f5bc41 jdk7u21-b30 +170520883597f90771aca8251a8d089e7566e4bf jdk7u21-b12 +50bfbd21bf42f6ae4167226ac45cd79e0ab7758c jdk7u25-b03 +a94c9aa356bbed13c1e2b4a9a380117ddff1668f jdk7u25-b04 +29a789ae14dc09a50eb45d3445075642e77490a2 jdk7u25-b05 +8a7c657b7536006633b5e961d93e2173712a64fa jdk7u25-b06 +d45374e7c7eeb4e01d9f239e71e8a8aff453d55a jdk7u25-b07 +b01002577912b89306e88a9973b6f3bc049a2a69 jdk7u25-b08 +84285f4e0aa2f81b80bc6fbe713d768c0d9a7156 jdk7u25-b09 +aae1e27d347b71f65f548c12b918ede98d869b7c jdk7u25-b10 +039f12124903cd0b7633a17a26f6ca281f7aaeae jdk7u25-b11 +2d02518960053d2b1dcb9aabacd709788e92c549 jdk7u25-b12 +37c4268341d79b16165bdaf7e1fad489d692bc83 jdk7u25-b13 +9de1fc3635def64c19c51f272f09b51d8cf0ca98 jdk7u25-b14 +2197dde877124579204c5266fa9d89166760b44f jdk7u25-b15 +9846c505054fb91762f3fd9b817d1a9760322029 jdk7u25-b30 diff -r 43775eae8df6 -r 2ce335eb4926 .jcheck/conf --- a/.jcheck/conf Mon Aug 13 14:19:44 2012 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 43775eae8df6 -r 2ce335eb4926 get_source.sh --- a/get_source.sh Mon Aug 13 14:19:44 2012 -0700 +++ b/get_source.sh Thu Aug 08 23:20:11 2013 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2012, 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,7 @@ # # Get clones of all nested repositories -sh ./make/scripts/hgforest.sh clone +sh ./make/scripts/hgforest.sh clone $* # Update all existing repositories to the latest sources sh ./make/scripts/hgforest.sh pull -u diff -r 43775eae8df6 -r 2ce335eb4926 make/Defs-internal.gmk --- a/make/Defs-internal.gmk Mon Aug 13 14:19:44 2012 -0700 +++ b/make/Defs-internal.gmk Thu Aug 08 23:20:11 2013 +0100 @@ -322,7 +322,8 @@ JDK_MICRO_VERSION=$(JDK_MICRO_VERSION) \ PREVIOUS_MAJOR_VERSION=$(PREVIOUS_MAJOR_VERSION) \ PREVIOUS_MINOR_VERSION=$(PREVIOUS_MINOR_VERSION) \ - PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION) + PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION) \ + STATIC_CXX=$(STATIC_CXX) ifdef ARCH_DATA_MODEL COMMON_BUILD_ARGUMENTS += ARCH_DATA_MODEL=$(ARCH_DATA_MODEL) diff -r 43775eae8df6 -r 2ce335eb4926 make/scripts/hgforest.sh --- a/make/scripts/hgforest.sh Mon Aug 13 14:19:44 2012 -0700 +++ b/make/scripts/hgforest.sh Thu Aug 08 23:20:11 2013 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2012, 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 @@ -24,6 +24,8 @@ # # Shell script for a fast parallel forest command +command="$1" +pull_extra_base="$2" tmp=/tmp/forest.$$ rm -f -r ${tmp} @@ -35,40 +37,58 @@ # Only look in specific locations for possible forests (avoids long searches) pull_default="" -if [ "$1" = "clone" -o "$1" = "fclone" ] ; then +repos="" +repos_extra="" +if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then subrepos="corba jaxp jaxws langtools jdk hotspot" if [ -f .hg/hgrc ] ; then pull_default=`hg paths default` + if [ "${pull_default}" = "" ] ; then + echo "ERROR: Need initial clone with 'hg paths default' defined" + exit 1 + fi fi if [ "${pull_default}" = "" ] ; then - echo "ERROR: Need initial clone with 'hg paths default' defined" + echo "ERROR: Need initial repository to use this script" exit 1 fi - repos="" for i in ${subrepos} ; do if [ ! -f ${i}/.hg/hgrc ] ; then repos="${repos} ${i}" fi done + if [ "${pull_extra_base}" != "" ] ; then + subrepos_extra="jdk/src/closed jdk/make/closed jdk/test/closed hotspot/src/closed hotspot/test/closed deploy install sponsors pubs" + pull_default_tail=`echo ${pull_default} | sed -e 's@^.*://[^/]*/\(.*\)@\1@'` + pull_extra="${pull_extra_base}/${pull_default_tail}" + for i in ${subrepos_extra} ; do + if [ ! -f ${i}/.hg/hgrc ] ; then + repos_extra="${repos_extra} ${i}" + fi + done + fi at_a_time=2 + # Any repos to deal with? + if [ "${repos}" = "" -a "${repos_extra}" = "" ] ; then + echo "No repositories to clone." + exit + fi else hgdirs=`ls -d ./.hg ./*/.hg ./*/*/.hg ./*/*/*/.hg ./*/*/*/*/.hg 2>/dev/null` # Derive repository names from the .hg directory locations - repos="" for i in ${hgdirs} ; do repos="${repos} `echo ${i} | sed -e 's@/.hg$@@'`" done at_a_time=8 + # Any repos to deal with? + if [ "${repos}" = "" ] ; then + echo "No repositories to process." + exit + fi fi -# Any repos to deal with? -if [ "${repos}" = "" ] ; then - echo "No repositories to process." - exit -fi - -# Echo out what repositories we will process -echo "# Repos: ${repos}" +# Echo out what repositories we will clone +echo "# Repos: ${repos} ${repos_extra}" # Run the supplied command on all repos in parallel, save output until end n=0 @@ -77,8 +97,9 @@ n=`expr ${n} '+' 1` ( ( - if [ "$1" = "clone" -o "$1" = "fclone" ] ; then - cline="hg $* ${pull_default}/${i} ${i}" + if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then + pull_newrepo="`echo ${pull_default}/${i} | sed -e 's@\([^:]/\)//*@\1 at g'`" + cline="hg clone ${pull_newrepo} ${i}" echo "# ${cline}" ( eval "${cline}" ) else @@ -92,10 +113,29 @@ sleep 5 fi done - # Wait for all hg commands to complete wait +if [ "${repos_extra}" != "" ] ; then + for i in ${repos_extra} ; do + echo "Starting on ${i}" + n=`expr ${n} '+' 1` + ( + ( + pull_newextrarepo="`echo ${pull_extra}/${i} | sed -e 's@\([^:]/\)//*@\1 at g'`" + cline="hg clone ${pull_newextrarepo} ${i}" + echo "# ${cline}" + ( eval "${cline}" ) + echo "# exit code $?" + ) > ${tmp}/repo.${n} 2>&1 ; cat ${tmp}/repo.${n} ) & + if [ `expr ${n} '%' ${at_a_time}` -eq 0 ] ; then + sleep 5 + fi + done + # Wait for all hg commands to complete + wait +fi + # Cleanup rm -f -r ${tmp} From andrew at icedtea.classpath.org Fri Aug 9 04:22:08 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 09 Aug 2013 11:22:08 +0000 Subject: /hg/release/icedtea7-forest-2.3/corba: 60 new changesets Message-ID: changeset 2c355f17f90c in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=2c355f17f90c author: katleman date: Fri Aug 17 11:58:02 2012 -0700 Added tag jdk7u6-b31 for changeset d7fe6c13adf9 changeset d68b4f1571b8 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=d68b4f1571b8 author: asaha date: Thu Sep 13 18:15:49 2012 -0700 Merge changeset b426254b45bc in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=b426254b45bc author: asaha date: Fri Oct 12 12:32:32 2012 -0700 Merge changeset d4366e557c4c in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=d4366e557c4c author: katleman date: Fri Mar 01 11:55:12 2013 -0800 Added tag jdk7u17-b02 for changeset e82d31e1f118 changeset 97f3860de6f3 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=97f3860de6f3 author: katleman date: Thu Feb 07 14:19:54 2013 -0800 Added tag jdk7u21-b01 for changeset f5ef46204dba changeset 17ecd70a2247 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=17ecd70a2247 author: ewendeli date: Mon Feb 11 21:06:19 2013 +0100 Merge changeset bf0877613aeb in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=bf0877613aeb author: katleman date: Thu Feb 14 14:10:51 2013 -0800 Added tag jdk7u21-b02 for changeset 17ecd70a2247 changeset 3e39240d7314 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=3e39240d7314 author: katleman date: Tue Feb 19 17:13:17 2013 -0800 Added tag jdk7u21-b03 for changeset bf0877613aeb changeset 3d0f2d5b1866 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=3d0f2d5b1866 author: katleman date: Tue Feb 26 12:44:53 2013 -0800 Added tag jdk7u21-b04 for changeset 3e39240d7314 changeset 0fa70374aa25 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=0fa70374aa25 author: katleman date: Tue Oct 16 14:54:24 2012 -0700 Added tag jdk7u9-b31 for changeset b426254b45bc changeset afa47e72c532 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=afa47e72c532 author: katleman date: Wed Oct 31 10:10:26 2012 -0700 Added tag jdk7u9-b32 for changeset 0fa70374aa25 changeset caba1031dc5d in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=caba1031dc5d author: asaha date: Tue Dec 04 11:39:27 2012 -0800 Merge changeset 2723612f5983 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=2723612f5983 author: asaha date: Wed Dec 05 15:22:56 2012 -0800 Merge changeset b3288e910e58 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=b3288e910e58 author: katleman date: Fri Dec 07 08:19:01 2012 -0800 Added tag jdk7u10-b31 for changeset 2723612f5983 changeset 24f8cb8a0a61 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=24f8cb8a0a61 author: ewendeli date: Tue Jan 15 08:21:17 2013 +0100 Merge changeset 4bfef14df261 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=4bfef14df261 author: katleman date: Wed Jan 16 13:57:00 2013 -0800 Added tag jdk7u11-b32 for changeset 24f8cb8a0a61 changeset c13469259b39 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=c13469259b39 author: katleman date: Tue Jan 29 14:10:19 2013 -0800 Added tag jdk7u11-b33 for changeset 4bfef14df261 changeset 77c765b54496 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=77c765b54496 author: asaha date: Fri Feb 08 19:10:07 2013 -0800 Merge changeset 3714b558333e in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=3714b558333e author: asaha date: Mon Feb 11 11:13:47 2013 -0800 Merge changeset 8d524ccfc97b in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=8d524ccfc97b author: katleman date: Tue Feb 12 12:32:33 2013 -0800 Added tag jdk7u15-b31 for changeset 3714b558333e changeset f0c038610b6d in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=f0c038610b6d author: asaha date: Thu Feb 14 13:17:38 2013 -0800 Merge changeset ddf597f14512 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=ddf597f14512 author: katleman date: Tue Feb 19 12:02:52 2013 -0800 Added tag jdk7u15-b33 for changeset f0c038610b6d changeset 8d1452e09015 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=8d1452e09015 author: asaha date: Fri Mar 01 16:06:21 2013 -0800 Merge changeset a287afb78f76 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=a287afb78f76 author: cl date: Sat Mar 02 09:47:27 2013 -0800 Added tag jdk7u17-b30 for changeset d4366e557c4c changeset a6f066dd2cd5 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=a6f066dd2cd5 author: asaha date: Sat Mar 02 14:33:57 2013 -0800 Merge changeset 6401c6b99d2d in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=6401c6b99d2d author: cl date: Sat Mar 02 18:54:04 2013 -0800 Added tag jdk7u17-b31 for changeset a6f066dd2cd5 changeset f5a291dc9d21 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=f5a291dc9d21 author: asaha date: Mon Mar 04 10:18:46 2013 -0800 Merge changeset 94f2ebfccc5e in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=94f2ebfccc5e author: katleman date: Tue Mar 05 16:45:12 2013 -0800 Added tag jdk7u21-b05 for changeset f5a291dc9d21 changeset 23a57aceeb69 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=23a57aceeb69 author: katleman date: Tue Mar 12 14:44:01 2013 -0700 Added tag jdk7u21-b06 for changeset 94f2ebfccc5e changeset ebedf04bfffe in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=ebedf04bfffe author: katleman date: Tue Mar 19 14:33:23 2013 -0700 Added tag jdk7u21-b07 for changeset 23a57aceeb69 changeset b8f92ad1f0cc in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=b8f92ad1f0cc author: katleman date: Wed Mar 20 14:47:08 2013 -0700 Added tag jdk7u21-b08 for changeset ebedf04bfffe changeset b2adfd931a25 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=b2adfd931a25 author: katleman date: Tue Mar 26 15:00:09 2013 -0700 Added tag jdk7u21-b09 for changeset b8f92ad1f0cc changeset 61e2e2d9cfce in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=61e2e2d9cfce author: katleman date: Sun Mar 31 03:46:27 2013 -0700 Added tag jdk7u21-b10 for changeset b2adfd931a25 changeset 3c774492beaa in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=3c774492beaa author: katleman date: Thu Apr 04 15:48:01 2013 -0700 Added tag jdk7u21-b11 for changeset 61e2e2d9cfce changeset fa2a377ce52d in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=fa2a377ce52d author: katleman date: Fri Apr 05 12:48:40 2013 -0700 Added tag jdk7u21-b30 for changeset 3c774492beaa changeset 7cc2d5ba6eb2 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=7cc2d5ba6eb2 author: katleman date: Sun Apr 07 16:34:46 2013 -0700 Added tag jdk7u21-b12 for changeset fa2a377ce52d changeset cdbafc5080ee in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=cdbafc5080ee author: katleman date: Tue Mar 12 14:45:06 2013 -0700 Added tag jdk7u25-b01 for changeset 3d0f2d5b1866 changeset 9fcb409310d7 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=9fcb409310d7 author: katleman date: Tue Mar 19 14:31:19 2013 -0700 Added tag jdk7u25-b02 for changeset cdbafc5080ee changeset 2057de7ee6b1 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=2057de7ee6b1 author: coffeys date: Thu Mar 21 22:29:15 2013 +0000 Merge changeset b180f1282ad2 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=b180f1282ad2 author: katleman date: Tue Mar 26 14:17:32 2013 -0700 Added tag jdk7u25-b03 for changeset 2057de7ee6b1 changeset 3ad05f13c4e8 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=3ad05f13c4e8 author: katleman date: Tue Apr 02 12:11:58 2013 -0700 Added tag jdk7u25-b04 for changeset b180f1282ad2 changeset 262eade94753 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=262eade94753 author: coffeys date: Fri Apr 05 21:33:35 2013 +0100 Merge changeset ffa99209b6e3 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=ffa99209b6e3 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 changeset a9ded0d825eb in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=a9ded0d825eb author: katleman date: Mon Mar 04 14:17:09 2013 -0800 Added tag jdk7u17-b32 for changeset 6401c6b99d2d changeset 2c8f00e59653 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=2c8f00e59653 author: asaha date: Mon Apr 08 15:40:58 2013 -0700 Merge changeset d97e6c162735 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=d97e6c162735 author: asaha date: Mon Apr 08 16:25:34 2013 -0700 Merge changeset da9301dac56c in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=da9301dac56c author: katleman date: Wed Apr 10 12:42:43 2013 -0700 Added tag jdk7u25-b05 for changeset d97e6c162735 changeset aa2dc8d3bb2c in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=aa2dc8d3bb2c author: katleman date: Tue Apr 16 11:27:52 2013 -0700 Added tag jdk7u25-b06 for changeset da9301dac56c changeset 550d43da7fe2 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=550d43da7fe2 author: katleman date: Thu Apr 18 11:44:14 2013 -0700 Added tag jdk7u25-b07 for changeset aa2dc8d3bb2c changeset e7d599f87ef1 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=e7d599f87ef1 author: katleman date: Tue Apr 23 16:20:03 2013 -0700 Added tag jdk7u25-b08 for changeset 550d43da7fe2 changeset 161ec4dd450d in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=161ec4dd450d 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 c9da98e82bb0 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=c9da98e82bb0 author: katleman date: Tue Apr 30 12:25:01 2013 -0700 Added tag jdk7u25-b09 for changeset 161ec4dd450d changeset 109386df5b8e in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=109386df5b8e author: katleman date: Tue May 07 12:56:10 2013 -0700 Added tag jdk7u25-b10 for changeset c9da98e82bb0 changeset ef8e6f8305d5 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=ef8e6f8305d5 author: katleman date: Wed May 15 13:30:36 2013 -0700 Added tag jdk7u25-b11 for changeset 109386df5b8e changeset eca480919c71 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=eca480919c71 author: katleman date: Wed May 22 15:44:47 2013 -0700 Added tag jdk7u25-b12 for changeset ef8e6f8305d5 changeset 577c4dd1a6e9 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=577c4dd1a6e9 author: katleman date: Fri May 24 16:20:22 2013 -0700 Added tag jdk7u25-b13 for changeset eca480919c71 changeset 4fde7ac2ecf4 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=4fde7ac2ecf4 author: katleman date: Tue Jun 04 10:47:31 2013 -0700 Added tag jdk7u25-b14 for changeset 577c4dd1a6e9 changeset f4bec833a24b in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=f4bec833a24b author: katleman date: Thu Jun 06 11:41:28 2013 -0700 Added tag jdk7u25-b15 for changeset 4fde7ac2ecf4 changeset 65d0e39500d5 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=65d0e39500d5 author: katleman date: Tue Jun 11 11:45:11 2013 -0700 Added tag jdk7u25-b30 for changeset f4bec833a24b changeset ffc59f951801 in /hg/release/icedtea7-forest-2.3/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=ffc59f951801 author: andrew date: Thu Aug 08 23:15:42 2013 +0100 Merge jdk7u25-b16 diffstat: .hgtags | 106 + .jcheck/conf | 2 - make/Makefile | 2 +- make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk | 15 +- make/common/shared/Platform.gmk | 9 + src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java | 8 +- src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java | 3 +- src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java | 16 +- src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java | 5 +- src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java | 61 +- src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java | 20 +- 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/FVDCodeBaseImpl.java | 8 +- 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/ObjectStreamClass.java | 130 +- src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java | 2 +- src/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java | 85 +- src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java | 18 +- 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 | 13 +- src/share/classes/com/sun/corba/se/impl/orb/ORBDataParserImpl.java | 3 +- src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java | 7 +- 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/IIOPInputStream_1_3.java | 57 - src/share/classes/com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3_1.java | 54 - src/share/classes/com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3.java | 68 - src/share/classes/com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3_1.java | 66 - src/share/classes/com/sun/corba/se/impl/orbutil/ORBClassLoader.java | 47 - src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java | 44 +- src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java | 6 +- src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3.java | 177 - src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3_1.java | 177 - src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3.java | 108 - src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3_1.java | 102 - src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java | 53 +- src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3.java | 990 --------- src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3_1.java | 1065 ---------- src/share/classes/com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3.java | 251 -- src/share/classes/com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3_1.java | 77 - 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 | 43 +- 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 | 33 + src/share/classes/sun/corba/OutputStreamFactory.java | 149 + src/share/classes/sun/corba/SharedSecrets.java | 60 + 69 files changed, 682 insertions(+), 3697 deletions(-) diffs (truncated from 5717 to 500 lines): diff -r d7fe6c13adf9 -r ffc59f951801 .hgtags --- a/.hgtags Mon Aug 13 14:19:45 2012 -0700 +++ b/.hgtags Thu Aug 08 23:15:42 2013 +0100 @@ -50,6 +50,7 @@ b751c528c55560cf2adeaeef24b39ca1f4d1cbf7 jdk7-b73 5d0cf59a3203b9f57aceebc33ae656b884987955 jdk7-b74 0fb137085952c8e47878e240d1cb40f14de463c4 jdk7-b75 +d728db3889da23d9f74e45154b9261a43b4acd8d icedtea7-1.12 937144222e2219939101b0129d26a872a7956b13 jdk7-b76 6881f0383f623394b5ec73f27a5f329ff55d0467 jdk7-b77 a7f7276b48cd74d8eb1baa83fbf3d1ef4a2603c8 jdk7-b78 @@ -63,6 +64,7 @@ 6253e28826d16cf1aecc39ce04c8de1f6bf2df5f jdk7-b86 09a41111a401d327f65e453384d976a10154d9ea jdk7-b87 39e14d2da687c7e592142137517aaf689544820f jdk7-b88 +e805b4155d76f76d40ffae36a74546f79218c539 icedtea7-1.13 bb4424c5e778b842c064a8b1aa902b35f4397654 jdk7-b89 56ce07b0eb47b93a98a72adef0f21e602c460623 jdk7-b90 bcd2fc089227559ac5be927923609fac29f067fa jdk7-b91 @@ -111,6 +113,7 @@ 918003855fa0dba5acf4bf1fe36526d2fc4c1ba8 jdk7-b134 e0b72ae5dc5e824b342801c8d1d336a55eb54e2c jdk7-b135 48ef0c712e7cbf272f47f9224db92a3c6a9e2612 jdk7-b136 +b62418551e20fa19fbf57c49d4378b7096809e60 icedtea-1.14 a66c01d8bf895261715955df0b95545c000ed6a8 jdk7-b137 78d8cf04697e9df54f7f11e195b7da29b8e345a2 jdk7-b138 60b074ec6fcf5cdf9efce22fdfb02326ed8fa2d3 jdk7-b139 @@ -123,6 +126,7 @@ 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146 36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01 73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147 +d034cc90ecc266d78b87d1429c426669431fcc1f icedtea-2.0-branchpoint 9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02 dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03 eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04 @@ -141,6 +145,7 @@ 56b02f8ef70391a67c9fa71157a8faafbdff4b74 jdk7u2-b12 456ff1f14b14ef8cfe47cef95c8094f8443fa092 jdk7u2-b13 62b846b0c3259cae732e75df50a1b180a2541178 jdk7u2-b21 +ecb9fc90dea4720f5c1ba1354364ed610f463e41 icedtea-2.1-branchpoint 1b648adeeefa9b1fb022459e8e4f590b736c0fdd jdk7u3-b02 730fa05af5a9d10a3a7a1626d248b96d09f8069f jdk7u3-b03 7f7a9b1addb4925f4f6e17f6eb5cce986c3b626d jdk7u3-b04 @@ -157,6 +162,7 @@ 23777178e7eb61859be3f7240561aa1034ff9221 jdk7u4-b10 bdc37f3c09b6008667aff77432bb6d31cbae945e jdk7u4-b11 fddc26b35a31884d64315cf7c296570245e9c481 jdk7u4-b12 +9ffa2340e018131c900e9cc12c9f3a10698aa191 icedtea-2.2-branchpoint f7119745898016a98cddab3e69efb41c5a5aaf78 jdk7u4-b13 6a262c36caebb43972cbae5032cff632ce31d2cc jdk7u4-b14 d9bf21b76f093abfe451880d5db29e4932b1e72e jdk7u4-b15 @@ -191,6 +197,7 @@ 8da4015f405b0fa267cca4780d20cd012d0a9cb4 jdk7u6-b15 7674c7ed99a53a8dcf654ab8a6963199ef562a08 jdk7u6-b16 e4a676826cb3fe2f84e19105a027c15c097f98f1 jdk7u6-b17 +68c35d6e9548bc7be9c3ce73774c6d53b0d72d3b icedtea-2.3-branchpoint b3d767dbd67f518168c561e078be5e860bc60cfc jdk7u6-b18 5c046510b9308bf514f078d48fcf0112a376ad41 jdk7u6-b19 f0c51b691d34b4a06c1e22c7960be71e0d0ee84e jdk7u6-b20 @@ -199,3 +206,102 @@ 2a8376123fbb81bc4b2f643ff7cfaf7f87b21c35 jdk7u6-b23 02512f61591f55d84458d1ea4ce84eecb7324f89 jdk7u6-b24 8b20875b3faa01ef56331045de88747df278eaeb jdk7u6-b30 +f621504b45f74a5700c26334b70303f56a49f54c icedtea-2.3 +2b1d2e9aea3270eb30e7a1ac2a02c5584acc404c icedtea-2.3.1 +e9b200124386d2dceba0f2641316e8c6499f9966 icedtea-2.3.2 +7fae6a3a68c71b9b13144e92969b8ad625cf9814 icedtea-2.3.3 +9a95d714d136b6a22bab1e8365ab3bce7a8b1ddf icedtea-2.3.4 +5116fe321210de8e227d4cde0b5e37673afee385 icedtea-2.3.5 +6d7b1e6b004a1d3704cf00d0a639d6f9e177e668 icedtea-2.3.6 +6d7b1e6b004a1d3704cf00d0a639d6f9e177e668 icedtea-2.3.6 +0000000000000000000000000000000000000000 icedtea-2.3.6 +d7fe6c13adf9e06d98c061449d171bc06c2ba0a3 jdk7u6-b31 +d7fe6c13adf9e06d98c061449d171bc06c2ba0a3 jdk7u7-b10 +496baf62d0550c704505b0ff6f390279f6a569e0 jdk7u7-b30 +e57e4274a3575f278115cc8ef03c5bdf3c43a7ed jdk7u7-b11 +06cbc4af754ea8f2e3b7d0b1701d1a69ce9d5075 jdk7u7-b31 +8737f43e092ea52dd85dcf164736eea3b9b364e6 jdk7u7-b01 +ec602836c4e173927911673d253bb8baa1e3d170 jdk7u7-b02 +a163e56c6679d10dc64ec48f35e67c3a5942afba jdk7u9-b03 +0000000000000000000000000000000000000000 jdk7u7-b01 +8737f43e092ea52dd85dcf164736eea3b9b364e6 jdk7u9-b01 +0000000000000000000000000000000000000000 jdk7u7-b02 +ec602836c4e173927911673d253bb8baa1e3d170 jdk7u9-b02 +268470f3f0d0d7e9b04c579c551571097f0b0305 jdk7u9-b04 +a5dced409c4b7f940db80846f6efabac74523b0e jdk7u9-b05 +b426254b45bcd7cdb38003497fdd4168e366d3cb jdk7u9-b31 +0fa70374aa257929e2541e57c55c4cdebec91fd4 jdk7u9-b32 +ba68d4ad02c465a36344a34eba34491466ec17d4 jdk7u10-b10 +a738921b001a92381bf355a2bb1ecd742ecee352 jdk7u10-b11 +e52708ecb2c32b366c251e4083fbb37e22a425c3 jdk7u10-b12 +5cd2ef642635a7d0a79a7c28343b2ddfd0e6aa4a jdk7u10-b13 +2d53a2c7e4b989ceba356abfc8dc2129269a134f jdk7u10-b14 +c488cd628db35eb09d8ef9e10ffd00c9a93d0778 jdk7u10-b15 +64f09d7549d304fbfd3c29b4f148bf44e8e3e979 jdk7u10-b16 +57c3355153d1624fd98618097c1a82ab3ffc66f8 jdk7u10-b17 +f2a347637a55fa4de9542a8dcab72ad6fac44d2b jdk7u10-b18 +22cf8bc2ec47498fe548b308a81be0486dd7e3d0 jdk7u10-b30 +2723612f5983e7d65490d7d4a3d8577026448736 jdk7u10-b31 +e7952daece16b27d69cb78f6912407c3bbaf8e83 jdk7u11-b20 +dff0f0272891b1d53497d9525567959b73476ff9 jdk7u11-b21 +24f8cb8a0a615686f8baba4d746514bae92f064d jdk7u11-b32 +4bfef14df261d69dc32e37d189e12e3fa572a83c jdk7u11-b33 +96a3c68e5741dc9ab5cb0da426511eb15fd29ede jdk7u11-b03 +1413b173730f4796fca42c89eeb804a5935b0264 jdk7u11-b04 +5c49a17bc15f4fd4722746788f5130df132cd038 jdk7u11-b05 +30057c20fbb3caa61857656d05421e56731184f2 jdk7u11-b06 +9d9440d1fa2dd872c2a2b564fc5fa4d3555afab6 jdk7u11-b07 +983fac5b27376839142ac5a8770461e4e48c2dc8 jdk7u11-b08 +b192d148731916e4b1b47b7a3e6b0a1d7ddf3f14 jdk7u13-b09 +0000000000000000000000000000000000000000 icedtea-2.3.6 +329f1a69c6cfacd24290ae36780c37a6f69ecf62 icedtea-2.3.6 +97a8b625f6e95b8a2b7419fbc20682bd120f7fe2 icedtea-2.3.7 +82e58144c3fb82cdf7147f9475b9fb13a8b0d8c6 icedtea-2.3.8 +b9ab9b203a41469a274419d26be2c04558b57ce8 jdk7u13-b10 +f5ef46204dba19679edd7492b221110fd1a0bd33 jdk7u13-b30 +b9ab9b203a41469a274419d26be2c04558b57ce8 jdk7u13-b20 +622e370c2d1e8c5f48d8f520f486dc6fcc1239c5 jdk7u15-b01 +30188388048333e213a839363329ac2cb0cf0e0d jdk7u15-b02 +7f0e7ce088ff554f64e2c102ae3718ae4d580c34 jdk7u15-b30 +3714b558333e1089e2649ead8586873abd9c0ed1 jdk7u15-b31 +f0c038610b6da1a0d4214b730aa6cb17b64d0a3b jdk7u15-b33 +e5b996dabec6ac6aa12705ce678642605ea9d476 jdk7u15-b03 +b192d148731916e4b1b47b7a3e6b0a1d7ddf3f14 jdk7u15-b32 +94e8b9b0e0ef1685e2f2fcc886e08a42a85c8e03 jdk7u17-b01 +47a6bf94ce11644ba0f1dc4f251f61ccd1b78c34 icedtea-2.3.9 +8e581b67151110a223a6f42a135193261a551a0d icedtea-2.3.10 +eda3895cb67e1839d712370fb6d936b844f9de72 icedtea-2.3.11 +ea108ff3be9a260a7f0e47743ea20d897de407d8 icedtea-2.3.12 +e82d31e1f1189ae6f02d6855f0cd78074599b2e1 jdk7u17-b02 +d4366e557c4c5af62a94fc9885aed87c99abc848 jdk7u17-b30 +a6f066dd2cd526da73070d1e46c9b1e1ab1a6756 jdk7u17-b31 +6401c6b99d2d43ed4f0e2d38dce496069f6e91f8 jdk7u17-b32 +f5ef46204dba19679edd7492b221110fd1a0bd33 jdk7u21-b01 +17ecd70a2247ed86a095aae9f1a201fa7feea861 jdk7u21-b02 +bf0877613aeba816d5f18ea6316d535819f628e9 jdk7u21-b03 +3e39240d7314e82b3ccff3b2a64413be9c0b6665 jdk7u21-b04 +f5a291dc9d219f68a2d4bcc72c65c014e9ec3b8b jdk7u21-b05 +94f2ebfccc5e057169284bb2c858296b235868ea jdk7u21-b06 +23a57aceeb69e688f8ce8b8361fad3a49cf4ac5f jdk7u21-b07 +ebedf04bfffe289e8bf9661b38f73ca6c0dad17c jdk7u21-b08 +b8f92ad1f0cc86d8571a0e23192e667f0ef8e421 jdk7u21-b09 +b2adfd931a2504948d4fee780e4175122be10484 jdk7u21-b10 +61e2e2d9cfcea20132b50d8fb7ead66a8a373db7 jdk7u21-b11 +3c774492beaaff241c654add2c4e683b9ff002f2 jdk7u21-b30 +fa2a377ce52dfa88fca858d735d78b53f2b5b754 jdk7u21-b12 +3d0f2d5b1866860f7089b51cca8ca0ca41c04d9c jdk7u25-b01 +cdbafc5080eeb8ea3fec9fe7d071e0bf96635581 jdk7u25-b02 +2057de7ee6b17ab3335ec6cd5730f88f4cfe9502 jdk7u25-b03 +b180f1282ad221bde0d4d865c879c0fa7f8ef4c8 jdk7u25-b04 +d97e6c162735798fe0c9f1dd582aa1114b6c5447 jdk7u25-b05 +da9301dac56c26846212db33bb20001652b6ce60 jdk7u25-b06 +aa2dc8d3bb2cdd726ec97bc2bf130eec46467f28 jdk7u25-b07 +550d43da7fe2f85bbce88cc94066c589480b1221 jdk7u25-b08 +161ec4dd450d59e1b8ad136db231925c97ff6205 jdk7u25-b09 +c9da98e82bb006dccd94a50871d6cdb66fa2d7e7 jdk7u25-b10 +109386df5b8e259d0af802217769a3c448404e49 jdk7u25-b11 +ef8e6f8305d524f3b448a85f901aadf1adc81fc0 jdk7u25-b12 +eca480919c71072a31f62a61cb3aad30677007e3 jdk7u25-b13 +577c4dd1a6e9bc1bb2c2e5d5ecbab8eacb4121af jdk7u25-b14 +4fde7ac2ecf4b170022ebbf8a961e6dbb229ccab jdk7u25-b15 +f4bec833a24b20f5ae770d0650350fc8950c9dc0 jdk7u25-b30 diff -r d7fe6c13adf9 -r ffc59f951801 .jcheck/conf --- a/.jcheck/conf Mon Aug 13 14:19:45 2012 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r d7fe6c13adf9 -r ffc59f951801 make/Makefile --- a/make/Makefile Mon Aug 13 14:19:45 2012 -0700 +++ b/make/Makefile Thu Aug 08 23:15:42 2013 +0100 @@ -150,7 +150,7 @@ #----- bin.zip -BIN_ZIP_FILES = $(BUILD_DIR/lib/orb.idl $(BUILD_DIR)/lib/ir.idl +BIN_ZIP_FILES = $(BUILD_DIR)/lib/orb.idl $(BUILD_DIR)/lib/ir.idl BIN_ZIP = $(LIB_DIR)/bin.zip $(BIN_ZIP): $(BIN_ZIP_FILES) diff -r d7fe6c13adf9 -r ffc59f951801 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 Mon Aug 13 14:19:45 2012 -0700 +++ b/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk Thu Aug 08 23:15:42 2013 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2009, 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 @@ -29,10 +29,6 @@ com/sun/corba/se/impl/orbutil/DenseIntMapImpl.java \ com/sun/corba/se/impl/orbutil/GetPropertyAction.java \ com/sun/corba/se/impl/orbutil/HexOutputStream.java \ - com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3.java \ - com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3_1.java \ - com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3.java \ - com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3_1.java \ com/sun/corba/se/impl/orbutil/LegacyHookGetFields.java \ com/sun/corba/se/impl/orbutil/LegacyHookPutFields.java \ com/sun/corba/se/impl/orbutil/LogKeywords.java \ @@ -43,21 +39,12 @@ 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/RepIdDelegator_1_3.java \ - com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3_1.java \ - com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3.java \ - com/sun/corba/se/impl/orbutil/RepositoryId_1_3.java \ com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java \ com/sun/corba/se/impl/orbutil/RepositoryIdStrings.java \ com/sun/corba/se/impl/orbutil/RepositoryIdUtility.java \ com/sun/corba/se/impl/orbutil/RepositoryIdInterface.java \ - com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3_1.java \ - com/sun/corba/se/impl/orbutil/RepositoryId_1_3_1.java \ com/sun/corba/se/impl/orbutil/StackImpl.java \ - com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3_1.java \ - com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3.java \ com/sun/corba/se/impl/orbutil/closure/Future.java \ com/sun/corba/se/impl/orbutil/closure/Constant.java \ com/sun/corba/se/impl/orbutil/concurrent/Sync.java \ diff -r d7fe6c13adf9 -r ffc59f951801 make/common/shared/Platform.gmk --- a/make/common/shared/Platform.gmk Mon Aug 13 14:19:45 2012 -0700 +++ b/make/common/shared/Platform.gmk Thu Aug 08 23:15:42 2013 +0100 @@ -153,6 +153,9 @@ OS_VERSION := $(shell uname -r) # Arch and OS name/version mach := $(shell uname -m) + ifneq (,$(wildcard /usr/bin/dpkg-architecture)) + mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/') + endif archExpr = case "$(mach)" in \ i[3-9]86) \ echo i586 \ @@ -169,6 +172,9 @@ arm*) \ echo arm \ ;; \ + sh*) \ + echo sh \ + ;; \ *) \ echo $(mach) \ ;; \ @@ -196,6 +202,9 @@ else ARCH_DATA_MODEL=64 endif + ifeq ($(ARCH), sh) + ARCH_DATA_MODEL=32 + endif endif endif diff -r d7fe6c13adf9 -r ffc59f951801 src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java --- a/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java Mon Aug 13 14:19:45 2012 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java Thu Aug 08 23:15:42 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, 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 @@ -322,9 +322,9 @@ com.sun.corba.se.spi.activation._ServerImplBase { private ORB orb; - private Method installMethod ; - private Method uninstallMethod ; - private Method shutdownMethod ; + private transient Method installMethod ; + private transient Method uninstallMethod ; + private transient Method shutdownMethod ; private Object methodArgs[] ; ServerCallback(ORB orb, Method installMethod, Method uninstallMethod, diff -r d7fe6c13adf9 -r ffc59f951801 src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java --- a/src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java Mon Aug 13 14:19:45 2012 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java Thu Aug 08 23:15:42 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 d7fe6c13adf9 -r ffc59f951801 src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java --- a/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Mon Aug 13 14:19:45 2012 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Thu Aug 08 23:15:42 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 @@ -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); + } + }); } /** @@ -1218,7 +1226,7 @@ // See bug 4391648 for more info about the tcORB in this // case. RepositoryIdStrings repStrs - = RepositoryIdFactory.getRepIdStringsFactory(tcORB); + = RepositoryIdFactory.getRepIdStringsFactory(); // Assertion: c instanceof Serializable? @@ -1251,7 +1259,7 @@ // Anything else // We know that this is a TypeCodeImpl since it is our ORB classTC = (TypeCodeImpl)ValueUtility.createTypeCodeForClass( - tcORB, c, ORBUtility.createValueHandler(tcORB)); + tcORB, c, ORBUtility.createValueHandler()); // Intruct classTC to store its buffer classTC.setCaching(true); // Update the cache diff -r d7fe6c13adf9 -r ffc59f951801 src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java --- a/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java Mon Aug 13 14:19:45 2012 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java Thu Aug 08 23:15:42 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 d7fe6c13adf9 -r ffc59f951801 src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java --- a/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java Mon Aug 13 14:19:45 2012 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java Thu Aug 08 23:15:42 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, 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 @@ -269,8 +269,8 @@ private final void createRepositoryIdHandlers() { - repIdUtil = RepositoryIdFactory.getRepIdUtility(orb); - repIdStrs = RepositoryIdFactory.getRepIdStringsFactory(orb); + repIdUtil = RepositoryIdFactory.getRepIdUtility(); + repIdStrs = RepositoryIdFactory.getRepIdStringsFactory(); } public GIOPVersion getGIOPVersion() { @@ -564,10 +564,7 @@ checkForNegativeLength(len); - if (orb != null && ORBUtility.isLegacyORB((ORB)orb)) - return legacyReadString(len); - else - return internalReadString(len); + return internalReadString(len); } private final String internalReadString(int len) { @@ -588,54 +585,6 @@ return new String(result, 0, getCharConverter().getNumChars()); } - private final String legacyReadString(int len) { - - // - // Workaround for ORBs which send string lengths of - // zero to mean empty string. - // - // - // IMPORTANT: Do not replace 'new String("")' with "", it may result - // in a Serialization bug (See serialization.zerolengthstring) and - // bug id: 4728756 for details - if (len == 0) - return new String(""); - - len--; - char[] c = new char[len]; - - int n = 0; - while (n < len) { - int avail; - int bytes; - int wanted; - - avail = bbwi.buflen - bbwi.position(); - if (avail <= 0) { - grow(1, 1); - avail = bbwi.buflen - bbwi.position(); - } - wanted = len - n; - bytes = (wanted < avail) ? wanted : avail; - // Microbenchmarks are showing a loop of ByteBuffer.get(int) being - // faster than ByteBuffer.get(byte[], int, int). - for (int i=0; i bbwi.buflen) - alignAndCheck(1, 1); - bbwi.position(bbwi.position() + 1); - - return new String(c); - } - public final String read_string() { return readStringOrIndirection(false); } @@ -1045,7 +994,7 @@ try { if (valueHandler == null) - valueHandler = ORBUtility.createValueHandler(orb); + valueHandler = ORBUtility.createValueHandler(); value = valueHandler.readValue(parent, indirection, diff -r d7fe6c13adf9 -r ffc59f951801 src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java --- a/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java Mon Aug 13 14:19:45 2012 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java Thu Aug 08 23:15:42 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, 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 @@ -189,18 +189,8 @@ private final void createRepositoryIdHandlers() { - if (orb != null) { - // Get the appropriate versions based on the ORB version. The - // ORB versioning info is only in the core ORB. - repIdUtil - = RepositoryIdFactory.getRepIdUtility(orb); - repIdStrs - = RepositoryIdFactory.getRepIdStringsFactory(orb); - } else { - // Get the latest versions - repIdUtil = RepositoryIdFactory.getRepIdUtility(); - repIdStrs = RepositoryIdFactory.getRepIdStringsFactory(); - } + repIdUtil = RepositoryIdFactory.getRepIdUtility(); + repIdStrs = RepositoryIdFactory.getRepIdStringsFactory(); } public BufferManagerWrite getBufferManager() @@ -705,7 +695,7 @@ private void writeArray(Serializable array, Class clazz) { From andrew at icedtea.classpath.org Fri Aug 9 04:22:30 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 09 Aug 2013 11:22:30 +0000 Subject: /hg/release/icedtea7-forest-2.3/jaxp: 59 new changesets Message-ID: changeset d4cddc815025 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=d4cddc815025 author: katleman date: Fri Aug 17 11:58:12 2012 -0700 Added tag jdk7u6-b31 for changeset 2eafa8a6fd8f changeset 9c45bbf888c1 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=9c45bbf888c1 author: asaha date: Thu Sep 13 18:27:52 2012 -0700 Merge changeset 039b21e98d2b in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=039b21e98d2b author: asaha date: Fri Oct 12 12:37:13 2012 -0700 Merge changeset a5e6594fc1ae in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=a5e6594fc1ae author: katleman date: Fri Mar 01 11:55:25 2013 -0800 Added tag jdk7u17-b02 for changeset 7863a60ae4b4 changeset f0dc96219b29 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=f0dc96219b29 author: katleman date: Thu Feb 07 14:20:30 2013 -0800 Added tag jdk7u21-b01 for changeset 0a6a09e5174a changeset 99ed1a3d2950 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=99ed1a3d2950 author: ewendeli date: Mon Feb 11 21:08:36 2013 +0100 Merge changeset 06a2338c0fb7 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=06a2338c0fb7 author: katleman date: Thu Feb 14 14:11:20 2013 -0800 Added tag jdk7u21-b02 for changeset 99ed1a3d2950 changeset 38d4d23d167c in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=38d4d23d167c author: joehw date: Sat Feb 16 18:03:23 2013 -0800 6657673: Issues with JAXP Reviewed-by: alanb, lancea, ahgross, mullan changeset acde12ee462d in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=acde12ee462d author: katleman date: Tue Feb 19 17:13:50 2013 -0800 Added tag jdk7u21-b03 for changeset 38d4d23d167c changeset 5704dc942da6 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=5704dc942da6 author: katleman date: Tue Feb 26 12:45:10 2013 -0800 Added tag jdk7u21-b04 for changeset acde12ee462d changeset d80a8e81fef0 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=d80a8e81fef0 author: katleman date: Tue Oct 16 14:55:00 2012 -0700 Added tag jdk7u9-b31 for changeset 039b21e98d2b changeset 3941eb25e61e in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=3941eb25e61e author: katleman date: Wed Oct 31 10:11:34 2012 -0700 Added tag jdk7u9-b32 for changeset d80a8e81fef0 changeset 07dd5e5caa67 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=07dd5e5caa67 author: asaha date: Tue Dec 04 11:44:49 2012 -0800 Merge changeset ec1e8ead41ee in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=ec1e8ead41ee author: asaha date: Wed Dec 05 15:28:55 2012 -0800 Merge changeset cfc86ae2a559 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=cfc86ae2a559 author: katleman date: Fri Dec 07 08:19:17 2012 -0800 Added tag jdk7u10-b31 for changeset ec1e8ead41ee changeset 71353182d3f7 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=71353182d3f7 author: ewendeli date: Tue Jan 15 08:23:10 2013 +0100 Merge changeset af8f33c558d0 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=af8f33c558d0 author: katleman date: Wed Jan 16 13:57:24 2013 -0800 Added tag jdk7u11-b32 for changeset 71353182d3f7 changeset 839dfbb430fa in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=839dfbb430fa author: katleman date: Tue Jan 29 14:10:48 2013 -0800 Added tag jdk7u11-b33 for changeset af8f33c558d0 changeset 94b6491fa3ae in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=94b6491fa3ae author: asaha date: Fri Feb 08 19:23:55 2013 -0800 Merge changeset de6df3c10ebc in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=de6df3c10ebc author: asaha date: Mon Feb 11 11:16:16 2013 -0800 Merge changeset be739fd7b723 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=be739fd7b723 author: katleman date: Tue Feb 12 12:32:58 2013 -0800 Added tag jdk7u15-b31 for changeset de6df3c10ebc changeset 039c31ff1fe6 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=039c31ff1fe6 author: asaha date: Thu Feb 14 13:21:49 2013 -0800 Merge changeset b08325d4a195 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=b08325d4a195 author: katleman date: Tue Feb 19 12:03:07 2013 -0800 Added tag jdk7u15-b33 for changeset 039c31ff1fe6 changeset b3ce6fdffb2b in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=b3ce6fdffb2b author: asaha date: Fri Mar 01 16:10:54 2013 -0800 Merge changeset 1f39cb70d337 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=1f39cb70d337 author: cl date: Sat Mar 02 09:47:47 2013 -0800 Added tag jdk7u17-b30 for changeset a5e6594fc1ae changeset 8fb34202383e in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=8fb34202383e author: asaha date: Sat Mar 02 14:37:49 2013 -0800 Merge changeset f7d8d2c003a1 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=f7d8d2c003a1 author: cl date: Sat Mar 02 18:55:23 2013 -0800 Added tag jdk7u17-b31 for changeset 8fb34202383e changeset 56b1ad031df9 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=56b1ad031df9 author: asaha date: Mon Mar 04 11:43:45 2013 -0800 Merge changeset ab51202418c1 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=ab51202418c1 author: katleman date: Tue Mar 05 16:45:44 2013 -0800 Added tag jdk7u21-b05 for changeset 56b1ad031df9 changeset 3ab71deee4a4 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=3ab71deee4a4 author: katleman date: Tue Mar 12 14:44:12 2013 -0700 Added tag jdk7u21-b06 for changeset ab51202418c1 changeset f5ef2e76669b in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=f5ef2e76669b author: katleman date: Tue Mar 19 14:33:43 2013 -0700 Added tag jdk7u21-b07 for changeset 3ab71deee4a4 changeset 65977091d010 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=65977091d010 author: katleman date: Wed Mar 20 14:47:27 2013 -0700 Added tag jdk7u21-b08 for changeset f5ef2e76669b changeset bf2d62ea518d in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=bf2d62ea518d author: katleman date: Tue Mar 26 15:00:29 2013 -0700 Added tag jdk7u21-b09 for changeset 65977091d010 changeset 3e0e331bdfb8 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=3e0e331bdfb8 author: katleman date: Sun Mar 31 03:46:45 2013 -0700 Added tag jdk7u21-b10 for changeset bf2d62ea518d changeset 980fe893d8fd in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=980fe893d8fd author: katleman date: Thu Apr 04 15:48:20 2013 -0700 Added tag jdk7u21-b11 for changeset 3e0e331bdfb8 changeset a320a590b4ca in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=a320a590b4ca author: katleman date: Fri Apr 05 12:48:56 2013 -0700 Added tag jdk7u21-b30 for changeset 980fe893d8fd changeset 08808837d120 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=08808837d120 author: katleman date: Sun Apr 07 16:34:55 2013 -0700 Added tag jdk7u21-b12 for changeset a320a590b4ca changeset f9c1fe7cd119 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=f9c1fe7cd119 author: katleman date: Tue Mar 12 14:45:18 2013 -0700 Added tag jdk7u25-b01 for changeset 5704dc942da6 changeset 266b10e923fd in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=266b10e923fd author: katleman date: Tue Mar 19 14:31:36 2013 -0700 Added tag jdk7u25-b02 for changeset f9c1fe7cd119 changeset fe858d7d6a13 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=fe858d7d6a13 author: coffeys date: Thu Mar 21 22:31:46 2013 +0000 Merge changeset 1a2822a1d6a4 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=1a2822a1d6a4 author: katleman date: Tue Mar 26 14:17:46 2013 -0700 Added tag jdk7u25-b03 for changeset fe858d7d6a13 changeset 1cdde0662f8f in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=1cdde0662f8f author: katleman date: Tue Apr 02 12:12:16 2013 -0700 Added tag jdk7u25-b04 for changeset 1a2822a1d6a4 changeset 3bf3ca303701 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=3bf3ca303701 author: coffeys date: Fri Apr 05 21:34:19 2013 +0100 Merge changeset 8d7874ee1a16 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=8d7874ee1a16 author: katleman date: Mon Mar 04 14:17:21 2013 -0800 Added tag jdk7u17-b32 for changeset f7d8d2c003a1 changeset 754b3678b732 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=754b3678b732 author: asaha date: Mon Apr 08 15:56:42 2013 -0700 Merge changeset e927605d1678 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=e927605d1678 author: asaha date: Mon Apr 08 16:30:47 2013 -0700 Merge changeset 8dfb4db227e7 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=8dfb4db227e7 author: katleman date: Wed Apr 10 12:42:59 2013 -0700 Added tag jdk7u25-b05 for changeset e927605d1678 changeset ad2732999848 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=ad2732999848 author: katleman date: Tue Apr 16 11:28:07 2013 -0700 Added tag jdk7u25-b06 for changeset 8dfb4db227e7 changeset df9def256970 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=df9def256970 author: katleman date: Thu Apr 18 11:44:25 2013 -0700 Added tag jdk7u25-b07 for changeset ad2732999848 changeset 5952538d55e6 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=5952538d55e6 author: katleman date: Tue Apr 23 16:21:28 2013 -0700 Added tag jdk7u25-b08 for changeset df9def256970 changeset aa00dd983dd0 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=aa00dd983dd0 author: katleman date: Tue Apr 30 12:25:21 2013 -0700 Added tag jdk7u25-b09 for changeset 5952538d55e6 changeset 0fb6d76bcd2e in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=0fb6d76bcd2e author: katleman date: Tue May 07 12:56:27 2013 -0700 Added tag jdk7u25-b10 for changeset aa00dd983dd0 changeset 5e87aee78c91 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=5e87aee78c91 author: katleman date: Wed May 15 13:31:00 2013 -0700 Added tag jdk7u25-b11 for changeset 0fb6d76bcd2e changeset 83b80c094bef in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=83b80c094bef author: katleman date: Wed May 22 15:44:57 2013 -0700 Added tag jdk7u25-b12 for changeset 5e87aee78c91 changeset 68cc0d2a49f0 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=68cc0d2a49f0 author: katleman date: Fri May 24 16:20:34 2013 -0700 Added tag jdk7u25-b13 for changeset 83b80c094bef changeset 503f75b55b34 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=503f75b55b34 author: katleman date: Tue Jun 04 10:47:43 2013 -0700 Added tag jdk7u25-b14 for changeset 68cc0d2a49f0 changeset 8c35f2344bee in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=8c35f2344bee author: katleman date: Thu Jun 06 11:41:42 2013 -0700 Added tag jdk7u25-b15 for changeset 503f75b55b34 changeset 9cebeb3118ac in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=9cebeb3118ac author: katleman date: Tue Jun 11 11:45:22 2013 -0700 Added tag jdk7u25-b30 for changeset 8c35f2344bee changeset aac1cda37627 in /hg/release/icedtea7-forest-2.3/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=aac1cda37627 author: andrew date: Thu Aug 08 23:15:34 2013 +0100 Merge jdk7u25-b16 diffstat: .hgtags | 106 ++++ .jcheck/conf | 2 - src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java | 6 +- src/com/sun/org/apache/bcel/internal/util/Class2HTML.java | 3 +- src/com/sun/org/apache/bcel/internal/util/ClassPath.java | 20 +- src/com/sun/org/apache/bcel/internal/util/JavaWrapper.java | 3 +- src/com/sun/org/apache/bcel/internal/util/SecuritySupport.java | 223 ++++++++++ src/com/sun/org/apache/xalan/internal/res/XSLMessages.java | 106 ++-- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java | 64 -- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java | 64 -- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java | 64 -- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java | 64 -- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java | 64 -- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java | 64 -- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java | 64 -- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java | 63 -- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java | 64 -- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java | 64 -- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java | 64 -- src/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java | 11 +- src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java | 98 +++- src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java | 11 +- src/com/sun/org/apache/xalan/internal/xslt/Process.java | 3 +- src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java | 10 +- src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java | 14 +- src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java | 7 +- src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java | 16 +- src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java | 3 +- src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java | 3 +- src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java | 3 +- src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java | 3 +- src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java | 12 + src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java | 14 +- src/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java | 15 +- src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java | 63 +-- src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java | 4 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java | 11 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java | 7 +- src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java | 5 +- src/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java | 9 +- src/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java | 7 +- src/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java | 7 +- src/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java | 7 +- src/com/sun/org/apache/xerces/internal/util/SecurityManager.java | 70 +- src/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java | 13 +- src/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java | 36 + src/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java | 9 +- src/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java | 8 +- src/com/sun/org/apache/xml/internal/dtm/DTMManager.java | 3 +- src/com/sun/org/apache/xml/internal/res/XMLErrorResources.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_pt_BR.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java | 67 --- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java | 66 -- src/com/sun/org/apache/xml/internal/res/XMLMessages.java | 65 +-- src/com/sun/org/apache/xml/internal/resolver/Catalog.java | 5 +- src/com/sun/org/apache/xml/internal/resolver/CatalogManager.java | 17 +- src/com/sun/org/apache/xml/internal/resolver/Resolver.java | 5 +- src/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java | 3 +- src/com/sun/org/apache/xml/internal/serializer/Encodings.java | 4 +- src/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java | 5 +- src/com/sun/org/apache/xml/internal/serializer/ToStream.java | 3 +- src/com/sun/org/apache/xml/internal/serializer/TreeWalker.java | 5 +- src/com/sun/org/apache/xml/internal/serializer/utils/Messages.java | 100 +---- src/com/sun/org/apache/xml/internal/utils/TreeWalker.java | 7 +- src/com/sun/org/apache/xml/internal/utils/res/XResourceBundle.java | 141 +---- src/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java | 5 +- src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java | 67 --- src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java | 67 --- src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java | 67 --- src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java | 67 --- src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java | 67 --- src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java | 67 --- src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java | 67 --- src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java | 67 --- src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java | 67 --- src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java | 67 --- src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java | 67 --- src/com/sun/org/apache/xpath/internal/res/XPATHMessages.java | 216 ++++---- src/com/sun/xml/internal/stream/XMLEntityStorage.java | 3 +- src/com/sun/xml/internal/stream/writers/WriterUtility.java | 3 +- src/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java | 3 +- src/javax/xml/datatype/FactoryFinder.java | 62 ++- src/javax/xml/parsers/FactoryFinder.java | 10 +- src/javax/xml/stream/FactoryFinder.java | 77 ++- src/javax/xml/transform/FactoryFinder.java | 11 +- src/javax/xml/validation/SchemaFactoryFinder.java | 43 +- src/javax/xml/xpath/XPathFactoryFinder.java | 30 +- src/org/w3c/dom/bootstrap/DOMImplementationRegistry.java | 13 +- src/org/xml/sax/helpers/NewInstance.java | 38 +- src/org/xml/sax/helpers/ParserAdapter.java | 5 +- src/org/xml/sax/helpers/ParserFactory.java | 13 +- src/org/xml/sax/helpers/SecuritySupport.java | 108 ++++ src/org/xml/sax/helpers/XMLReaderFactory.java | 62 +- 113 files changed, 1244 insertions(+), 3263 deletions(-) diffs (truncated from 7104 to 500 lines): diff -r 2eafa8a6fd8f -r aac1cda37627 .hgtags --- a/.hgtags Mon Aug 13 14:20:00 2012 -0700 +++ b/.hgtags Thu Aug 08 23:15:34 2013 +0100 @@ -50,6 +50,7 @@ feb05980f9f2964e6bc2b3a8532f9b3054c2289b jdk7-b73 ea7b88c676dd8b269bc858a4a17c14dc96c8aed1 jdk7-b74 555fb78ee4cebed082ca7ddabff46d2e5b4c9026 jdk7-b75 +fb68fd18eb9f9d94bd7f307097b98a5883018da8 icedtea7-1.12 233a4871d3364ec305efd4a58cfd676620a03a90 jdk7-b76 bfadab8c7b1bf806a49d3e1bc19ec919717f057a jdk7-b77 7a12d3789e1b07a560fc79568b991818d617ede2 jdk7-b78 @@ -63,6 +64,7 @@ 81c0f115bbe5d3bcf59864465b5eca5538567c79 jdk7-b86 8b493f1aa136d86de0885fcba15262c4fa2b1412 jdk7-b87 d8ebd15910034f2ba50b2f129f959f86cca01419 jdk7-b88 +826bafcb6c4abbf24887bfc5a78868e13cddd068 icedtea7-1.13 d2818fd2b036f3b3154a9a7de41afcf4ac679c1b jdk7-b89 c5d932ee326d6f7fd4634b11c7185ea82d184df2 jdk7-b90 b89b2c3044a298d542f84a2e9d957202b7d8cdb9 jdk7-b91 @@ -111,6 +113,7 @@ d56b326ae0544fc16c3e0d0285876f3c82054db2 jdk7-b134 4aa9916693dc1078580c1865e6f2584046851e5a jdk7-b135 1759daa85d33800bd578853f9531f9de73f70fc7 jdk7-b136 +1c2f25bf36b1d43920e94fb82a0afdafd29b1735 icedtea-1.14 1d87f7460cde7f8f30af668490f82b52b879bfd8 jdk7-b137 be3758943770a0a3dd4be6a1cb4063507c4d7062 jdk7-b138 28c7c0ed2444607829ba11ad827f8d52197a2830 jdk7-b139 @@ -123,6 +126,7 @@ bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146 067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01 fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147 +b8d01501956a0d41f5587ff1bebbfe5a9b8fea5a icedtea-2.0-branchpoint 104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02 64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03 2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04 @@ -141,6 +145,7 @@ 0e61ef309edd2deb71f53f2bdaf6dcff1c80bfb8 jdk7u2-b12 d9ac427e5149d1db12c6f3e4aa4280587c06aed5 jdk7u2-b13 0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u2-b21 +7300d2ab9fb2068250a96ca4afc481c4beb6a42b icedtea-2.1-branchpoint 0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u3-b02 604dd391203960d0028fc95bc70b0ae161e09d99 jdk7u3-b03 551c076358f6691999f613db9b155c83ec9a648d jdk7u3-b04 @@ -157,6 +162,7 @@ 7a37651d304de62b18b343b3ae675ab1b08fc5fe jdk7u4-b10 3fbd87d50fbf4de3987e36ec5f3e8ce1c383ce3d jdk7u4-b11 b4e5df5b18bb75db15ed97da02e5df086d2c7930 jdk7u4-b12 +c51876b27811ba0f6ea3409ba19d357b7400908a icedtea-2.2-branchpoint 7d18bccaec3781f3d4f2d71879f91e257db2f0f7 jdk7u4-b13 82c5b3166b3194e7348b2a9d146b6760c9a77128 jdk7u4-b14 36490d49683f7be9d8fbbe1f8eefa1fe9fe550fa jdk7u5-b01 @@ -191,6 +197,7 @@ 94474d6f28284a1ef492984dd6d6f66f8787de80 jdk7u6-b15 0b329a8d325b6a58d89c6042dac62ce5852380ab jdk7u6-b16 5eb867cdd08ca299fe03b31760acd57aac2b5673 jdk7u6-b17 +445dd0b578fc2ed12c539eb6f9a71cbd40bed4f6 icedtea-2.3-branchpoint 1c4b9671de5c7ed5713f55509cb2ada38b36dffe jdk7u6-b18 3ba4c395d2cf973c8c603b2aedc846bd4ae54656 jdk7u6-b19 4f7b77cc3b252098f52a8f30a74f603783a2e0f1 jdk7u6-b20 @@ -199,3 +206,102 @@ 8824bcbfd7cd8059ededf70f1e7f2b06f02cb33f jdk7u6-b23 378f719cfb9491b766cd9f7cd47ad7fa3503e141 jdk7u6-b24 5f1b80e8baec46fc28826a3a6ab8e1913c872f4c jdk7u6-b30 +1d3e59049a8998841ec63bc119adb1ea3f4c7116 icedtea-2.3 +20e3c00ca7ae9649a40b385223a6c3b0d1155b93 icedtea-2.3.1 +9bd1d8e8b802a8e22637c8a2e0acad9c9cb4a114 icedtea-2.3.2 +ee4bd94136ece0fed96b7b8d18f4d99f74fbd326 icedtea-2.3.3 +f45296ac69be649f775ac878387e96fd16504b81 icedtea-2.3.4 +91fcc41a0b4b27db954f1bb44b1b6ebe1780b7bb icedtea-2.3.5 +dce7523618e418ebd4505dc574a9f3772c15758c icedtea-2.3.6 +dce7523618e418ebd4505dc574a9f3772c15758c icedtea-2.3.6 +0000000000000000000000000000000000000000 icedtea-2.3.6 +2eafa8a6fd8fdb54b10045e247d1a57f9817f473 jdk7u6-b31 +2eafa8a6fd8fdb54b10045e247d1a57f9817f473 jdk7u7-b10 +c4aa15da8529451cc678d5747e7b82e9cc38627e jdk7u7-b30 +f6e11679b12e1548f407b78a940c568401dd2a19 jdk7u7-b11 +7840a267c777e22004912ad0aadd5258ac3d36c6 jdk7u7-b31 +61fc72e9fe26b3acf1572866143c22719c088b62 jdk7u7-b01 +78d9e4853388a2e7be18ff18c0b5330c074cb514 jdk7u7-b02 +fc7c5aa8c722f28c59560ce83140e803d853afc9 jdk7u9-b03 +0000000000000000000000000000000000000000 jdk7u7-b01 +61fc72e9fe26b3acf1572866143c22719c088b62 jdk7u9-b01 +0000000000000000000000000000000000000000 jdk7u7-b02 +78d9e4853388a2e7be18ff18c0b5330c074cb514 jdk7u9-b02 +b12a2d557c5e302b614c5f7e25ad6c8a0e138742 jdk7u9-b04 +ab4bbb93b3831aca230c62431f7fe02b56793450 jdk7u9-b05 +039b21e98d2b2d0b26a19c325b37ce522bae39de jdk7u9-b31 +d80a8e81fef0bc6e0bdb7891895bda527853add1 jdk7u9-b32 +254ed6ae237ee631179819570cf7fb265c6fb3a8 jdk7u10-b10 +c1df39bcc9c1bcdfb2a92682650264b3b7771ce8 jdk7u10-b11 +00cfd60368048c4969785eb52ec50cf5691c4367 jdk7u10-b12 +51efccc2b4e908fa0475075739c1463d1dd50efc jdk7u10-b13 +c245a6332320a86342683e6f732f3f8f2f4de69a jdk7u10-b14 +89b043ba2e01e969090e23a5a7a2e9f7165ff5a0 jdk7u10-b15 +5449d5396bd8deee90f18f29899343129e3cdc4e jdk7u10-b16 +86c75e6aa3a7fa9a587fc7dd2d08af8aa8ffb9a9 jdk7u10-b17 +162a2c6ad8718a63253fa53724f704a4f85731bc jdk7u10-b18 +c59eb287de720ae5ce8087f179ec01f4f6525a32 jdk7u10-b30 +ec1e8ead41ee49d2b3f84a26ae0fac88e226692d jdk7u10-b31 +853059839d38432f86e345ba951397ede235a374 jdk7u11-b20 +453a52320a1b8bd425fdb55e14b64067b536f1e2 jdk7u11-b21 +71353182d3f7c237047c5386d9f31186a5bd1519 jdk7u11-b32 +af8f33c558d05aacdff5b5787be0cbaba9f10e98 jdk7u11-b33 +5df9207c4378b7f4b24d70b365714c5ee6318982 jdk7u11-b03 +6ee19b9c8313db32e6d8989aa3782830d2b09710 jdk7u11-b04 +3312b258392eaeab9c4a20e3deb36d3ae3337efe jdk7u11-b05 +86d0250b62bbb4aabab2a7c249aeb14847be2631 jdk7u11-b06 +225aa78c36e9b776c87e585329bbb7ee0e3259a3 jdk7u11-b07 +48491f5a58172f0fbdf9b774842c2ec1a42f609a jdk7u11-b08 +eb9d57159e5126cf4316c9571ac39324a8b442a8 jdk7u13-b09 +0000000000000000000000000000000000000000 icedtea-2.3.6 +387d46be7c40696fcadd9f15c5538e8517af79d1 icedtea-2.3.6 +d7feafb8427bd47a4b9239ff529999d65b0936ac icedtea-2.3.7 +1d46a56eb51c0efa3ef68a8aab67b3d992e36645 icedtea-2.3.8 +f9fe0d38b1103cb33073538c959d982e28ed7b11 jdk7u13-b10 +0a6a09e5174a4c15632ff7e06d6b215164e3fa15 jdk7u13-b30 +f9fe0d38b1103cb33073538c959d982e28ed7b11 jdk7u13-b20 +99c114990b191f32e72c6158072033aec5816aaf jdk7u15-b01 +edbaa584f09a78d0ad3c73389faf20409a552e46 jdk7u15-b02 +14a9b60a2086f4e2f6ec43bee3375042946f6510 jdk7u15-b30 +de6df3c10ebc0f8c704a11ad86c8eea1e1cc1442 jdk7u15-b31 +039c31ff1fe6789859f2f55588218147623a9a9f jdk7u15-b33 +a55f67cfe182dc42a86aae836674eb8ba5b79891 jdk7u15-b03 +eb9d57159e5126cf4316c9571ac39324a8b442a8 jdk7u15-b32 +8a9867ee429440b657eb5852c4dae5f029356022 jdk7u17-b01 +d2142901bcb789071858ae249d5a29f12d8bce78 icedtea-2.3.9 +1a02956fcfaf708c626e06105dbf615594af88f7 icedtea-2.3.10 +181faea8867b60279d38450b37c52a916fd11046 icedtea-2.3.11 +332f0234a53eb42c90363abcdf361ae5f2b71ffa icedtea-2.3.12 +7863a60ae4b4a0c7d762a95e77e589fafa4e50ae jdk7u17-b02 +a5e6594fc1ae20101b5d69632f65078d7a99b76d jdk7u17-b30 +8fb34202383ece5386acecc3a6c1dac68dccbf05 jdk7u17-b31 +f7d8d2c003a10c38beac2f57e77d19303c71d6fc jdk7u17-b32 +0a6a09e5174a4c15632ff7e06d6b215164e3fa15 jdk7u21-b01 +99ed1a3d29509fee659aabec4810c896b7234d80 jdk7u21-b02 +38d4d23d167c5a623e6d771a15b1fe2ee771ce38 jdk7u21-b03 +acde12ee462d650d34cc148d9d3649f9a9bbca8a jdk7u21-b04 +56b1ad031df90d20c52941c15ceae0e5a90893b8 jdk7u21-b05 +ab51202418c1c96e01a45893a26829a2d9c7b956 jdk7u21-b06 +3ab71deee4a4477d89530ee9e92a36017a6092fa jdk7u21-b07 +f5ef2e76669bc3179f17dac42a8a407fb6bd4d91 jdk7u21-b08 +65977091d010402ccbed41c96748866a1d50f0c4 jdk7u21-b09 +bf2d62ea518d5e4130e442e07705e7a50b821ad9 jdk7u21-b10 +3e0e331bdfb8f3adfd0cc78118e0ac588e73a2b5 jdk7u21-b11 +980fe893d8fd86d8aee14771167b6e0ac75fa208 jdk7u21-b30 +a320a590b4cac6eeff53829bde520ef46880b006 jdk7u21-b12 +5704dc942da676677a820d16c9a08fc6cad5b3bb jdk7u25-b01 +f9c1fe7cd1194e785807f07005369631b35b28d8 jdk7u25-b02 +fe858d7d6a13829d0ef0a1f762bd0e769cd24fa1 jdk7u25-b03 +1a2822a1d6a40c6e469f4089f39e41f642a87843 jdk7u25-b04 +e927605d1678c5d94adfc44183160d6c4df05b8b jdk7u25-b05 +8dfb4db227e7795120c072781927ba7d35186559 jdk7u25-b06 +ad2732999848b6e57f564d85e18ddebab6315ac2 jdk7u25-b07 +df9def2569705ebe316b50e673f847d2ec47eccf jdk7u25-b08 +5952538d55e624132f97400332a50b71880c874c jdk7u25-b09 +aa00dd983dd0f5b07269d0648a0325e9b3e0d957 jdk7u25-b10 +0fb6d76bcd2e8d54d0a69e1c3d2a85d84b3e17a4 jdk7u25-b11 +5e87aee78c91efa65bd5aeb37bcc1c1c637a7f0c jdk7u25-b12 +83b80c094befd08cbac4247d9b8f12c6a039f23f jdk7u25-b13 +68cc0d2a49f09b5c611b2775f2e66de1022bdedc jdk7u25-b14 +503f75b55b34ae22f43b2992b1e56c96e35a60de jdk7u25-b15 +8c35f2344beeb42e85d718e95813e6fdc2f0a605 jdk7u25-b30 diff -r 2eafa8a6fd8f -r aac1cda37627 .jcheck/conf --- a/.jcheck/conf Mon Aug 13 14:20:00 2012 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 2eafa8a6fd8f -r aac1cda37627 src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java --- a/src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java Mon Aug 13 14:20:00 2012 -0700 +++ b/src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java Thu Aug 08 23:15:34 2013 +0100 @@ -63,6 +63,7 @@ import com.sun.org.apache.bcel.internal.util.ClassVector; import com.sun.org.apache.bcel.internal.util.ClassQueue; import com.sun.org.apache.bcel.internal.generic.Type; +import com.sun.org.apache.xalan.internal.utils.SecuritySupport; import java.io.*; import java.util.StringTokenizer; @@ -77,6 +78,7 @@ * class file. Those interested in programatically generating classes * should see the ClassGen class. + * @version $Id: JavaClass.java,v 1.4 2007-07-19 04:34:42 ofung Exp $ * @see com.sun.org.apache.bcel.internal.generic.ClassGen * @author M. Dahm */ @@ -451,9 +453,9 @@ String debug = null, sep = null; try { - debug = System.getProperty("JavaClass.debug"); + debug = SecuritySupport.getSystemProperty("JavaClass.debug"); // Get path separator either / or \ usually - sep = System.getProperty("file.separator"); + sep = SecuritySupport.getSystemProperty("file.separator"); } catch (SecurityException e) { // falls through diff -r 2eafa8a6fd8f -r aac1cda37627 src/com/sun/org/apache/bcel/internal/util/Class2HTML.java --- a/src/com/sun/org/apache/bcel/internal/util/Class2HTML.java Mon Aug 13 14:20:00 2012 -0700 +++ b/src/com/sun/org/apache/bcel/internal/util/Class2HTML.java Thu Aug 08 23:15:34 2013 +0100 @@ -82,6 +82,7 @@ * method in the Method's frame will jump to the appropiate method in * the Code frame. * + * @version $Id: Class2HTML.java,v 1.3 2007-07-19 04:34:52 ofung Exp $ * @author M. Dahm */ public class Class2HTML implements Constants @@ -137,7 +138,7 @@ ClassParser parser=null; JavaClass java_class=null; String zip_file = null; - char sep = System.getProperty("file.separator").toCharArray()[0]; + char sep = SecuritySupport.getSystemProperty("file.separator").toCharArray()[0]; String dir = "." + sep; // Where to store HTML files try { diff -r 2eafa8a6fd8f -r aac1cda37627 src/com/sun/org/apache/bcel/internal/util/ClassPath.java --- a/src/com/sun/org/apache/bcel/internal/util/ClassPath.java Mon Aug 13 14:20:00 2012 -0700 +++ b/src/com/sun/org/apache/bcel/internal/util/ClassPath.java Thu Aug 08 23:15:34 2013 +0100 @@ -66,6 +66,7 @@ * Responsible for loading (class) files from the CLASSPATH. Inspired by * sun.tools.ClassPath. * + * @version $Id: ClassPath.java,v 1.4 2007-07-19 04:34:52 ofung Exp $ * @author M. Dahm */ public class ClassPath implements Serializable { @@ -83,7 +84,7 @@ ArrayList vec = new ArrayList(); for(StringTokenizer tok=new StringTokenizer(class_path, - System.getProperty("path.separator")); + SecuritySupport.getSystemProperty("path.separator")); tok.hasMoreTokens();) { String path = tok.nextToken(); @@ -92,7 +93,7 @@ File file = new File(path); try { - if(file.exists()) { + if(SecuritySupport.getFileExists(file)) { if(file.isDirectory()) vec.add(new Dir(path)); else @@ -143,8 +144,9 @@ String name = tok.nextToken(); File file = new File(name); - if(file.exists()) + if(SecuritySupport.getFileExists(file)) { list.add(name); + } } } } @@ -159,9 +161,9 @@ String class_path, boot_path, ext_path; try { - class_path = System.getProperty("java.class.path"); - boot_path = System.getProperty("sun.boot.class.path"); - ext_path = System.getProperty("java.ext.dirs"); + class_path = SecuritySupport.getSystemProperty("java.class.path"); + boot_path = SecuritySupport.getSystemProperty("sun.boot.class.path"); + ext_path = SecuritySupport.getSystemProperty("java.ext.dirs"); } catch (SecurityException e) { return ""; @@ -176,8 +178,8 @@ getPathComponents(ext_path, dirs); for(Iterator e = dirs.iterator(); e.hasNext(); ) { - File ext_dir = new File((String)e.next()); - String[] extensions = ext_dir.list(new FilenameFilter() { + File ext_dir = new File((String)e.next()); + String[] extensions = SecuritySupport.getFileList(ext_dir, new FilenameFilter() { public boolean accept(File dir, String name) { name = name.toLowerCase(); return name.endsWith(".zip") || name.endsWith(".jar"); @@ -342,7 +344,7 @@ final File file = new File(dir + File.separatorChar + name.replace('.', File.separatorChar) + suffix); - return file.exists()? new ClassFile() { + return SecuritySupport.getFileExists(file)? new ClassFile() { public InputStream getInputStream() throws IOException { return new FileInputStream(file); } public String getPath() { try { diff -r 2eafa8a6fd8f -r aac1cda37627 src/com/sun/org/apache/bcel/internal/util/JavaWrapper.java --- a/src/com/sun/org/apache/bcel/internal/util/JavaWrapper.java Mon Aug 13 14:20:00 2012 -0700 +++ b/src/com/sun/org/apache/bcel/internal/util/JavaWrapper.java Thu Aug 08 23:15:34 2013 +0100 @@ -72,6 +72,7 @@ *

java com.sun.org.apache.bcel.internal.util.JavaWrapper -Dbcel.classloader=foo.MyLoader <real.class.name> [arguments]
*

* + * @version $Id: JavaWrapper.java,v 1.3 2007-07-19 04:34:52 ofung Exp $ * @author M. Dahm * @see ClassLoader */ @@ -79,7 +80,7 @@ private java.lang.ClassLoader loader; private static java.lang.ClassLoader getClassLoader() { - String s = System.getProperty("bcel.classloader"); + String s = SecuritySupport.getSystemProperty("bcel.classloader"); if((s == null) || "".equals(s)) s = "com.sun.org.apache.bcel.internal.util.ClassLoader"; diff -r 2eafa8a6fd8f -r aac1cda37627 src/com/sun/org/apache/bcel/internal/util/SecuritySupport.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/com/sun/org/apache/bcel/internal/util/SecuritySupport.java Thu Aug 08 23:15:34 2013 +0100 @@ -0,0 +1,223 @@ +/* + * reserved comment block + * DO NOT REMOVE OR ALTER! + */ +/* + * Copyright 2002-2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.sun.org.apache.bcel.internal.util; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FilenameFilter; +import java.io.InputStream; +import java.lang.ClassLoader; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.security.PrivilegedActionException; +import java.security.PrivilegedExceptionAction; +import java.util.ListResourceBundle; +import java.util.Locale; +import java.util.MissingResourceException; +import java.util.ResourceBundle; + +/** + * This class is duplicated for each subpackage so keep it in sync. It is + * package private and therefore is not exposed as part of any API. + * + * @xerces.internal + */ +public final class SecuritySupport { + + private static final SecuritySupport securitySupport = new SecuritySupport(); + + /** + * Return an instance of this class. + */ + public static SecuritySupport getInstance() { + return securitySupport; + } + + static ClassLoader getContextClassLoader() { + return (ClassLoader) AccessController.doPrivileged(new PrivilegedAction() { + public Object run() { + ClassLoader cl = null; + try { + cl = Thread.currentThread().getContextClassLoader(); + } catch (SecurityException ex) { + } + return cl; + } + }); + } + + static ClassLoader getSystemClassLoader() { + return (ClassLoader) AccessController.doPrivileged(new PrivilegedAction() { + public Object run() { + ClassLoader cl = null; + try { + cl = ClassLoader.getSystemClassLoader(); + } catch (SecurityException ex) { + } + return cl; + } + }); + } + + static ClassLoader getParentClassLoader(final ClassLoader cl) { + return (ClassLoader) AccessController.doPrivileged(new PrivilegedAction() { + public Object run() { + ClassLoader parent = null; + try { + parent = cl.getParent(); + } catch (SecurityException ex) { + } + + // eliminate loops in case of the boot + // ClassLoader returning itself as a parent + return (parent == cl) ? null : parent; + } + }); + } + + public static String getSystemProperty(final String propName) { + return (String) AccessController.doPrivileged(new PrivilegedAction() { + public Object run() { + return System.getProperty(propName); + } + }); + } + + static FileInputStream getFileInputStream(final File file) + throws FileNotFoundException { + try { + return (FileInputStream) AccessController.doPrivileged(new PrivilegedExceptionAction() { + public Object run() throws FileNotFoundException { + return new FileInputStream(file); + } + }); + } catch (PrivilegedActionException e) { + throw (FileNotFoundException) e.getException(); + } + } + + /** + * Return resource using the same classloader for the ObjectFactory by + * default or bootclassloader when Security Manager is in place + */ + public static InputStream getResourceAsStream(final String name) { + if (System.getSecurityManager() != null) { + return getResourceAsStream(null, name); + } else { + return getResourceAsStream(findClassLoader(), name); + } + } + + public static InputStream getResourceAsStream(final ClassLoader cl, + final String name) { + return (InputStream) AccessController.doPrivileged(new PrivilegedAction() { + public Object run() { + InputStream ris; + if (cl == null) { + ris = Object.class.getResourceAsStream("/" + name); + } else { + ris = cl.getResourceAsStream(name); + } + return ris; + } + }); + } + + /** + * Gets a resource bundle using the specified base name, the default locale, + * and the caller's class loader. + * + * @param bundle the base name of the resource bundle, a fully qualified + * class name + * @return a resource bundle for the given base name and the default locale + */ + public static ListResourceBundle getResourceBundle(String bundle) { + return getResourceBundle(bundle, Locale.getDefault()); + } + + /** + * Gets a resource bundle using the specified base name and locale, and the + * caller's class loader. + * + * @param bundle the base name of the resource bundle, a fully qualified + * class name + * @param locale the locale for which a resource bundle is desired + * @return a resource bundle for the given base name and locale + */ + public static ListResourceBundle getResourceBundle(final String bundle, final Locale locale) { + return AccessController.doPrivileged(new PrivilegedAction() { + public ListResourceBundle run() { + try { + return (ListResourceBundle) ResourceBundle.getBundle(bundle, locale); + } catch (MissingResourceException e) { + try { + return (ListResourceBundle) ResourceBundle.getBundle(bundle, new Locale("en", "US")); + } catch (MissingResourceException e2) { + throw new MissingResourceException( + "Could not load any resource bundle by " + bundle, bundle, ""); + } + } + } + }); + } + + public static String[] getFileList(final File f, final FilenameFilter filter) { + return ((String[]) AccessController.doPrivileged(new PrivilegedAction() { From andrew at icedtea.classpath.org Fri Aug 9 04:22:53 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 09 Aug 2013 11:22:53 +0000 Subject: /hg/release/icedtea7-forest-2.3/jaxws: 61 new changesets Message-ID: changeset 82c7f6512b55 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=82c7f6512b55 author: katleman date: Fri Aug 17 11:58:14 2012 -0700 Added tag jdk7u6-b31 for changeset 739ffa9dffad changeset ed186626e80b in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=ed186626e80b author: asaha date: Thu Sep 13 18:28:35 2012 -0700 Merge changeset 5e5703e9d18d in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=5e5703e9d18d author: asaha date: Fri Oct 12 12:37:40 2012 -0700 Merge changeset ae4272d61bc7 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=ae4272d61bc7 author: katleman date: Fri Mar 01 11:55:26 2013 -0800 Added tag jdk7u17-b02 for changeset defde3ef0360 changeset e07c518282ba in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=e07c518282ba author: mkos date: Fri Feb 01 15:56:12 2013 +0100 8003543: Improve processing of MTOM attachments Summary: old File API replaced by NIO API; fix reviewed also by Alexander Fomin Reviewed-by: mullan, skoivu changeset 26242a7a2a36 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=26242a7a2a36 author: katleman date: Thu Feb 07 14:20:34 2013 -0800 Added tag jdk7u21-b01 for changeset e07c518282ba changeset 0c1365d2fefb in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=0c1365d2fefb author: ewendeli date: Mon Feb 11 21:09:01 2013 +0100 Merge changeset 017171d6bc21 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=017171d6bc21 author: katleman date: Thu Feb 14 14:11:24 2013 -0800 Added tag jdk7u21-b02 for changeset 0c1365d2fefb changeset 914a2fa3675d in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=914a2fa3675d author: katleman date: Tue Feb 19 17:13:52 2013 -0800 Added tag jdk7u21-b03 for changeset 017171d6bc21 changeset 68e8364feffc in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=68e8364feffc author: mkos date: Wed Feb 20 22:42:04 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 238b59ffddce in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=238b59ffddce author: katleman date: Tue Feb 26 12:45:15 2013 -0800 Added tag jdk7u21-b04 for changeset 68e8364feffc changeset 987bb65e7b73 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=987bb65e7b73 author: katleman date: Tue Oct 16 14:55:05 2012 -0700 Added tag jdk7u9-b31 for changeset 5e5703e9d18d changeset 5039fcf14267 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=5039fcf14267 author: katleman date: Wed Oct 31 10:11:40 2012 -0700 Added tag jdk7u9-b32 for changeset 987bb65e7b73 changeset 1e29414580be in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=1e29414580be author: asaha date: Tue Dec 04 11:45:41 2012 -0800 Merge changeset 29d469fac910 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=29d469fac910 author: asaha date: Wed Dec 05 15:29:39 2012 -0800 Merge changeset 7903fcde23ca in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=7903fcde23ca author: katleman date: Fri Dec 07 08:19:19 2012 -0800 Added tag jdk7u10-b31 for changeset 29d469fac910 changeset ac21be8046e0 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=ac21be8046e0 author: ewendeli date: Tue Jan 15 08:23:23 2013 +0100 Merge changeset 41abf18b24e9 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=41abf18b24e9 author: katleman date: Wed Jan 16 13:57:29 2013 -0800 Added tag jdk7u11-b32 for changeset ac21be8046e0 changeset efde7cd105da in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=efde7cd105da author: katleman date: Tue Jan 29 14:10:54 2013 -0800 Added tag jdk7u11-b33 for changeset 41abf18b24e9 changeset 59c3e3755d5f in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=59c3e3755d5f author: asaha date: Fri Feb 08 19:24:27 2013 -0800 Merge changeset 297240e69d8f in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=297240e69d8f author: asaha date: Mon Feb 11 11:16:37 2013 -0800 Merge changeset 6316fb89c6fe in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=6316fb89c6fe author: katleman date: Tue Feb 12 12:33:00 2013 -0800 Added tag jdk7u15-b31 for changeset 297240e69d8f changeset 4fda3b01c75e in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=4fda3b01c75e author: asaha date: Thu Feb 14 13:22:24 2013 -0800 Merge changeset 5eb5d0114067 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=5eb5d0114067 author: katleman date: Tue Feb 19 12:03:08 2013 -0800 Added tag jdk7u15-b33 for changeset 4fda3b01c75e changeset df8ad37350f7 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=df8ad37350f7 author: asaha date: Fri Mar 01 16:11:32 2013 -0800 Merge changeset 3770451e6307 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=3770451e6307 author: cl date: Sat Mar 02 09:47:51 2013 -0800 Added tag jdk7u17-b30 for changeset ae4272d61bc7 changeset 52c4fbd4f58f in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=52c4fbd4f58f author: asaha date: Sat Mar 02 14:38:19 2013 -0800 Merge changeset 52810f8d2dc0 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=52810f8d2dc0 author: cl date: Sat Mar 02 18:55:36 2013 -0800 Added tag jdk7u17-b31 for changeset 52c4fbd4f58f changeset 8c43fd5d8cfe in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=8c43fd5d8cfe author: asaha date: Mon Mar 04 11:44:20 2013 -0800 Merge changeset dab51e98ee7d in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=dab51e98ee7d author: katleman date: Tue Mar 05 16:45:49 2013 -0800 Added tag jdk7u21-b05 for changeset 8c43fd5d8cfe changeset 4a9533495068 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=4a9533495068 author: katleman date: Tue Mar 12 14:44:15 2013 -0700 Added tag jdk7u21-b06 for changeset dab51e98ee7d changeset ab11cef1dfaa in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=ab11cef1dfaa author: katleman date: Tue Mar 19 14:33:49 2013 -0700 Added tag jdk7u21-b07 for changeset 4a9533495068 changeset 53c87e8a2ac4 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=53c87e8a2ac4 author: katleman date: Wed Mar 20 14:47:31 2013 -0700 Added tag jdk7u21-b08 for changeset ab11cef1dfaa changeset 29c03ced9215 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=29c03ced9215 author: katleman date: Tue Mar 26 15:00:31 2013 -0700 Added tag jdk7u21-b09 for changeset 53c87e8a2ac4 changeset fe6f5b57b9e6 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=fe6f5b57b9e6 author: katleman date: Sun Mar 31 03:46:50 2013 -0700 Added tag jdk7u21-b10 for changeset 29c03ced9215 changeset 12183763c620 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=12183763c620 author: katleman date: Thu Apr 04 15:48:23 2013 -0700 Added tag jdk7u21-b11 for changeset fe6f5b57b9e6 changeset d4eba65d0f77 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=d4eba65d0f77 author: katleman date: Fri Apr 05 12:48:59 2013 -0700 Added tag jdk7u21-b30 for changeset 12183763c620 changeset 709cc8201c1a in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=709cc8201c1a author: katleman date: Sun Apr 07 16:34:57 2013 -0700 Added tag jdk7u21-b12 for changeset d4eba65d0f77 changeset 8797b25cbeb3 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=8797b25cbeb3 author: katleman date: Tue Mar 12 14:45:20 2013 -0700 Added tag jdk7u25-b01 for changeset 238b59ffddce changeset 9793150ad1aa in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=9793150ad1aa author: katleman date: Tue Mar 19 14:31:38 2013 -0700 Added tag jdk7u25-b02 for changeset 8797b25cbeb3 changeset e1116df2893f in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=e1116df2893f 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 changeset 4635a58db6b0 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=4635a58db6b0 author: coffeys date: Thu Mar 21 22:31:56 2013 +0000 Merge changeset 57d4548795c3 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=57d4548795c3 author: katleman date: Tue Mar 26 14:17:49 2013 -0700 Added tag jdk7u25-b03 for changeset 4635a58db6b0 changeset c9665cf98a6a in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=c9665cf98a6a author: katleman date: Tue Apr 02 12:12:18 2013 -0700 Added tag jdk7u25-b04 for changeset 57d4548795c3 changeset 4e9063594b06 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=4e9063594b06 author: coffeys date: Fri Apr 05 21:34:27 2013 +0100 Merge changeset 7faaa6a5721a in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=7faaa6a5721a author: katleman date: Mon Mar 04 14:17:23 2013 -0800 Added tag jdk7u17-b32 for changeset 52810f8d2dc0 changeset 83fc7484a44d in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=83fc7484a44d author: asaha date: Mon Apr 08 15:57:19 2013 -0700 Merge changeset 35882693ee35 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=35882693ee35 author: asaha date: Mon Apr 08 16:31:33 2013 -0700 Merge changeset c141079e6096 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=c141079e6096 author: katleman date: Wed Apr 10 12:43:00 2013 -0700 Added tag jdk7u25-b05 for changeset 35882693ee35 changeset f8e4e84e2dc4 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=f8e4e84e2dc4 author: katleman date: Tue Apr 16 11:28:09 2013 -0700 Added tag jdk7u25-b06 for changeset c141079e6096 changeset 7ff0c910fb96 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=7ff0c910fb96 author: katleman date: Thu Apr 18 11:44:26 2013 -0700 Added tag jdk7u25-b07 for changeset f8e4e84e2dc4 changeset 0cd0d4e7331f in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=0cd0d4e7331f author: katleman date: Tue Apr 23 16:21:41 2013 -0700 Added tag jdk7u25-b08 for changeset 7ff0c910fb96 changeset 105cdfd4f408 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=105cdfd4f408 author: katleman date: Tue Apr 30 12:25:23 2013 -0700 Added tag jdk7u25-b09 for changeset 0cd0d4e7331f changeset 6de7fec036ab in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=6de7fec036ab author: katleman date: Tue May 07 12:56:32 2013 -0700 Added tag jdk7u25-b10 for changeset 105cdfd4f408 changeset 4c5d242efa0d in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=4c5d242efa0d author: katleman date: Wed May 15 13:31:02 2013 -0700 Added tag jdk7u25-b11 for changeset 6de7fec036ab changeset 6b4a16522130 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=6b4a16522130 author: katleman date: Wed May 22 15:44:59 2013 -0700 Added tag jdk7u25-b12 for changeset 4c5d242efa0d changeset 03073e4e6d3f in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=03073e4e6d3f author: katleman date: Fri May 24 16:20:36 2013 -0700 Added tag jdk7u25-b13 for changeset 6b4a16522130 changeset 4a925430bf71 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=4a925430bf71 author: katleman date: Tue Jun 04 10:47:45 2013 -0700 Added tag jdk7u25-b14 for changeset 03073e4e6d3f changeset 3ecf7ddefa03 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=3ecf7ddefa03 author: katleman date: Thu Jun 06 11:41:43 2013 -0700 Added tag jdk7u25-b15 for changeset 4a925430bf71 changeset 1826480d02a3 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=1826480d02a3 author: katleman date: Tue Jun 11 11:45:23 2013 -0700 Added tag jdk7u25-b30 for changeset 3ecf7ddefa03 changeset 3cbb617cd2e4 in /hg/release/icedtea7-forest-2.3/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=3cbb617cd2e4 author: andrew date: Thu Aug 08 23:15:27 2013 +0100 Merge jdk7u25-b16 diffstat: .hgtags | 106 ++++++ .jcheck/conf | 2 - patches/jaxws_src/xjc.patch | 17 + 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 +- src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java | 13 +- src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java | 24 +- src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/TempFiles.java | 144 +++++++++ src/share/jaxws_classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java | 46 ++- src/share/jaxws_classes/javax/xml/soap/FactoryFinder.java | 157 ++++++--- src/share/jaxws_classes/javax/xml/soap/MessageFactory.java | 13 +- src/share/jaxws_classes/javax/xml/soap/SAAJMetaFactory.java | 4 +- src/share/jaxws_classes/javax/xml/soap/SOAPConnectionFactory.java | 4 +- src/share/jaxws_classes/javax/xml/soap/SOAPFactory.java | 10 +- 20 files changed, 484 insertions(+), 112 deletions(-) diffs (truncated from 1155 to 500 lines): diff -r 739ffa9dffad -r 3cbb617cd2e4 .hgtags --- a/.hgtags Mon Aug 13 14:20:02 2012 -0700 +++ b/.hgtags Thu Aug 08 23:15:27 2013 +0100 @@ -50,6 +50,7 @@ 558985e26fe16f5a6ebb2edb9180a42e1c8e8202 jdk7-b73 f4466e1b608088c90e11beaa4b600f102608c6a1 jdk7-b74 fcf2b8b5d606641659419f247fcee4b284c45e6e jdk7-b75 +0dc08d528c998ca993e759b311e7b54c98e0ef28 icedtea7-1.12 765d2077d1e652e234d27fe85ba58a986b488503 jdk7-b76 5b4968c110476085225d3a71c4210fad2c1116c1 jdk7-b77 fc1c72d1dfbb17db7d46bba8db9afc39cbbb9299 jdk7-b78 @@ -63,6 +64,7 @@ 512b0e924a5ae0c0b7ad326182cae0dc0e4d1aa8 jdk7-b86 3febd6fab2ac8ffddbaf7bed00d11290262af153 jdk7-b87 8c666f8f3565974e301ccb58b7538912551a6e26 jdk7-b88 +1661166c82dc2102f3f0364e28d1e4211f25a4cf icedtea7-1.13 bf3675aa7f20fc6f241ce95760005aef2a30ff41 jdk7-b89 ead7c4566a0017bcb44b468b3ac03b60dc5333ce jdk7-b90 cf4686bf35abd1e573f09fa43cbec66403160ae9 jdk7-b91 @@ -111,6 +113,7 @@ 545de8303fec939db3892f7c324dd7df197e8f09 jdk7-b134 d5fc61f18043765705ef22b57a68c924ab2f1a5b jdk7-b135 c81d289c9a532d6e94af3c09d856a2a20529040f jdk7-b136 +339c2d381d80dbf9b74604e6ba43ead276b8024e icedtea-1.14 ccea3282991ce8b678e188cf32a8239f76ff3bfa jdk7-b137 cc956c8a8255583535597e9a63db23c510e9a063 jdk7-b138 c025078c8362076503bb83b8e4da14ba7b347940 jdk7-b139 @@ -123,6 +126,7 @@ 05469dd4c3662c454f8a019e492543add60795cc jdk7-b146 c01bfd68d0528bc88348813c4d75d7f5c62bc4e2 jdk7u1-b01 d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147 +e6cd09c7ef22bbabe31c9f2a32c7e13cfa713fd3 icedtea-2.0-branchpoint 4c24f7019ce939a452154a83151294ad7da66a9d jdk7u1-b02 272778f529d11081f548f37fcd6a7aec0b11a8dd jdk7u1-b03 48b06a6e6f46e5bcd610f4bed57cd5067cf31f8c jdk7u1-b04 @@ -141,6 +145,7 @@ 21131044a61353ac20e360bce52d8f480e08d7a2 jdk7u2-b12 9728fd833e01faa5e51484aeaf3c51d32d1175fb jdk7u2-b13 d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u2-b21 +d26ff33070cb75a0a7349d965ec4f0930ded418d icedtea-2.1-branchpoint d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u3-b02 44e824502fa24440f907205ccdc3959d01bd8109 jdk7u3-b03 6e1cc321aacea944691aa06558f2bbad89baf5b3 jdk7u3-b04 @@ -157,6 +162,7 @@ 3891fe529057431278394c6341cfabaacd5061f5 jdk7u4-b10 2df5cd83fab91f050c4bac54aa06e174ecee38f4 jdk7u4-b11 4d3a9fe44f7531642bc739ec3c8efb2e6d9e08c7 jdk7u4-b12 +1854d8e2547cb18ebcf84db13c22d0987c49c274 icedtea-2.2-branchpoint c3b6659aa169b3f249246497a8d5a87baa1e798a jdk7u4-b13 0f8963feaefda21e72f84b8ea49834a289d537f3 jdk7u4-b14 61516652b59ec411678b38a232a84413652a4172 jdk7u5-b01 @@ -191,6 +197,7 @@ f1dba7ebe6a50c22ffcaf85b14b31462ce008556 jdk7u6-b15 e1d2afbb63d27600dd8c8a021eadff84a901a73c jdk7u6-b16 401bdbbf89c9187b51dc8906c0e2700ef0ffc8a3 jdk7u6-b17 +8888d2790217c31edbf13ea81d9ac06210092ad2 icedtea-2.3-branchpoint a1daf7097c61181216233e4850ef6ec56b0fe6b6 jdk7u6-b18 58c1c6ecf8f1e59db9b575ae57b2894d0152d319 jdk7u6-b19 6d17242f12edc643ecab4263e656003a1ca44c03 jdk7u6-b20 @@ -199,3 +206,102 @@ afb6d773328fa76cea65dc024a448cd931d111f2 jdk7u6-b23 b8b85e62d2c5347df8cf2e825e51e3de178508ea jdk7u6-b24 fb03d08f73e98f0dd67cb81632eb9b685de49b7e jdk7u6-b30 +973648e4cf9bafe4e0c489a7a5711a9047262f88 icedtea-2.3 +410de4b438cf005c78611209ffa0799d89be1e19 icedtea-2.3.1 +9a744f20cfc52e19f66956e5d406c23910ed4cb4 icedtea-2.3.2 +c89c6ac953e7f30780e74b4bc153fee4dd330179 icedtea-2.3.3 +03f54ef339144764e218c6548c237e06d54d5ac7 icedtea-2.3.4 +7182233cc27e9f1ee8435dbcf6c3948379ec35b0 icedtea-2.3.5 +8064f322e58d24f7ced21b73eccff37ee06a33ea icedtea-2.3.6 +8064f322e58d24f7ced21b73eccff37ee06a33ea icedtea-2.3.6 +0000000000000000000000000000000000000000 icedtea-2.3.6 +739ffa9dffad4cc2febe66ca1c2d86496e80741a jdk7u6-b31 +739ffa9dffad4cc2febe66ca1c2d86496e80741a jdk7u7-b10 +e9a5a78329d0518efafd9f6f6149f359a7db4e2e jdk7u7-b30 +ed6262e7bb0db4cd116c31f3c88cbd7c0288de40 jdk7u7-b11 +538c248de3ef0fcb34c28295c1eab61269708137 jdk7u7-b31 +dc2e6882056c2d400d4cf3c78d67da8e20fc37cc jdk7u7-b01 +45cf55bc1732e8495425dceb385740c6852c0fc8 jdk7u7-b02 +0289894a64a628133bb63f1dc48b45593f96a14d jdk7u9-b03 +0000000000000000000000000000000000000000 jdk7u7-b01 +dc2e6882056c2d400d4cf3c78d67da8e20fc37cc jdk7u9-b01 +0000000000000000000000000000000000000000 jdk7u7-b02 +45cf55bc1732e8495425dceb385740c6852c0fc8 jdk7u9-b02 +66a2e01550a9e84e907a7f7b96e64ee90a4ec0e4 jdk7u9-b04 +f3e42e044584b1b21de29eef1b82974d273c77dc jdk7u9-b05 +5e5703e9d18d66d7388057040d3c36e978488dc5 jdk7u9-b31 +987bb65e7b73ad94fb0edecce80d84ee5f8bda6e jdk7u9-b32 +dd8e4098681aa581d0398ad7d2d1e2547517c7e5 jdk7u10-b10 +1784290b63bcf021334b0accdb3868fdc4ca854e jdk7u10-b11 +fde9a060a04d9f9b54f36d645e91ec9a2b40cb81 jdk7u10-b12 +d7bf349cf0c60bc41a33c1f70969f11668deddb3 jdk7u10-b13 +17ec7a59002695c35dbd83a120b705e21d982d68 jdk7u10-b14 +75ecadd1f8fc5a218b1ed71b3c3df776d76e048e jdk7u10-b15 +ed609545e38c2e499437292c1541e4d1c2b8b992 jdk7u10-b16 +e63292c59ed8481864302cc3f53b498cbdea3470 jdk7u10-b17 +6a372e9b4ae978cdaf0b95277db31827794e2c1f jdk7u10-b18 +df3e4c85e26c651d098cddd546916a625fd777cd jdk7u10-b30 +29d469fac9106ce7c2f8656ee125e792908aca98 jdk7u10-b31 +846f4e01218ffe37b2dbceaf89c222c0aea43180 jdk7u11-b20 +1f06394ca182cb392e472ba7b63b28a40725629d jdk7u11-b21 +ac21be8046e06e5460d041b7e4f8140d635887fb jdk7u11-b32 +41abf18b24e9483de775bf938f8d5e673c08209d jdk7u11-b33 +ed609545e38c2e499437292c1541e4d1c2b8b992 jdk7u11-b03 +4e1dd1192649575e80d893bcab411077b77c9a0c jdk7u11-b04 +0e1eefefc2d0c8f0d0cd9e7fb7d78ae026aa8ba0 jdk7u11-b05 +7365410bb417d6a40996920bb4dbb44bdb1225a9 jdk7u11-b06 +66786f9d73c479ce70a306e14dd7f653f5b3a4f9 jdk7u11-b07 +a3cadd00459f1146fdcfa8702bbb29efdcd58960 jdk7u11-b08 +c7ea4220ad61b125bd7c4b7f112dd9ff18e9be33 jdk7u13-b09 +0000000000000000000000000000000000000000 icedtea-2.3.6 +4390dfdde97c7de6b3a12fe59586188fa3ad535c icedtea-2.3.6 +b900024eb4ba87ac1653a6cc6ff30d0809f5dcb5 icedtea-2.3.7 +b9590aa972b990f954c6d16c8a1acf83d5e56cbf icedtea-2.3.8 +1d2eb88cadaf29bf577a71c69b04afe2468d8ff6 jdk7u13-b10 +21dbdd72a46a29c148ea3519268447c467540637 jdk7u13-b30 +1d2eb88cadaf29bf577a71c69b04afe2468d8ff6 jdk7u13-b20 +abcaebcead605f89cd0919add20d8ac16637ddc2 jdk7u15-b01 +62f9e7f5eb644fedd93dd93bd36bcf817a8d9c8a jdk7u15-b02 +ed9f270009f2b8606e9e0f58aeedbed36e13963e jdk7u15-b30 +297240e69d8ffcf85fc68b12af6523f7ea16397e jdk7u15-b31 +4fda3b01c75ecd80dba505f6152c21f3e1db5cce jdk7u15-b33 +eaf9b299067069826a5acdc88e15402e5a22cb5d jdk7u15-b03 +c7ea4220ad61b125bd7c4b7f112dd9ff18e9be33 jdk7u15-b32 +b8496d1dc0058341da1790bc2e7d2dbba6d4f90e jdk7u17-b01 +b1877762d45c1117b5476cf78400ae9affe1b76d icedtea-2.3.9 +c0e829bfbf6281c829e0f6af051b96a9eba0052f icedtea-2.3.10 +5dc89903bfc7672a6f5f9e5078633ed33173da21 icedtea-2.3.11 +fdc4ad9f30c6e75a1ff4c7a37039e4f37b01740e icedtea-2.3.12 +defde3ef03605b1660a246ea85d2e810e3fe4f6e jdk7u17-b02 +ae4272d61bc738e2d9265a68aefdc20ec648f22c jdk7u17-b30 +52c4fbd4f58f336dfdf4f680b7e7d7361ec0c3f8 jdk7u17-b31 +52810f8d2dc09ef2b5e6089435f7050c9f7def11 jdk7u17-b32 +e07c518282bad3b315d8064da5fad222a5e3f7ed jdk7u21-b01 +0c1365d2fefb652aea34775749d68774c171ba1a jdk7u21-b02 +017171d6bc217f26e230503dd38bcf4473f339d2 jdk7u21-b03 +68e8364feffcc98b57d59675994dcb12e170ddf0 jdk7u21-b04 +8c43fd5d8cfef4d97bddc4fee7747f23a3c2bffa jdk7u21-b05 +dab51e98ee7d0f3a30b9e18b0d3591b944346868 jdk7u21-b06 +4a9533495068359d574da1060bc5a8fa6946cbc6 jdk7u21-b07 +ab11cef1dfaaec32281dc3d24a366f6691b51b7a jdk7u21-b08 +53c87e8a2ac494b57f6220bd7e25c7380aa7f418 jdk7u21-b09 +29c03ced9215a0bb63a4527dc5858b486cc4099d jdk7u21-b10 +fe6f5b57b9e67a7c6f52a5f926ac17e5c337d4a4 jdk7u21-b11 +12183763c6205c5cfe27924ccc4ca5480106c3b4 jdk7u21-b30 +d4eba65d0f776b77ef137022cd7bf49dc3b88a3e jdk7u21-b12 +238b59ffddce3b1d7d19114006ae3be0e72b5eed jdk7u25-b01 +8797b25cbeb3005336483063cef2377849bc2088 jdk7u25-b02 +4635a58db6b028f78a30c972ac47f9c5577bedfd jdk7u25-b03 +57d4548795c39e19099fc0a760d7887f83b1564f jdk7u25-b04 +35882693ee358e3a8b92d632dafa98e05fe72437 jdk7u25-b05 +c141079e609653ec700d2e71f16be4a5859e9a42 jdk7u25-b06 +f8e4e84e2dc4dcdaa360a7e9a4d2e0268558d84d jdk7u25-b07 +7ff0c910fb96680d0570b3d29492e15ffb5b279b jdk7u25-b08 +0cd0d4e7331f7fc9f9ee77f2275113571bcf67cf jdk7u25-b09 +105cdfd4f40837917d0065e3e58052d2854df7da jdk7u25-b10 +6de7fec036abf91ce962c74f11a6266491df3fd8 jdk7u25-b11 +4c5d242efa0d6e0cdb688e41e722bff671dfbfec jdk7u25-b12 +6b4a165221304d809f678a18f51c7a8cb042d60b jdk7u25-b13 +03073e4e6d3f600102d31e862154f56730838b11 jdk7u25-b14 +4a925430bf712d36abb78decda16e04da1b1f6bc jdk7u25-b15 +3ecf7ddefa035bc2c99b03b7a58a0dd0e97089c1 jdk7u25-b30 diff -r 739ffa9dffad -r 3cbb617cd2e4 .jcheck/conf --- a/.jcheck/conf Mon Aug 13 14:20:02 2012 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 739ffa9dffad -r 3cbb617cd2e4 patches/jaxws_src/xjc.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/jaxws_src/xjc.patch Thu Aug 08 23:15:27 2013 +0100 @@ -0,0 +1,17 @@ +--- src/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java.prev 2008-10-21 15:50:20.000000000 +0100 ++++ src/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java 2008-10-21 15:57:37.000000000 +0100 +@@ -66,6 +66,14 @@ + + SchemaFactory sf = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI); + sf.setErrorHandler(errorFilter); ++ try { ++ // By default the SchemaFactory imposes a limit of 5000 on ++ // xsd:sequence maxOccurs if a SecurityManager is ++ // installed. This breaks the specification of xjc, ++ // causing TCK failures. ++ sf.setProperty("http://apache.org/xml/properties/security-manager", null); ++ } catch (SAXException e) { ++ } + if( entityResolver != null ) { + sf.setResourceResolver(new LSResourceResolver() { + public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI) { diff -r 739ffa9dffad -r 3cbb617cd2e4 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 Mon Aug 13 14:20:02 2012 -0700 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java Thu Aug 08 23:15:27 2013 +0100 @@ -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 739ffa9dffad -r 3cbb617cd2e4 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 Mon Aug 13 14:20:02 2012 -0700 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java Thu Aug 08 23:15:27 2013 +0100 @@ -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 739ffa9dffad -r 3cbb617cd2e4 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 Mon Aug 13 14:20:02 2012 -0700 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java Thu Aug 08 23:15:27 2013 +0100 @@ -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 739ffa9dffad -r 3cbb617cd2e4 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 Mon Aug 13 14:20:02 2012 -0700 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java Thu Aug 08 23:15:27 2013 +0100 @@ -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 739ffa9dffad -r 3cbb617cd2e4 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 Mon Aug 13 14:20:02 2012 -0700 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java Thu Aug 08 23:15:27 2013 +0100 @@ -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 739ffa9dffad -r 3cbb617cd2e4 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 Mon Aug 13 14:20:02 2012 -0700 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java Thu Aug 08 23:15:27 2013 +0100 @@ -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 739ffa9dffad -r 3cbb617cd2e4 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 Mon Aug 13 14:20:02 2012 -0700 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java Thu Aug 08 23:15:27 2013 +0100 @@ -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 739ffa9dffad -r 3cbb617cd2e4 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 Mon Aug 13 14:20:02 2012 -0700 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java Thu Aug 08 23:15:27 2013 +0100 @@ -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; } diff -r 739ffa9dffad -r 3cbb617cd2e4 src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java Mon Aug 13 14:20:02 2012 -0700 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java Thu Aug 08 23:15:27 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, 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 @@ -235,7 +235,7 @@ String pkg = nav.getPackageName(ci.getClazz()); if(!registries.containsKey(pkg)) { // insert the package's object factory - C c = nav.findClass(pkg + ".ObjectFactory",ci.getClazz()); + C c = loadObjectFactory(ci, pkg); if(c!=null) addRegistry(c,(Locatable)p); } @@ -264,6 +264,15 @@ return r; } + private C loadObjectFactory(ClassInfoImpl ci, String pkg) { + try { + return nav.findClass(pkg + ".ObjectFactory", ci.getClazz()); + } catch (SecurityException ignored) { + // treat SecurityException in same way as ClassNotFoundException in this case + return null; + } + } + /** * Checks the uniqueness of the type name. */ diff -r 739ffa9dffad -r 3cbb617cd2e4 src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java --- a/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java Mon Aug 13 14:20:02 2012 -0700 +++ b/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java Thu Aug 08 23:15:27 2013 +0100 @@ -1,5 +1,5 @@ From andrew at icedtea.classpath.org Fri Aug 9 04:23:03 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 09 Aug 2013 11:23:03 +0000 Subject: /hg/release/icedtea7-forest-2.3/langtools: 63 new changesets Message-ID: changeset f7bb6dfa188a in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=f7bb6dfa188a author: katleman date: Fri Aug 17 11:58:23 2012 -0700 Added tag jdk7u6-b31 for changeset 2d6017454236 changeset 6e926880b893 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=6e926880b893 author: asaha date: Thu Sep 13 18:32:32 2012 -0700 Merge changeset 5d1a6a593fa1 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=5d1a6a593fa1 author: asaha date: Fri Oct 12 12:40:30 2012 -0700 Merge changeset 0abc443a6867 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=0abc443a6867 author: katleman date: Fri Mar 01 11:55:37 2013 -0800 Added tag jdk7u17-b02 for changeset 2782a1c60faf changeset ded093700aef in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=ded093700aef author: katleman date: Thu Feb 07 14:21:18 2013 -0800 Added tag jdk7u21-b01 for changeset 8a12629ea213 changeset 82103a284427 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=82103a284427 author: ewendeli date: Mon Feb 11 21:11:10 2013 +0100 Merge changeset 9adfe6a84c38 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=9adfe6a84c38 author: katleman date: Thu Feb 14 14:12:04 2013 -0800 Added tag jdk7u21-b02 for changeset 82103a284427 changeset dd2aef354fed in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=dd2aef354fed author: katleman date: Tue Feb 19 17:14:11 2013 -0800 Added tag jdk7u21-b03 for changeset 9adfe6a84c38 changeset 1d37792f52db in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=1d37792f52db author: dmeetry date: Wed Dec 05 23:44:21 2012 +0400 7192744: fix up tests to accommodate jtreg spec change Reviewed-by: jjg changeset c84d318736e4 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=c84d318736e4 author: dmeetry date: Wed Dec 05 23:48:19 2012 +0400 7192449: fix up tests to accommodate jtreg spec change Reviewed-by: jjg changeset 71704143744e in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=71704143744e author: dmeetry date: Sat Dec 08 15:04:47 2012 +0400 8004391: Bug fix in jtreg causes test failures in pre jdk 8 langtools tests Reviewed-by: jjg changeset 884621bb9042 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=884621bb9042 author: katleman date: Tue Feb 26 12:45:32 2013 -0800 Added tag jdk7u21-b04 for changeset 71704143744e changeset acd27fc7fcf3 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=acd27fc7fcf3 author: katleman date: Tue Oct 16 14:56:05 2012 -0700 Added tag jdk7u9-b31 for changeset 5d1a6a593fa1 changeset bcf19df20e97 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=bcf19df20e97 author: katleman date: Wed Oct 31 10:13:07 2012 -0700 Added tag jdk7u9-b32 for changeset acd27fc7fcf3 changeset 57ef63c9c509 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=57ef63c9c509 author: asaha date: Tue Dec 04 11:52:10 2012 -0800 Merge changeset db426c20b069 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=db426c20b069 author: asaha date: Wed Dec 05 15:34:54 2012 -0800 Merge changeset 7a39876a28df in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=7a39876a28df author: katleman date: Fri Dec 07 08:19:37 2012 -0800 Added tag jdk7u10-b31 for changeset db426c20b069 changeset 92de02b43596 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=92de02b43596 author: ewendeli date: Tue Jan 15 08:24:45 2013 +0100 Merge changeset 309b5ccd0501 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=309b5ccd0501 author: katleman date: Wed Jan 16 13:57:50 2013 -0800 Added tag jdk7u11-b32 for changeset 92de02b43596 changeset 04893d094547 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=04893d094547 author: katleman date: Tue Jan 29 14:11:47 2013 -0800 Added tag jdk7u11-b33 for changeset 309b5ccd0501 changeset 39714d28cab1 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=39714d28cab1 author: asaha date: Fri Feb 08 19:27:53 2013 -0800 Merge changeset 2c82a733594a in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=2c82a733594a author: asaha date: Mon Feb 11 11:18:51 2013 -0800 Merge changeset efb510942bb8 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=efb510942bb8 author: katleman date: Tue Feb 12 12:33:27 2013 -0800 Added tag jdk7u15-b31 for changeset 2c82a733594a changeset 5639dfc55f77 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=5639dfc55f77 author: asaha date: Thu Feb 14 13:25:53 2013 -0800 Merge changeset 77d06fdfd5f4 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=77d06fdfd5f4 author: katleman date: Tue Feb 19 12:03:22 2013 -0800 Added tag jdk7u15-b33 for changeset 5639dfc55f77 changeset e356f850e57e in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=e356f850e57e author: asaha date: Fri Mar 01 16:15:57 2013 -0800 Merge changeset e77e67364607 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=e77e67364607 author: cl date: Sat Mar 02 09:48:10 2013 -0800 Added tag jdk7u17-b30 for changeset 0abc443a6867 changeset 1a9b32d36ff8 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=1a9b32d36ff8 author: asaha date: Sat Mar 02 14:41:25 2013 -0800 Merge changeset a91bdaf125d8 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=a91bdaf125d8 author: cl date: Sat Mar 02 18:57:01 2013 -0800 Added tag jdk7u17-b31 for changeset 1a9b32d36ff8 changeset 0970c2290284 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=0970c2290284 author: asaha date: Mon Mar 04 11:49:57 2013 -0800 Merge changeset 5e0127eb56c3 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=5e0127eb56c3 author: katleman date: Tue Mar 05 16:46:38 2013 -0800 Added tag jdk7u21-b05 for changeset 0970c2290284 changeset 08034557136e in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=08034557136e author: katleman date: Tue Mar 12 14:44:28 2013 -0700 Added tag jdk7u21-b06 for changeset 5e0127eb56c3 changeset f3c75c441d56 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=f3c75c441d56 author: katleman date: Tue Mar 19 14:34:10 2013 -0700 Added tag jdk7u21-b07 for changeset 08034557136e changeset b6c7a18b668b in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=b6c7a18b668b author: katleman date: Wed Mar 20 14:47:51 2013 -0700 Added tag jdk7u21-b08 for changeset f3c75c441d56 changeset de06078efe70 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=de06078efe70 author: katleman date: Tue Mar 26 15:00:49 2013 -0700 Added tag jdk7u21-b09 for changeset b6c7a18b668b changeset e120818fc321 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=e120818fc321 author: katleman date: Sun Mar 31 03:47:06 2013 -0700 Added tag jdk7u21-b10 for changeset de06078efe70 changeset ff6f8ab2635c in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=ff6f8ab2635c author: katleman date: Thu Apr 04 15:48:50 2013 -0700 Added tag jdk7u21-b11 for changeset e120818fc321 changeset a87ad97e80ae in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=a87ad97e80ae author: katleman date: Fri Apr 05 12:49:15 2013 -0700 Added tag jdk7u21-b30 for changeset ff6f8ab2635c changeset ac996e233aa3 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=ac996e233aa3 author: katleman date: Sun Apr 07 16:35:05 2013 -0700 Added tag jdk7u21-b12 for changeset a87ad97e80ae changeset 1311e3618232 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=1311e3618232 author: katleman date: Tue Mar 12 14:45:32 2013 -0700 Added tag jdk7u25-b01 for changeset 884621bb9042 changeset 18678048fc76 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=18678048fc76 author: katleman date: Tue Mar 19 14:32:03 2013 -0700 Added tag jdk7u25-b02 for changeset 1311e3618232 changeset 8dc40e209a12 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=8dc40e209a12 author: coffeys date: Thu Mar 21 22:39:38 2013 +0000 Merge changeset d7f974b867c4 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=d7f974b867c4 author: katleman date: Tue Mar 26 14:18:11 2013 -0700 Added tag jdk7u25-b03 for changeset 8dc40e209a12 changeset 1a955ffd506d in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=1a955ffd506d author: katleman date: Tue Apr 02 12:12:31 2013 -0700 Added tag jdk7u25-b04 for changeset d7f974b867c4 changeset 481a0485b4db in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=481a0485b4db author: coffeys date: Fri Apr 05 21:35:21 2013 +0100 Merge changeset 5fd3518bb375 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=5fd3518bb375 author: katleman date: Mon Mar 04 14:17:33 2013 -0800 Added tag jdk7u17-b32 for changeset a91bdaf125d8 changeset 98645465330d in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=98645465330d author: asaha date: Mon Apr 08 16:01:09 2013 -0700 Merge changeset e8d01d8ee8f5 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=e8d01d8ee8f5 author: asaha date: Mon Apr 08 16:35:49 2013 -0700 Merge changeset 25489e38393b in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=25489e38393b author: katleman date: Wed Apr 10 12:43:17 2013 -0700 Added tag jdk7u25-b05 for changeset e8d01d8ee8f5 changeset 11fd425a3ebe in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=11fd425a3ebe author: katleman date: Tue Apr 16 11:28:18 2013 -0700 Added tag jdk7u25-b06 for changeset 25489e38393b changeset edaa697ef947 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=edaa697ef947 author: katleman date: Thu Apr 18 11:44:35 2013 -0700 Added tag jdk7u25-b07 for changeset 11fd425a3ebe changeset 4dbd21d15a39 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=4dbd21d15a39 author: katleman date: Tue Apr 23 16:23:22 2013 -0700 Added tag jdk7u25-b08 for changeset edaa697ef947 changeset 17ee569d0c01 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=17ee569d0c01 author: bpatel date: Fri Apr 26 15:24:12 2013 -0700 8012375: Improve Javadoc framing Reviewed-by: mduigou, jlaskey changeset 41c1b02cd6a8 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=41c1b02cd6a8 author: katleman date: Tue Apr 30 12:25:50 2013 -0700 Added tag jdk7u25-b09 for changeset 17ee569d0c01 changeset 0da9ef0d9fc5 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=0da9ef0d9fc5 author: katleman date: Tue May 07 12:57:11 2013 -0700 Added tag jdk7u25-b10 for changeset 41c1b02cd6a8 changeset 28358b2489b2 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=28358b2489b2 author: katleman date: Wed May 15 13:31:33 2013 -0700 Added tag jdk7u25-b11 for changeset 0da9ef0d9fc5 changeset 5ed8c4534800 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=5ed8c4534800 author: katleman date: Wed May 22 15:45:12 2013 -0700 Added tag jdk7u25-b12 for changeset 28358b2489b2 changeset c6342ec6a12f in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=c6342ec6a12f author: katleman date: Fri May 24 16:20:45 2013 -0700 Added tag jdk7u25-b13 for changeset 5ed8c4534800 changeset e1f27e4e180d in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=e1f27e4e180d author: katleman date: Tue Jun 04 10:47:59 2013 -0700 Added tag jdk7u25-b14 for changeset c6342ec6a12f changeset 3b8323e24a63 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=3b8323e24a63 author: bpatel date: Wed Jun 05 14:31:54 2013 -0700 8015998: Additional improvement in Javadoc framing Reviewed-by: jjg changeset 5d95c1e7c091 in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=5d95c1e7c091 author: katleman date: Thu Jun 06 11:41:55 2013 -0700 Added tag jdk7u25-b15 for changeset 3b8323e24a63 changeset 7294a7be7dbd in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=7294a7be7dbd author: katleman date: Tue Jun 11 11:45:38 2013 -0700 Added tag jdk7u25-b30 for changeset 5d95c1e7c091 changeset f5971bf5bc5e in /hg/release/icedtea7-forest-2.3/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=f5971bf5bc5e author: andrew date: Thu Aug 08 23:17:58 2013 +0100 Merge jdk7u25-b16 diffstat: .hgtags | 106 ++++++++++ .jcheck/conf | 2 - make/Makefile | 4 + make/build.properties | 3 +- make/build.xml | 2 +- src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java | 38 +++- test/com/sun/javadoc/testJavascript/TestJavascript.java | 42 +++- test/tools/javac/processing/6348499/T6348499.java | 5 +- test/tools/javac/processing/6414633/T6414633.java | 17 +- test/tools/javac/processing/6430209/T6430209.java | 5 +- test/tools/javac/processing/T6920317.java | 6 +- 11 files changed, 210 insertions(+), 20 deletions(-) diffs (458 lines): diff -r 2d6017454236 -r f5971bf5bc5e .hgtags --- a/.hgtags Mon Aug 13 14:20:12 2012 -0700 +++ b/.hgtags Thu Aug 08 23:17:58 2013 +0100 @@ -50,6 +50,7 @@ 9596dff460935f09684c11d156ce591f92584f0d jdk7-b73 1a66b08deed0459054b5b1bea3dfbead30d258fa jdk7-b74 2485f5641ed0829205aaaeb31ad711c2c2ef0de3 jdk7-b75 +83367f01297bf255f511f5291bbbbaa24a9c8459 icedtea7-1.12 8fb9b4be3cb1574302acde90549a4d333ef51e93 jdk7-b76 0398ae15b90ac76d87ee21844453e95ff8613e43 jdk7-b77 acc1e40a5874ebf32bebcb6ada565b3b40b7461c jdk7-b78 @@ -63,6 +64,7 @@ ef07347428f2198ae6b8144ac0b9086bbe39fd16 jdk7-b86 409db93d19c002333980df5b797c6b965150c7a0 jdk7-b87 f9b5d4867a26f8c4b90ad37fe2c345b721e93d6b jdk7-b88 +681f1f51926faf4c73d8905a429ff4ead6e9d622 icedtea7-1.13 6cea9a143208bc1185ced046942c0f4e45dbeba5 jdk7-b89 71c2c23a7c35b2896c87004023b9743b6d1b7758 jdk7-b90 97b6fa97b8ddb3a49394011c2a0ec5d6535e594c jdk7-b91 @@ -111,6 +113,7 @@ 3d7acdbb72cab55deedfd35f60d4732abc9d6ac4 jdk7-b134 9d0a61ac567b983da7cc8f4a7030f2245bb6dbab jdk7-b135 ed0f7f1f9511db4f9615b1426d22f8b961629275 jdk7-b136 +8e26c4aee63c04ee129bf9068f5eea47cc385177 icedtea-1.14 a15c9b058ae007d4ccb7e35ce44e4dfa977f090b jdk7-b137 53f212bed4f4304dce7f0bf0fa01c998c65bacd6 jdk7-b138 853b6bb99f9b58eb7cf8211c67d3b6e4f1228a3e jdk7-b139 @@ -123,6 +126,7 @@ 9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146 d34578643d1c6c752d4a6b5e79c6ab1b60850b4a jdk7u1-b01 58bc532d63418ac3c9b42460d89cdaf595c6f3e1 jdk7-b147 +fb7fb3071b642334520e5b9f4a87ce28717af61c icedtea-2.0-branchpoint cd2cc8b5edb045b950aed46d159b4fb8fc2fd1df jdk7u1-b02 82820a30201dbf4b80f1916f3d0f4a92ad21b61a jdk7u1-b03 baa2c13c70fea3d6e259a34f0903197fdceb64b5 jdk7u1-b04 @@ -141,6 +145,7 @@ f0802d8a0909f66ce19d3d44b33ddf4943aee076 jdk7u2-b12 f474527e77e4797d78bd6c3b31923fddcfd9d5c6 jdk7u2-b13 fc0769df8cd03fffc38c7a1ab6b2e2e7cc2506a8 jdk7u2-b21 +58f6a950cd726220e81eddb126ca5c57e3b368f2 icedtea-2.1-branchpoint fc0769df8cd03fffc38c7a1ab6b2e2e7cc2506a8 jdk7u3-b02 0ffc4995457773085f61c39f6d33edc242b41bcf jdk7u3-b03 f6de36b195cd315646213c7affd2cc15702edbfb jdk7u3-b04 @@ -157,6 +162,7 @@ 8919b2b02fcba65f833c68374f3bfdd9bc3ba814 jdk7u4-b10 4672e092f0968d503dc37f860b15ae7e2653f8d7 jdk7u4-b11 a4bf6a1aff54a98e9ff2b3fb53c719f658bec677 jdk7u4-b12 +e3537a4f75c7fcca16c349c3175bb0cdc2fbc29c icedtea-2.2-branchpoint 56eb9150d9ffdb71c47d72871e8ecc98b5f402de jdk7u4-b13 0e55881c2ee2984048c179d1e031cefb56a36bec jdk7u4-b14 0bea057f7ce1577e1b0306f2027c057e35394398 jdk7u5-b01 @@ -191,6 +197,7 @@ 47ae28da508861d77ee6dd408d822acf507b28ec jdk7u6-b15 5c7763489f4d2727c6d9de11f4114fb8ed839042 jdk7u6-b16 66c671f28cb2840ceec5b44c44bac073fc0b4256 jdk7u6-b17 +cee31ee38a190f77b1e21c0515bb28802dcd9678 icedtea-2.3-branchpoint 6aa859ef42876c51bb1b1d7fb4db32a916a7dcaa jdk7u6-b18 474a52eeeafb1feccffda68b96f651e65415c01d jdk7u6-b19 32acb67a79531daf678577c7ef1bde1867da807d jdk7u6-b20 @@ -199,3 +206,102 @@ dd3e29d8892fcaba6d76431d5fa9d49e7c088f76 jdk7u6-b23 6aac89e84fc96d15bb78b13aa71c9e6b73d7237e jdk7u6-b24 bcd1d067d525065630deb98b678bc00b499adbe1 jdk7u6-b30 +ca0a82364e5fe1ae03911c90732b226d2482b77c icedtea-2.3 +4ccca0a55ed66de7e7482b5f2a9222ec44bea699 icedtea-2.3.1 +0cf6181d44db827cb1a341f5936ce43cc489fd08 icedtea-2.3.2 +867d5041bee60ea67ee56c5990a82a0215cc4959 icedtea-2.3.3 +ec73c6927fb72f1034cde0be9dadb4eaffd6b338 icedtea-2.3.4 +946195011b307a48ad0d9f1aecfb689bba7c5d82 icedtea-2.3.5 +afdfcc0ca555b69a5d9ddec458c0036a318b63b9 icedtea-2.3.6 +afdfcc0ca555b69a5d9ddec458c0036a318b63b9 icedtea-2.3.6 +0000000000000000000000000000000000000000 icedtea-2.3.6 +2d6017454236d4e95aad7feaff5fc92a612598f4 jdk7u6-b31 +2d6017454236d4e95aad7feaff5fc92a612598f4 jdk7u7-b10 +27041587508dbc4e08c956ba98a11ce0d5608dc4 jdk7u7-b30 +b92a9f4f6bce4ec500ed3adb8203e6424b579f94 jdk7u7-b11 +f0fd7463f02ea681ca53022d6d0d425ec1584b34 jdk7u7-b31 +6bfc26fc14a0650805dd6583048db0b4f8669844 jdk7u7-b01 +0d4cb328938002fa9a2efc8190ea97beae3230a9 jdk7u7-b02 +04848e261e42c697cb70401f8059186434855f33 jdk7u9-b03 +0000000000000000000000000000000000000000 jdk7u7-b01 +6bfc26fc14a0650805dd6583048db0b4f8669844 jdk7u9-b01 +0000000000000000000000000000000000000000 jdk7u7-b02 +0d4cb328938002fa9a2efc8190ea97beae3230a9 jdk7u9-b02 +9148cdb9a18b55ad7d51bb9644b6db812de34eea jdk7u9-b04 +1de4a0865a714076b4922a9a7119adb98aee23f2 jdk7u9-b05 +5d1a6a593fa17933683b34ea3a55c7d13c028a13 jdk7u9-b31 +acd27fc7fcf3e9dc0a1ae7e101cc036e960b6295 jdk7u9-b32 +8dfbebb98865d822ddd9e0b9641d21e8bdb8a866 jdk7u10-b10 +01c6dde274bd520067264231b3015c37e8e62d24 jdk7u10-b11 +1fb02747d3bce646374c2cab95048c516cec6b01 jdk7u10-b12 +14735b3d8bdffc7892f1db04b6262bdaad2eb9d7 jdk7u10-b13 +f555fcdbd07156ee11b25fb4ac106065bbf496b4 jdk7u10-b14 +dfcd16ac3fbcabed815b8ef4e792716cce0bce21 jdk7u10-b15 +eaa8a0141c35edc382d7ce0b1148912db8422b16 jdk7u10-b16 +7101b3e80e96b000b0b4f0bd7fe4dd7910d02f74 jdk7u10-b17 +4f529e320d83f517a55065b4710c7f1e5ff692c9 jdk7u10-b18 +1e5aed8511b9bea5c2ebe51a2d9094be8bac73cc jdk7u10-b30 +db426c20b06918feeeaa036d52a5096c2bb646b0 jdk7u10-b31 +b01338429ab6821f44d19601de433b538942b53d jdk7u11-b20 +aeef1c7e43bc2d4a0960ebf42b642f7a34ec8afc jdk7u11-b21 +92de02b43596ea1d01c87d56dbc9acc0960a90c3 jdk7u11-b32 +309b5ccd0501d48fa7eed29e45197b4101de4683 jdk7u11-b33 +eaa8a0141c35edc382d7ce0b1148912db8422b16 jdk7u11-b03 +e8071ede35dc5948f5ed127941be192a4a8c1ebd jdk7u11-b04 +17b9bb22f3fd6a624879a29a3fc4b252327c113d jdk7u11-b05 +96c8b3b817aa3e672f78f1d5006616104378ff29 jdk7u11-b06 +c5d3dabddff76c92425cbf6a99ed4e066d16b4fd jdk7u11-b07 +a0d9abc405580d6fa0ae217fab96608285a38c41 jdk7u11-b08 +a778aaf53c52f78c92f29a1220d9f46de94c9247 jdk7u13-b09 +0000000000000000000000000000000000000000 icedtea-2.3.6 +812eeff322ccb47cd1aa9b6f1dd9c9587c3fe911 icedtea-2.3.6 +e0739a8783d19aded13ea9160fa2c87419b98664 icedtea-2.3.7 +b5006c3285c6a39e2b33d5f38b8e72329136ee81 icedtea-2.3.8 +761b933e269693fd689c2af5d8317201b2172dbb jdk7u13-b10 +8a12629ea21378f96666628f472cd9a6936a4933 jdk7u13-b30 +761b933e269693fd689c2af5d8317201b2172dbb jdk7u13-b20 +1298307076c2f0c2a4acd3a2a132cbe98d399009 jdk7u15-b01 +8db0105f00ce9fe6899ece52d46d78995111c456 jdk7u15-b02 +b00c1580ffa95d9edd567835e1b9a77cf8ca2af6 jdk7u15-b30 +2c82a733594aef14f7a91a910c6b7b20e6220078 jdk7u15-b31 +5639dfc55f771823fab02438e5c89c6b18f57d07 jdk7u15-b33 +c160d7d1616d099afad0986b7d06aee2d9405e57 jdk7u15-b03 +a778aaf53c52f78c92f29a1220d9f46de94c9247 jdk7u15-b32 +edfcf07c2877af8efa649e514167b22b7f6fc0b4 jdk7u17-b01 +fd956199cb8213f9af95b694ebdde6aa1fd7f53a icedtea-2.3.9 +8cf15d334ad372f540d7504212cc21ff7a223852 icedtea-2.3.10 +e2c5f493844a842ec31d5979825e4f35d9dd9bdb icedtea-2.3.11 +6c9b532f428152081b7a610de342e6e90d9cbcb3 icedtea-2.3.12 +2782a1c60faf7585dee0af0ef585aeed3288e521 jdk7u17-b02 +0abc443a68676c7231b274a324d27204c735acac jdk7u17-b30 +1a9b32d36ff86136549f20156cf3e821295228a0 jdk7u17-b31 +a91bdaf125d89b8b2c6ff86c8055aab3b7d2546c jdk7u17-b32 +8a12629ea21378f96666628f472cd9a6936a4933 jdk7u21-b01 +82103a284427a2512fe884d8f232f1a83d46beb6 jdk7u21-b02 +9adfe6a84c3884d5c24f6655e89546a6e0a80129 jdk7u21-b03 +71704143744ee46f105bf1bf3e4b7aecaf9c1003 jdk7u21-b04 +0970c229028499d5348d77712edf42d712538441 jdk7u21-b05 +5e0127eb56c3f70bdf67a5b2c57cf218838371ae jdk7u21-b06 +08034557136e484b3a7c4d0ec9b21e57ea9cd30b jdk7u21-b07 +f3c75c441d5623186e43de0b5a645e12fc360c29 jdk7u21-b08 +b6c7a18b668b85bdc41914b2b354c1928deb659e jdk7u21-b09 +de06078efe709392d7faf44803d54b74599f6bda jdk7u21-b10 +e120818fc321b5d9d8573a58bf5f6a6eb7471229 jdk7u21-b11 +ff6f8ab2635c6e0b0f6bb1a68dca48b4fc31b107 jdk7u21-b30 +a87ad97e80ae1861143b477d8a8990dc6ecc9173 jdk7u21-b12 +884621bb9042cd4a06e230307f1e26f1c518346d jdk7u25-b01 +1311e3618232058b09fe7ea25eda4af8d3fe6807 jdk7u25-b02 +8dc40e209a12638ea18bb7ee436051768afa5d39 jdk7u25-b03 +d7f974b867c4cf771ab749871c2ff4d3f869f13f jdk7u25-b04 +e8d01d8ee8f547f97d8670157ddf5a798459b85a jdk7u25-b05 +25489e38393b7c70fb826069d50860fbc409d11d jdk7u25-b06 +11fd425a3ebee6fa02bd684d356300b3619e5e7a jdk7u25-b07 +edaa697ef947de30b940bef0a546590d09c99cd3 jdk7u25-b08 +17ee569d0c0130824ba27bc1b090114e6075c5f2 jdk7u25-b09 +41c1b02cd6a8fa7746752cc911da3dd4d380098d jdk7u25-b10 +0da9ef0d9fc5b017f960d65ae0cd07860a259621 jdk7u25-b11 +28358b2489b2ca29c1a6b79f643204da8924a3d7 jdk7u25-b12 +5ed8c453480063838b632c74f528924f529361a2 jdk7u25-b13 +c6342ec6a12f7283e2a73a80a44dcdd3683e2e8b jdk7u25-b14 +3b8323e24a636ac0638604d19fc116eb0eef6cdb jdk7u25-b15 +5d95c1e7c0913ad4bc0b5f0b559510d32557def2 jdk7u25-b30 diff -r 2d6017454236 -r f5971bf5bc5e .jcheck/conf --- a/.jcheck/conf Mon Aug 13 14:20:12 2012 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 2d6017454236 -r f5971bf5bc5e make/Makefile --- a/make/Makefile Mon Aug 13 14:20:12 2012 -0700 +++ b/make/Makefile Thu Aug 08 23:17:58 2013 +0100 @@ -111,6 +111,10 @@ ANT_OPTIONS += -Ddebug.classfiles=true endif +ifeq ($(JAVAC_WARNINGS_FATAL), false) + ANT_OPTIONS += -Djavac.warnings.fatal= +endif + # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN) # and the somewhat misnamed CLASS_VERSION (-target NN) ifdef TARGET_CLASS_VERSION diff -r 2d6017454236 -r f5971bf5bc5e make/build.properties --- a/make/build.properties Mon Aug 13 14:20:12 2012 -0700 +++ b/make/build.properties Thu Aug 08 23:17:58 2013 +0100 @@ -68,7 +68,8 @@ # set the following to -version to verify the versions of javac being used javac.version.opt = # in time, there should be no exceptions to -Xlint:all -javac.lint.opts = -Xlint:all,-deprecation -Werror +javac.warnings.fatal = -Werror +javac.lint.opts = -Xlint:all,-deprecation ${javac.warnings.fatal} # options for the task for javac #javadoc.jls3.url=http://java.sun.com/docs/books/jls/ diff -r 2d6017454236 -r f5971bf5bc5e make/build.xml --- a/make/build.xml Mon Aug 13 14:20:12 2012 -0700 +++ b/make/build.xml Thu Aug 08 23:17:58 2013 +0100 @@ -877,7 +877,7 @@ + classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar"/> diff -r 2d6017454236 -r f5971bf5bc5e 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 Mon Aug 13 14:20:12 2012 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Thu Aug 08 23:17:58 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 @@ -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 + diff -r 2d6017454236 -r f5971bf5bc5e test/com/sun/javadoc/testJavascript/TestJavascript.java --- a/test/com/sun/javadoc/testJavascript/TestJavascript.java Mon Aug 13 14:20:12 2012 -0700 +++ b/test/com/sun/javadoc/testJavascript/TestJavascript.java Thu Aug 08 23:17:58 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 4665566 4855876 7025314 + * @bug 4665566 4855876 7025314 8012375 8015998 * @summary Verify that the output has the right javascript. * @author jamieh * @library ../lib/ @@ -35,7 +35,7 @@ public class TestJavascript extends JavadocTester { //Test information. - private static final String BUG_ID = "4665566-4855876"; + private static final String BUG_ID = "4665566-4855876-8012375"; //Javadoc arguments. private static final String[] ARGS = new String[] { @@ -53,8 +53,42 @@ " targetPage = \"\" + window.location.search;" + NL + " if (targetPage != \"\" && targetPage != \"undefined\")" + NL + " targetPage = targetPage.substring(1);" + NL + - " if (targetPage.indexOf(\":\") != -1)" + NL + + " if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + NL + " targetPage = \"undefined\";" + NL + + " function validURL(url) {" + NL + + " var pos = url.indexOf(\".html\");" + NL + + " if (pos == -1 || pos != url.length - 5)" + NL + + " return false;" + NL + + " var allowNumber = false;" + NL + + " var allowSep = false;" + NL + + " var seenDot = false;" + NL + + " for (var i = 0; i < url.length - 5; i++) {" + NL + + " var ch = url.charAt(i);" + NL + + " if ('a' <= ch && ch <= 'z' ||" + NL + + " 'A' <= ch && ch <= 'Z' ||" + NL + + " ch == '$' ||" + NL + + " ch == '_') {" + NL + + " allowNumber = true;" + NL + + " allowSep = true;" + NL + + " } else if ('0' <= ch && ch <= '9'" + NL + + " || ch == '-') {" + NL + + " if (!allowNumber)" + NL + + " return false;" + NL + + " } else if (ch == '/' || ch == '.') {" + NL + + " if (!allowSep)" + NL + + " return false;" + NL + + " allowNumber = false;" + NL + + " allowSep = false;" + NL + + " if (ch == '.')" + NL + + " seenDot = true;" + NL + + " if (ch == '/' && seenDot)" + NL + + " return false;" + NL + + " } else {" + NL + + " return false;" + NL + + " }" + NL + + " }" + NL + + " return true;" + NL + + " }" + NL + " function loadFrames() {" + NL + " if (targetPage != \"\" && targetPage != \"undefined\")" + NL + " top.classFrame.location = top.targetPage;" + NL + diff -r 2d6017454236 -r f5971bf5bc5e test/tools/javac/processing/6348499/T6348499.java --- a/test/tools/javac/processing/6348499/T6348499.java Mon Aug 13 14:20:12 2012 -0700 +++ b/test/tools/javac/processing/6348499/T6348499.java Thu Aug 08 23:17:58 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2012, 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 @@ -47,6 +47,7 @@ public static void main(String... args) { String testSrc = System.getProperty("test.src", "."); String testClasses = System.getProperty("test.classes"); + String testClassPath = System.getProperty("test.class.path", testClasses); String A_java = new File(testSrc, "A.java").getPath(); JavacTool tool = JavacTool.create(); MyDiagListener dl = new MyDiagListener(); @@ -55,7 +56,7 @@ fm.getJavaFileObjectsFromFiles(Arrays.asList(new File(testSrc, "A.java"))); Iterable opts = Arrays.asList("-proc:only", "-processor", "A", - "-processorpath", testClasses); + "-processorpath", testClassPath); StringWriter out = new StringWriter(); JavacTask task = tool.getTask(out, fm, dl, opts, null, files); task.call(); diff -r 2d6017454236 -r f5971bf5bc5e test/tools/javac/processing/6414633/T6414633.java --- a/test/tools/javac/processing/6414633/T6414633.java Mon Aug 13 14:20:12 2012 -0700 +++ b/test/tools/javac/processing/6414633/T6414633.java Thu Aug 08 23:17:58 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2012, 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 @@ -43,20 +43,20 @@ public static void main(String... args) { String testSrc = System.getProperty("test.src", "."); String testClasses = System.getProperty("test.classes", "."); + String testClassPath = System.getProperty("test.class.path", testClasses); JavacTool tool = JavacTool.create(); MyDiagListener dl = new MyDiagListener(); StandardJavaFileManager fm = tool.getStandardFileManager(dl, null, null); try { - fm.setLocation(StandardLocation.CLASS_PATH, Arrays.asList(new File(testClasses))); + fm.setLocation(StandardLocation.CLASS_PATH, pathToFiles(testClassPath)); } catch (IOException e) { throw new AssertionError(e); } Iterable files = fm.getJavaFileObjectsFromFiles(Arrays.asList(new File(testSrc, A.class.getName()+".java"))); String[] opts = { "-proc:only", - "-processor", A.class.getName(), - "-classpath", testClasses + System.getProperty("path.separator") + "../../lib" }; + "-processor", A.class.getName() }; JavacTask task = tool.getTask(null, fm, dl, Arrays.asList(opts), null, files); task.call(); @@ -65,6 +65,15 @@ throw new AssertionError(dl.diags + " diagnostics reported"); } + private static List pathToFiles(String path) { + List list = new ArrayList(); + for (String s: path.split(File.pathSeparator)) { + if (!s.isEmpty()) + list.add(new File(s)); + } + return list; + } + private static class MyDiagListener implements DiagnosticListener { public void report(Diagnostic d) { diff -r 2d6017454236 -r f5971bf5bc5e test/tools/javac/processing/6430209/T6430209.java --- a/test/tools/javac/processing/6430209/T6430209.java Mon Aug 13 14:20:12 2012 -0700 +++ b/test/tools/javac/processing/6430209/T6430209.java Thu Aug 08 23:17:58 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2012, 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 @@ -56,6 +56,7 @@ // -proc:only -processor b6341534 -cp . ./src/*.java String testSrc = System.getProperty("test.src", "."); String testClasses = System.getProperty("test.classes") + System.getProperty("path.separator") + "../../lib"; + String testClassPath = System.getProperty("test.class.path", testClasses); JavacTool tool = JavacTool.create(); MyDiagListener dl = new MyDiagListener(); StandardJavaFileManager fm = tool.getStandardFileManager(dl, null, null); @@ -64,7 +65,7 @@ new File(testSrc, "test0.java"), new File(testSrc, "test1.java"))); Iterable opts = Arrays.asList("-proc:only", "-processor", "b6341534", - "-processorpath", testClasses); + "-processorpath", testClassPath); StringWriter out = new StringWriter(); JavacTask task = tool.getTask(out, fm, dl, opts, null, files); task.call(); diff -r 2d6017454236 -r f5971bf5bc5e test/tools/javac/processing/T6920317.java --- a/test/tools/javac/processing/T6920317.java Mon Aug 13 14:20:12 2012 -0700 +++ b/test/tools/javac/processing/T6920317.java Thu Aug 08 23:17:58 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2012, 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 @@ -156,7 +156,9 @@ String expect = null; opts.add("-processorpath"); - opts.add(System.getProperty("test.classes")); + String testClasses = System.getProperty("test.classes"); + String testClassPath = System.getProperty("test.class.path", testClasses); + opts.add(testClassPath); opts.add("-processor"); opts.add(Processor.class.getName()); opts.add("-proc:only"); From andrew at icedtea.classpath.org Fri Aug 9 04:23:16 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 09 Aug 2013 11:23:16 +0000 Subject: /hg/release/icedtea7-forest-2.3/hotspot: 73 new changesets Message-ID: changeset cd9ffcd9523b in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=cd9ffcd9523b author: katleman date: Fri Aug 17 11:58:05 2012 -0700 Added tag jdk7u6-b31 for changeset 7566374c3c89 changeset b407d109571f in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=b407d109571f author: asaha date: Thu Sep 13 18:21:21 2012 -0700 Merge changeset 8eaa45ed5f80 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=8eaa45ed5f80 author: asaha date: Fri Oct 12 12:35:02 2012 -0700 Merge changeset 7b357c079370 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=7b357c079370 author: katleman date: Fri Mar 01 11:55:17 2013 -0800 Added tag jdk7u17-b02 for changeset 0d82bf449a61 changeset 315b54ddd99f in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=315b54ddd99f author: katleman date: Thu Feb 07 14:20:05 2013 -0800 Added tag jdk7u21-b01 for changeset be57a8d7a1a7 changeset 5119d89c7cc8 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=5119d89c7cc8 author: ewendeli date: Mon Feb 11 21:07:12 2013 +0100 Merge changeset ad14169fb640 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=ad14169fb640 author: katleman date: Thu Feb 14 14:11:05 2013 -0800 Added tag jdk7u21-b02 for changeset 5119d89c7cc8 changeset 6d21458b9459 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=6d21458b9459 author: katleman date: Tue Feb 19 17:13:36 2013 -0800 Added tag jdk7u21-b03 for changeset ad14169fb640 changeset c954aab38a7f in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=c954aab38a7f author: twisti date: Mon Feb 25 11:54:35 2013 -0800 8004336: Better handling of method handle intrinsic frames Reviewed-by: kvn, jrose, ahgross changeset 762ad80022d6 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=762ad80022d6 author: katleman date: Tue Feb 26 12:44:58 2013 -0800 Added tag jdk7u21-b04 for changeset c954aab38a7f changeset 0785ff7bd741 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=0785ff7bd741 author: dcubed date: Thu Feb 28 09:50:01 2013 -0800 7182152: Instrumentation hot swap test incorrect monitor count Summary: Remove optimization that allowed for old and/or obsolete methods in an itable; add new tracing support using -XX:TraceRedefineClasses=16384. Reviewed-by: coleenp, acorn, sspitsyn changeset e629a7d0b760 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=e629a7d0b760 author: brutisso date: Thu Feb 28 13:30:30 2013 +0100 7173959: Jvm crashed during coherence exabus (tmb) testing Summary: Mapping of aligned memory needs to be MT safe. Also reviewed by: vitalyd at gmail.com Reviewed-by: dholmes, coleenp, zgu changeset bc3dc90c4e9e in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=bc3dc90c4e9e author: coffeys date: Mon Mar 04 19:04:44 2013 +0000 8009399: Bump the hsx build number for APRIL CPU Reviewed-by: asaha changeset ea83168282c8 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=ea83168282c8 author: katleman date: Tue Oct 16 14:54:41 2012 -0700 Added tag jdk7u9-b31 for changeset 8eaa45ed5f80 changeset f493d194db95 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=f493d194db95 author: katleman date: Wed Oct 31 10:10:54 2012 -0700 Added tag jdk7u9-b32 for changeset ea83168282c8 changeset 63e9e76073fb in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=63e9e76073fb author: asaha date: Tue Dec 04 11:41:17 2012 -0800 Merge changeset 07f7daeb2610 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=07f7daeb2610 author: asaha date: Wed Dec 05 15:24:40 2012 -0800 Merge changeset c49afcd4b4d1 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=c49afcd4b4d1 author: katleman date: Fri Dec 07 08:19:06 2012 -0800 Added tag jdk7u10-b31 for changeset 07f7daeb2610 changeset 06b5c3f663b8 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=06b5c3f663b8 author: ewendeli date: Tue Jan 15 08:21:51 2013 +0100 Merge changeset abb5b690122c in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=abb5b690122c author: katleman date: Wed Jan 16 13:57:06 2013 -0800 Added tag jdk7u11-b32 for changeset 06b5c3f663b8 changeset 3ba8b2780ac9 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=3ba8b2780ac9 author: katleman date: Tue Jan 29 14:10:31 2013 -0800 Added tag jdk7u11-b33 for changeset abb5b690122c changeset ef00fdf6f6d3 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=ef00fdf6f6d3 author: asaha date: Fri Feb 08 19:11:16 2013 -0800 Merge changeset 0b905a04f573 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=0b905a04f573 author: asaha date: Mon Feb 11 11:14:34 2013 -0800 Merge changeset 7b91b50ff761 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=7b91b50ff761 author: katleman date: Tue Feb 12 12:32:41 2013 -0800 Added tag jdk7u15-b31 for changeset 0b905a04f573 changeset 8b349f332a66 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=8b349f332a66 author: asaha date: Thu Feb 14 13:18:59 2013 -0800 Merge changeset b2208bb3e775 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=b2208bb3e775 author: katleman date: Tue Feb 19 12:02:59 2013 -0800 Added tag jdk7u15-b33 for changeset 8b349f332a66 changeset c91d130b040f in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=c91d130b040f author: asaha date: Fri Mar 01 16:07:51 2013 -0800 Merge changeset 73894d544edd in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=73894d544edd author: cl date: Sat Mar 02 09:47:37 2013 -0800 Added tag jdk7u17-b30 for changeset 7b357c079370 changeset 22b6fd616cfe in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=22b6fd616cfe author: asaha date: Sat Mar 02 14:35:06 2013 -0800 Merge changeset 8e04b403f580 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=8e04b403f580 author: cl date: Sat Mar 02 18:54:42 2013 -0800 Added tag jdk7u17-b31 for changeset 22b6fd616cfe changeset ee98e8e35da2 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=ee98e8e35da2 author: asaha date: Mon Mar 04 11:40:45 2013 -0800 Merge changeset 0e8e9d990d91 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=0e8e9d990d91 author: asaha date: Mon Mar 04 12:34:25 2013 -0800 Merge changeset ae7be9b23555 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=ae7be9b23555 author: katleman date: Tue Mar 05 16:45:23 2013 -0800 Added tag jdk7u21-b05 for changeset 0e8e9d990d91 changeset beeb3d6b76f0 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=beeb3d6b76f0 author: poonam date: Wed Mar 06 16:30:38 2013 -0800 8006309: More reliable control panel operation Summary: Added a comment in the dead Kernel code Reviewed-by: ahgross, sla, coleenp changeset 99d7e552509d in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=99d7e552509d author: katleman date: Tue Mar 12 14:44:05 2013 -0700 Added tag jdk7u21-b06 for changeset beeb3d6b76f0 changeset 663b5c744e82 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=663b5c744e82 author: kvn date: Fri Mar 15 09:33:37 2013 -0700 8009699: Methodhandle lookup Reviewed-by: ahgross, jrose, jdn changeset 87e9bb582938 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=87e9bb582938 author: katleman date: Tue Mar 19 14:33:31 2013 -0700 Added tag jdk7u21-b07 for changeset 663b5c744e82 changeset 1f195ee7856a in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=1f195ee7856a author: katleman date: Wed Mar 20 14:47:17 2013 -0700 Added tag jdk7u21-b08 for changeset 87e9bb582938 changeset d4a4c2bd389a in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=d4a4c2bd389a author: katleman date: Tue Mar 26 15:00:17 2013 -0700 Added tag jdk7u21-b09 for changeset 1f195ee7856a changeset d07dafb51e1d in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=d07dafb51e1d author: katleman date: Sun Mar 31 03:46:36 2013 -0700 Added tag jdk7u21-b10 for changeset d4a4c2bd389a changeset a977dedec81c in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=a977dedec81c author: katleman date: Thu Apr 04 15:48:08 2013 -0700 Added tag jdk7u21-b11 for changeset d07dafb51e1d changeset c5e4585a045f in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=c5e4585a045f author: katleman date: Fri Apr 05 12:48:45 2013 -0700 Added tag jdk7u21-b30 for changeset a977dedec81c changeset 7d126c8298e7 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=7d126c8298e7 author: katleman date: Sun Apr 07 16:34:50 2013 -0700 Added tag jdk7u21-b12 for changeset c5e4585a045f changeset 3168f3e14339 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=3168f3e14339 author: poonam date: Wed Mar 06 16:30:38 2013 -0800 8006309: More reliable control panel operation Summary: Added a comment in the dead Kernel code Reviewed-by: ahgross, sla, coleenp changeset bf2d84c5103d in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=bf2d84c5103d author: hseigel date: Tue Mar 12 16:23:30 2013 -0400 7158805: Better rewriting of nested subroutine calls Reviewed-by: mschoene, coleenp changeset 238f85fd3c98 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=238f85fd3c98 author: katleman date: Tue Mar 12 14:45:11 2013 -0700 Added tag jdk7u25-b01 for changeset bf2d84c5103d changeset 07119340f80f in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=07119340f80f author: kvn date: Fri Mar 15 09:33:37 2013 -0700 8009699: Methodhandle lookup Reviewed-by: ahgross, jrose, jdn changeset cd733fbd5ca8 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=cd733fbd5ca8 author: katleman date: Tue Mar 19 14:31:25 2013 -0700 Added tag jdk7u25-b02 for changeset 07119340f80f changeset 655bea6843fb in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=655bea6843fb author: coffeys date: Thu Mar 21 22:29:35 2013 +0000 Merge changeset 96a4e612195c in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=96a4e612195c author: katleman date: Tue Mar 26 14:17:39 2013 -0700 Added tag jdk7u25-b03 for changeset 655bea6843fb changeset 1bc51c62d162 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=1bc51c62d162 author: katleman date: Tue Apr 02 12:12:05 2013 -0700 Added tag jdk7u25-b04 for changeset 96a4e612195c changeset fd81c9aeb9f5 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=fd81c9aeb9f5 author: mullan date: Fri Apr 05 08:36:12 2013 -0400 8001330: Improve on checking order Reviewed-by: acorn, hawtin changeset 1d448101a555 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=1d448101a555 author: mullan date: Fri Apr 05 08:49:50 2013 -0400 Merge changeset e565780c14d2 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=e565780c14d2 author: coffeys date: Fri Apr 05 21:33:44 2013 +0100 Merge changeset e37b316096a6 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=e37b316096a6 author: katleman date: Mon Mar 04 14:17:15 2013 -0800 Added tag jdk7u17-b32 for changeset 8e04b403f580 changeset e22194a44dc9 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=e22194a44dc9 author: asaha date: Mon Apr 08 15:53:00 2013 -0700 Merge changeset 47a9f44dd262 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=47a9f44dd262 author: asaha date: Mon Apr 08 16:27:31 2013 -0700 Merge changeset efec74090462 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=efec74090462 author: asaha date: Tue Apr 09 12:28:21 2013 -0700 8011806: 7u25-b05 hotspot fastdebug build failure Summary: Backed out changeset fd81c9aeb9f5 Reviewed-by: mullan changeset 7151c26b8388 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=7151c26b8388 author: asaha date: Tue Apr 09 12:28:50 2013 -0700 Merge changeset fbb5f6083dd0 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=fbb5f6083dd0 author: katleman date: Wed Apr 10 12:42:48 2013 -0700 Added tag jdk7u25-b05 for changeset 7151c26b8388 changeset 83abf4b2fc8a in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=83abf4b2fc8a author: katleman date: Tue Apr 16 11:27:56 2013 -0700 Added tag jdk7u25-b06 for changeset fbb5f6083dd0 changeset 631f703ba794 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=631f703ba794 author: katleman date: Thu Apr 18 11:44:19 2013 -0700 Added tag jdk7u25-b07 for changeset 83abf4b2fc8a changeset 1410ff0b4ba2 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=1410ff0b4ba2 author: mullan date: Thu Apr 18 17:52:39 2013 -0400 8001330: Improve on checking order 8011896: Add check for invalid offset for new AccessControlContext isAuthorized field Reviewed-by: acorn, hawtin changeset 525252cd9fca in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=525252cd9fca author: mullan date: Thu Apr 18 17:58:40 2013 -0400 Merge changeset 706a255a8404 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=706a255a8404 author: katleman date: Tue Apr 23 16:20:47 2013 -0700 Added tag jdk7u25-b08 for changeset 525252cd9fca changeset 402184622f60 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=402184622f60 author: katleman date: Tue Apr 30 12:25:07 2013 -0700 Added tag jdk7u25-b09 for changeset 706a255a8404 changeset a2e45b168404 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=a2e45b168404 author: katleman date: Tue May 07 12:56:15 2013 -0700 Added tag jdk7u25-b10 for changeset 402184622f60 changeset cca49a35bf83 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=cca49a35bf83 author: asaha date: Fri May 10 10:32:15 2013 -0700 8014312: Fork hs23.25 hsx from hs23.21 for jdk7u25 and reinitialize build number Reviewed-by: jcoomes changeset 7ca68c0674df in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=7ca68c0674df author: katleman date: Wed May 15 13:30:41 2013 -0700 Added tag jdk7u25-b11 for changeset cca49a35bf83 changeset 3e145a686fed in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=3e145a686fed author: katleman date: Wed May 22 15:44:50 2013 -0700 Added tag jdk7u25-b12 for changeset 7ca68c0674df changeset 4fafaf293aa5 in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=4fafaf293aa5 author: katleman date: Fri May 24 16:20:26 2013 -0700 Added tag jdk7u25-b13 for changeset 3e145a686fed changeset 40acb370626f in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=40acb370626f author: katleman date: Tue Jun 04 10:47:35 2013 -0700 Added tag jdk7u25-b14 for changeset 4fafaf293aa5 changeset 38f1b987027f in /hg/release/icedtea7-forest-2.3/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=38f1b987027f author: andrew date: Fri Aug 09 12:21:36 2013 +0100 Merge jdk7u25-b16 diffstat: .hgtags | 108 + .jcheck/conf | 2 - agent/src/os/linux/Makefile | 11 +- agent/src/os/linux/libproc.h | 29 +- make/hotspot_version | 6 +- make/linux/makefiles/adlc.make | 10 +- make/linux/makefiles/defs.make | 54 +- make/linux/makefiles/gcc.make | 124 +- make/linux/makefiles/jsig.make | 6 +- make/linux/makefiles/rules.make | 15 +- make/linux/makefiles/saproc.make | 4 + make/linux/makefiles/vm.make | 26 +- make/linux/makefiles/zeroshark.make | 35 + make/linux/platform_zero.in | 2 +- make/solaris/makefiles/adlc.make | 6 +- make/solaris/makefiles/dtrace.make | 16 + make/solaris/makefiles/gcc.make | 4 +- make/solaris/makefiles/jsig.make | 4 + make/solaris/makefiles/rules.make | 10 - make/solaris/makefiles/saproc.make | 4 + make/solaris/makefiles/vm.make | 12 + make/windows/makefiles/vm.make | 8 + src/cpu/sparc/vm/methodHandles_sparc.cpp | 31 + src/cpu/x86/vm/c2_globals_x86.hpp | 2 +- src/cpu/x86/vm/methodHandles_x86.cpp | 38 +- src/cpu/zero/vm/arm_cas.S | 31 + src/cpu/zero/vm/asm_helper.cpp | 730 + src/cpu/zero/vm/assembler_zero.cpp | 8 + src/cpu/zero/vm/assembler_zero.hpp | 1 + src/cpu/zero/vm/bytecodes_arm.def | 7847 ++ src/cpu/zero/vm/bytecodes_zero.cpp | 52 +- src/cpu/zero/vm/bytecodes_zero.hpp | 41 +- src/cpu/zero/vm/copy_zero.hpp | 4 +- src/cpu/zero/vm/cppInterpreter_arm.S | 7367 ++ src/cpu/zero/vm/cppInterpreter_zero.cpp | 355 +- src/cpu/zero/vm/deoptimizerFrame_zero.hpp | 53 + src/cpu/zero/vm/frame_zero.inline.hpp | 2 + src/cpu/zero/vm/methodHandles_zero.cpp | 67 +- src/cpu/zero/vm/methodHandles_zero.hpp | 25 +- src/cpu/zero/vm/sharedRuntime_zero.cpp | 30 +- src/cpu/zero/vm/thumb2.cpp | 7952 ++ src/cpu/zero/vm/vm_version_zero.hpp | 11 + src/os/linux/vm/os_linux.cpp | 47 +- src/os/posix/vm/os_posix.cpp | 41 + src/os/windows/vm/os_windows.cpp | 30 + src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp | 11 +- src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp | 31 +- src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp | 14 + src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 25 + src/os_cpu/linux_zero/vm/os_linux_zero.hpp | 6 + src/share/tools/hsdis/Makefile | 10 +- src/share/tools/hsdis/hsdis.c | 5 + src/share/vm/asm/codeBuffer.cpp | 2 +- src/share/vm/asm/codeBuffer.hpp | 2 +- src/share/vm/ci/ciTypeFlow.cpp | 2 +- src/share/vm/classfile/javaClasses.cpp | 30 +- src/share/vm/classfile/javaClasses.hpp | 11 +- src/share/vm/classfile/systemDictionary.cpp | 1 - src/share/vm/classfile/vmSymbols.hpp | 4 +- src/share/vm/compiler/compilerOracle.cpp | 4 +- src/share/vm/compiler/methodLiveness.cpp | 12 +- src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp | 6 +- src/share/vm/gc_implementation/g1/concurrentMark.cpp | 4 +- src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp | 2 +- src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp | 4 +- src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp | 2 +- src/share/vm/interpreter/linkResolver.cpp | 2 +- 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/blockOffsetTable.hpp | 2 +- src/share/vm/memory/collectorPolicy.cpp | 2 +- src/share/vm/memory/resourceArea.cpp | 15 +- src/share/vm/memory/resourceArea.hpp | 6 +- src/share/vm/memory/threadLocalAllocBuffer.cpp | 2 +- src/share/vm/memory/universe.cpp | 23 +- src/share/vm/memory/universe.hpp | 4 +- src/share/vm/oops/cpCacheOop.cpp | 41 +- src/share/vm/oops/cpCacheOop.hpp | 5 +- src/share/vm/oops/generateOopMap.cpp | 21 +- src/share/vm/oops/klassVtable.cpp | 86 +- src/share/vm/oops/klassVtable.hpp | 11 +- src/share/vm/oops/methodOop.cpp | 10 +- src/share/vm/oops/methodOop.hpp | 6 +- src/share/vm/opto/cfgnode.cpp | 2 + src/share/vm/opto/library_call.cpp | 4 +- src/share/vm/opto/loopTransform.cpp | 3 + src/share/vm/opto/type.cpp | 2 + src/share/vm/prims/jni.cpp | 2 +- src/share/vm/prims/jvm.cpp | 85 +- src/share/vm/prims/jvmtiEnv.cpp | 3 + src/share/vm/prims/jvmtiExport.cpp | 41 + src/share/vm/prims/jvmtiExport.hpp | 6 + src/share/vm/prims/jvmtiRedefineClasses.cpp | 169 +- src/share/vm/prims/jvmtiRedefineClasses.hpp | 7 +- src/share/vm/prims/jvmtiRedefineClassesTrace.hpp | 11 +- src/share/vm/prims/methodHandles.cpp | 8 + src/share/vm/runtime/arguments.cpp | 14 +- src/share/vm/runtime/globals.hpp | 7 +- src/share/vm/runtime/os.cpp | 3 + src/share/vm/runtime/os.hpp | 1 + src/share/vm/runtime/thread.cpp | 3 + src/share/vm/runtime/virtualspace.cpp | 15 +- src/share/vm/runtime/vmStructs.cpp | 10 +- src/share/vm/shark/sharkCompiler.cpp | 4 +- src/share/vm/utilities/accessFlags.cpp | 6 +- src/share/vm/utilities/accessFlags.hpp | 4 +- src/share/vm/utilities/bitMap.hpp | 2 +- src/share/vm/utilities/macros.hpp | 16 + src/share/vm/utilities/ostream.cpp | 2 +- src/share/vm/utilities/vmError.cpp | 23 +- src/share/vm/utilities/vmError.hpp | 8 + test/compiler/7158807/Test7158807.java | 66 + test/runtime/6929067/Test6929067.sh | 35 +- test/runtime/7020373/GenOOMCrashClass.java | 157 + test/runtime/7020373/Test7020373.sh | 7 +- test/runtime/7020373/testcase.jar | Bin test/runtime/7158800/BadUtf8.java | 1254 - test/runtime/7158800/InternTest.java | 80 - test/runtime/7158800/Test7158800.sh | 91 - test/runtime/7158800/badstrings.txt | 30001 ---------- test/runtime/7162488/Test7162488.sh | 77 + tools/mkbc.c | 607 + 123 files changed, 26796 insertions(+), 31845 deletions(-) diffs (truncated from 61072 to 500 lines): diff -r 7566374c3c89 -r 38f1b987027f .hgtags --- a/.hgtags Mon Aug 13 14:19:48 2012 -0700 +++ b/.hgtags Fri Aug 09 12:21:36 2013 +0100 @@ -50,6 +50,7 @@ faf94d94786b621f8e13cbcc941ca69c6d967c3f jdk7-b73 f4b900403d6e4b0af51447bd13bbe23fe3a1dac7 jdk7-b74 d8dd291a362acb656026a9c0a9da48501505a1e7 jdk7-b75 +b4ab978ce52c41bb7e8ee86285e6c9f28122bbe1 icedtea7-1.12 9174bb32e934965288121f75394874eeb1fcb649 jdk7-b76 455105fc81d941482f8f8056afaa7aa0949c9300 jdk7-b77 e703499b4b51e3af756ae77c3d5e8b3058a14e4e jdk7-b78 @@ -87,6 +88,7 @@ 07226e9eab8f74b37346b32715f829a2ef2c3188 hs18-b01 e7e7e36ccdb5d56edd47e5744351202d38f3b7ad jdk7-b87 4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b jdk7-b88 +a393ff93e7e54dd94cc4211892605a32f9c77dad icedtea7-1.13 15836273ac2494f36ef62088bc1cb6f3f011f565 jdk7-b89 4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b hs18-b02 605c9707a766ff518cd841fc04f9bb4b36a3a30b jdk7-b90 @@ -160,6 +162,7 @@ b898f0fc3cedc972d884d31a751afd75969531cf hs21-b05 bd586e392d93b7ed7a1636dcc8da2b6a4203a102 jdk7-b136 bd586e392d93b7ed7a1636dcc8da2b6a4203a102 hs21-b06 +591c7dc0b2ee879f87a7b5519a5388e0d81520be icedtea-1.14 2dbcb4a4d8dace5fe78ceb563b134f1fb296cd8f jdk7-b137 2dbcb4a4d8dace5fe78ceb563b134f1fb296cd8f hs21-b07 0930dc920c185afbf40fed9a655290b8e5b16783 jdk7-b138 @@ -182,6 +185,7 @@ 38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16 81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147 81d815b05abb564aa1f4100ae13491c949b9a07e hs21-b17 +7693eb0fce1f6b484cce96c233ea20bdad8a09e0 icedtea-2.0-branchpoint 9b0ca45cd756d538c4c30afab280a91868eee1a5 jdk7u2-b01 0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01 31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02 @@ -210,6 +214,7 @@ 3ba0bb2e7c8ddac172f5b995aae57329cdd2dafa hs22-b10 f17fe2f4b6aacc19cbb8ee39476f2f13a1c4d3cd jdk7u2-b13 0744602f85c6fe62255326df595785eb2b32166d jdk7u2-b21 +f8f4d3f9b16567b91bcef4caaa8417c8de8015f0 icedtea-2.1-branchpoint a40d238623e5b1ab1224ea6b36dc5b23d0a53880 jdk7u3-b02 6986bfb4c82e00b938c140f2202133350e6e73f8 jdk7u3-b03 8e6375b46717d74d4885f839b4e72d03f357a45f jdk7u3-b04 @@ -264,6 +269,7 @@ f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16 f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16 931e5f39e365a0d550d79148ff87a7f9e864d2e1 hs23-b16 +a2c5354863dcb3d147b7b6f55ef514b1bfecf920 icedtea-2.2-branchpoint efb5f2662c96c472caa3327090268c75a86dd9c0 jdk7u4-b13 82e719a2e6416838b4421637646cbfd7104c7716 jdk7u4-b14 e5f7f95411fb9e837800b4152741c962118e5d7a jdk7u5-b01 @@ -311,6 +317,7 @@ cefe884c708aa6dfd63aff45f6c698a6bc346791 jdk7u6-b16 270a40a57b3d05ca64070208dcbb895b5b509d8e hs23.2-b08 7a37cec9d0d44ae6ea3d26a95407e42d99af6843 jdk7u6-b17 +354cfde7db2f1fd46312d883a63c8a76d5381bab icedtea-2.3-branchpoint df0df4ae5af2f40b7f630c53a86e8c3d68ef5b66 jdk7u6-b18 1257f4373a06f788bd656ae1c7a953a026a285b9 jdk7u6-b19 a0c2fa4baeb6aad6f33dc87b676b21345794d61e hs23.2-b09 @@ -320,3 +327,104 @@ df57f6208cb76b4e8d1a0bd0eea3d2ad577cb79b jdk7u6-b23 b03c2687fb16514652e79261ad68d2c601dcee62 jdk7u6-b24 cffde29ea7cc8647f17002a4d0e94065dcd82839 jdk7u6-b30 +eede732f62dd73953dce03e003415729c6c335b2 icedtea-2.3 +c798442fa4c00ad251f6cbe989d32485845bf247 icedtea-2.3.1 +2a413d946cb1acdcbe1110098f79b7a1f267bf75 icedtea-2.3.2 +0885feeea95caa8b92f46234872f0c3839d8850b icedtea-2.3.3 +87f0aa7a8f8f0209148ad0746a3486d9cf16ebaa icedtea-2.3.4 +f2b98ad97b3c9d2d9fb98b0dd9b82506a5688e55 icedtea-2.3.5 +ad27d7c42279783903b26cd42b09741f5640f6db icedtea-2.3.6 +ad27d7c42279783903b26cd42b09741f5640f6db icedtea-2.3.6 +0000000000000000000000000000000000000000 icedtea-2.3.6 +7566374c3c89b7d99be9bcdb9342283a3bea6930 jdk7u6-b31 +f7933fecea9aa494e4032e17ff07e5fcec4b5961 jdk7u7-b10 +eeef33dc4b40f9ba50c4c9b1ac61b30f0f2523bf jdk7u7-b30 +f1551c70c7f598b7049bcc33e530fc738a81c7a4 jdk7u7-b11 +6b9db7216dd4b7846faf372f19566a418c8e391f jdk7u7-b31 +b66bb0e3224ff15259361a5b501bf8fa6b346113 jdk7u7-b01 +ca6943c94e6075fc28353d52ac6ea52c80aef9bb jdk7u7-b02 +e043d96d767d8ba4d74d53c477af8e07b78b6128 jdk7u9-b03 +0000000000000000000000000000000000000000 jdk7u7-b01 +b66bb0e3224ff15259361a5b501bf8fa6b346113 jdk7u9-b01 +0000000000000000000000000000000000000000 jdk7u7-b02 +ca6943c94e6075fc28353d52ac6ea52c80aef9bb jdk7u9-b02 +ed42837374ac730ddaf2fd28814017c665634a8b jdk7u9-b04 +da4aa289ac100017f850ed4d492e8054db6a1e28 jdk7u9-b05 +8eaa45ed5f804199c0823b409dc37f72e808926f jdk7u9-b31 +ea83168282c8c3a9f4a8ca723cc86972a3188d58 jdk7u9-b32 +d2e25680db9d4209b3f0f51e5c848284cedea508 jdk7u10-b10 +d37fd995683ab5bc2d941648ce7bf8bd194732f2 jdk7u10-b11 +f26f3d92e6d9ef7842b2d785f92439dbb15e670e jdk7u10-b12 +58881c615a5179bcea69148d0b3eb47a1f1a7de8 jdk7u10-b13 +cdbf4d442b56ece8ac521c65b59087682e5ae918 jdk7u10-b14 +63e8b49b329e4b50547b13f5c732665bed535732 jdk7u10-b15 +1cb34ef50bddc334c8538cf85d8612383debc74f jdk7u10-b16 +5c154a591de987d515f5b102a988bcf96d439f53 jdk7u10-b17 +78c7e1b4a006342230e04fbb73f637834207abef jdk7u10-b18 +c6b78bbaf6976197ead9d5aa3f65e0224cd13541 jdk7u10-b30 +07f7daeb261073a4a2946d988979ee65ba8ed753 jdk7u10-b31 +25a92b94ad538963d009bf8a53ce548e13f55c82 jdk7u11-b20 +7a2cf85fc36e845db9ccb2a22af195c70af33bdf jdk7u11-b21 +06b5c3f663b81f11da2080a91d215a96ae431f84 jdk7u11-b32 +abb5b690122caabf09f93958c747358cc22f8a59 jdk7u11-b33 +db7028c8a953f46225fceb6148f97de87c784dda jdk7u11-b03 +4d418a1b8be04220f504cf414b47877821a22a26 jdk7u11-b04 +f71032f398a3baea567710ba7161c64b94495cac jdk7u11-b05 +0cbce123c9027d531e585fd81fbc361c5f8407f1 jdk7u11-b06 +94bf1e3dafef3cc06d3f97f81d304313ccd999ee jdk7u11-b07 +2b543aa340e4a75671fe05803fcee08bf3e136db jdk7u11-b08 +34a7b6dda06e2ff6f7e9ad563e3fc3ecd8993579 jdk7u13-b09 +0000000000000000000000000000000000000000 icedtea-2.3.6 +849ee586b0be87d4f03ed566a75e5352b647605d icedtea-2.3.6 +849ee586b0be87d4f03ed566a75e5352b647605d icedtea-2.3.6 +0000000000000000000000000000000000000000 icedtea-2.3.6 +0000000000000000000000000000000000000000 icedtea-2.3.6 +19e37453ab1be02d146ace33f19d73719c119eaf icedtea-2.3.6 +bc0de5a0ece28d5e8035cc7659cd6f71a838882a icedtea-2.3.7 +104e2c65892dc642bcad698d0b21cecb08e67c9e icedtea-2.3.8 +e0e52e35e0c53a84daadae95f626e36fd74f3eba jdk7u13-b10 +be57a8d7a1a75971c3b1e7777dcacd20f3d33264 jdk7u13-b30 +e0e52e35e0c53a84daadae95f626e36fd74f3eba jdk7u13-b20 +5fbe0cae3a2a78a73946cfd08c56a64860f1afd9 jdk7u15-b01 +30d72c9abb560bc424d16d96bfd396ccd3c62cbc jdk7u15-b02 +221c64550c5b4411d78b63820835de1a8cd0c118 jdk7u15-b30 +0b905a04f573565515aa8614085099abd73dcac4 jdk7u15-b31 +8b349f332a66ebe5982b5680c85f903efb03da8e jdk7u15-b33 +5b55cef461b034766f05a46640caa123aa4247d4 jdk7u15-b03 +34a7b6dda06e2ff6f7e9ad563e3fc3ecd8993579 jdk7u15-b32 +a4dfda7a2655209abb170b2fa4914dbbba89bcd3 jdk7u17-b01 +ad5a321edea22c86af5c7844ed49f7b6105ab7ff icedtea-2.3.9 +4e374ade4066e340199c6f2371769e9aa2852282 icedtea-2.3.10 +4413a836dcc7022fa64f60d7faa491aba1248edc icedtea-2.3.11 +37b254871acbef27e5f29c73982ac324e7df2b9a icedtea-2.3.12 +0d82bf449a610602b6e9ddcc9e076839d5351449 jdk7u17-b02 +7b357c079370e2fd324c229f2e24c982915c80a0 jdk7u17-b30 +22b6fd616cfe61774525a944f162bf5e7c418f03 jdk7u17-b31 +8e04b403f5803f79db949b61b6c086758b611678 jdk7u17-b32 +be57a8d7a1a75971c3b1e7777dcacd20f3d33264 jdk7u21-b01 +5119d89c7cc844190c0799dca85710e7592d42e7 jdk7u21-b02 +ad14169fb640ca532193cca0fd6e14910f226075 jdk7u21-b03 +c954aab38a7f8f62e33ae5103494576f67fc36d9 jdk7u21-b04 +0e8e9d990d91dc0f8b8807bb82c090de3264c809 jdk7u21-b05 +beeb3d6b76f06d9f60c31d6c5b9e04d82f01ad79 jdk7u21-b06 +663b5c744e82d1c884048cd9b38f625e52004773 jdk7u21-b07 +87e9bb582938552180b024dd99bc5166816f3921 jdk7u21-b08 +1f195ee7856aecb6527bc5c957f66e1960e51a12 jdk7u21-b09 +d4a4c2bd389abcd80c25d20e0ffb7d5cee356715 jdk7u21-b10 +d07dafb51e1d75f110a3c506c250d995235acca6 jdk7u21-b11 +a977dedec81c346247631ead6f3364c76949d67a jdk7u21-b30 +c5e4585a045fe165d067ec0e98af42eace20c5f8 jdk7u21-b12 +bf2d84c5103d98db1697b50071a649ea23c4e33d jdk7u25-b01 +07119340f80f77dfcb03fa568641e80b43d4be74 jdk7u25-b02 +655bea6843fb7beabd8d9eeda59572c0c7055b85 jdk7u25-b03 +96a4e612195c0d753be24cf38fea0ee8ce30edcf jdk7u25-b04 +7151c26b838828a20cb28595ef1f70403d1868cf jdk7u25-b05 +fbb5f6083dd00ca7417e4a45311f33918bb2a5f0 jdk7u25-b06 +83abf4b2fc8a5bb7226177c5e4334bd0bfd7a8df jdk7u25-b07 +525252cd9fca4869c3fd81bc61299a85e73ff9c7 jdk7u25-b08 +706a255a8404b7e41579cea278df6bb87c314567 jdk7u25-b09 +402184622f60a2ba35479bdf124a8d4694835406 jdk7u25-b10 +cca49a35bf83664456af112482ffb3a7465d21fa jdk7u25-b11 +7ca68c0674df72fdd784de337c049404d2b5b0c3 jdk7u25-b12 +3e145a686fedd9eefdcb6b714241200ed236b41d jdk7u25-b13 +4fafaf293aa5666e8c9f5ca1d96c3f752305f586 jdk7u25-b14 diff -r 7566374c3c89 -r 38f1b987027f .jcheck/conf --- a/.jcheck/conf Mon Aug 13 14:19:48 2012 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 7566374c3c89 -r 38f1b987027f agent/src/os/linux/Makefile --- a/agent/src/os/linux/Makefile Mon Aug 13 14:19:48 2012 -0700 +++ b/agent/src/os/linux/Makefile Fri Aug 09 12:21:36 2013 +0100 @@ -23,7 +23,12 @@ # ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi ) -GCC = gcc + +ifndef BUILD_GCC +BUILD_GCC = gcc +endif + +GCC = $(BUILD_GCC) JAVAH = ${JAVA_HOME}/bin/javah @@ -40,7 +45,7 @@ LIBS = -lthread_db -CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) -D_FILE_OFFSET_BITS=64 +CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES) -D_FILE_OFFSET_BITS=64 LIBSA = $(ARCH)/libsaproc.so @@ -73,7 +78,7 @@ $(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(OBJS) $(LIBS) test.o: test.c - $(GCC) -c -o test.o -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) test.c + $(GCC) -c -o test.o -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES) test.c test: test.o $(GCC) -o test test.o -L$(ARCH) -lsaproc $(LIBS) diff -r 7566374c3c89 -r 38f1b987027f agent/src/os/linux/libproc.h --- a/agent/src/os/linux/libproc.h Mon Aug 13 14:19:48 2012 -0700 +++ b/agent/src/os/linux/libproc.h Fri Aug 09 12:21:36 2013 +0100 @@ -36,9 +36,34 @@ These two files define pt_regs structure differently */ #ifdef _LP64 -#include "asm-sparc64/ptrace.h" +struct pt_regs { + unsigned long u_regs[16]; /* globals and ins */ + unsigned long tstate; + unsigned long tpc; + unsigned long tnpc; + unsigned int y; + + /* We encode a magic number, PT_REGS_MAGIC, along + * with the %tt (trap type) register value at trap + * entry time. The magic number allows us to identify + * accurately a trap stack frame in the stack + * unwinder, and the %tt value allows us to test + * things like "in a system call" etc. for an arbitray + * process. + * + * The PT_REGS_MAGIC is chosen such that it can be + * loaded completely using just a sethi instruction. + */ + unsigned int magic; +}; #else -#include "asm-sparc/ptrace.h" +struct pt_regs { + unsigned long psr; + unsigned long pc; + unsigned long npc; + unsigned long y; + unsigned long u_regs[16]; /* globals and ins */ +}; #endif #endif //sparc or sparcv9 diff -r 7566374c3c89 -r 38f1b987027f make/hotspot_version --- a/make/hotspot_version Mon Aug 13 14:19:48 2012 -0700 +++ b/make/hotspot_version Fri Aug 09 12:21:36 2013 +0100 @@ -31,11 +31,11 @@ # # Don't put quotes (fail windows build). -HOTSPOT_VM_COPYRIGHT=Copyright 2012 +HOTSPOT_VM_COPYRIGHT=Copyright 2013 HS_MAJOR_VER=23 -HS_MINOR_VER=2 -HS_BUILD_NUMBER=09 +HS_MINOR_VER=25 +HS_BUILD_NUMBER=01 JDK_MAJOR_VER=1 JDK_MINOR_VER=7 diff -r 7566374c3c89 -r 38f1b987027f make/linux/makefiles/adlc.make --- a/make/linux/makefiles/adlc.make Mon Aug 13 14:19:48 2012 -0700 +++ b/make/linux/makefiles/adlc.make Fri Aug 09 12:21:36 2013 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2012, 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 @@ -68,7 +68,9 @@ # CFLAGS_WARN holds compiler options to suppress/enable warnings. # Compiler warnings are treated as errors +ifneq ($(COMPILER_WARNINGS_FATAL),false) CFLAGS_WARN = -Werror +endif CFLAGS += $(CFLAGS_WARN) OBJECTNAMES = \ @@ -133,8 +135,10 @@ # Note that product files are updated via "mv", which is atomic. TEMPDIR := $(OUTDIR)/mktmp$(shell echo $$$$) -# Debuggable by default -CFLAGS += -g +ifneq ($(DEBUG_BINARIES), true) + # Debuggable by default (unless already done by DEBUG_BINARIES) + CFLAGS += -g +endif # Pass -D flags into ADLC. ADLCFLAGS += $(SYSDEFS) diff -r 7566374c3c89 -r 38f1b987027f make/linux/makefiles/defs.make --- a/make/linux/makefiles/defs.make Mon Aug 13 14:19:48 2012 -0700 +++ b/make/linux/makefiles/defs.make Fri Aug 09 12:21:36 2013 +0100 @@ -228,10 +228,14 @@ # client and server subdirectories have symbolic links to ../libjsig.so EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX) ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz - else - EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo + ifneq ($(ZERO_BUILD), true) + ifneq ($(STRIP_POLICY),no_strip) + ifeq ($(ZIP_DEBUGINFO_FILES),1) + EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz + else + EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo + endif + endif endif endif EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server @@ -240,11 +244,15 @@ ifndef BUILD_CLIENT_ONLY EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz - else - EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo + ifneq ($(ZERO_BUILD), true) + ifneq ($(STRIP_POLICY),no_strip) + ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) + ifeq ($(ZIP_DEBUGINFO_FILES),1) + EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz + else + EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo + endif + endif endif endif endif @@ -253,11 +261,13 @@ ifeq ($(ARCH_DATA_MODEL), 32) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz - else - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo + ifneq ($(STRIP_POLICY),no_strip) + ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) + ifeq ($(ZIP_DEBUGINFO_FILES),1) + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz + else + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo + endif endif endif endif @@ -270,12 +280,16 @@ ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ $(EXPORT_LIB_DIR)/sa-jdi.jar ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz - ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz - else - ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo - ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo + ifneq ($(ZERO_BUILD), true) + ifneq ($(STRIP_POLICY),no_strip) + ifeq ($(ZIP_DEBUGINFO_FILES),1) + ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz + ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz + else + ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo + ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo + endif + endif endif endif ADD_SA_BINARIES/ppc = diff -r 7566374c3c89 -r 38f1b987027f make/linux/makefiles/gcc.make --- a/make/linux/makefiles/gcc.make Mon Aug 13 14:19:48 2012 -0700 +++ b/make/linux/makefiles/gcc.make Fri Aug 09 12:21:36 2013 +0100 @@ -25,19 +25,42 @@ #------------------------------------------------------------------------ # CC, CXX & AS -# When cross-compiling the ALT_COMPILER_PATH points -# to the cross-compilation toolset +ifndef HOST_GCC ifdef CROSS_COMPILE_ARCH -CXX = $(ALT_COMPILER_PATH)/g++ -CC = $(ALT_COMPILER_PATH)/gcc -HOSTCXX = g++ -HOSTCC = gcc +HOST_GCC = gcc else -CXX = g++ -CC = gcc -HOSTCXX = $(CXX) -HOSTCC = $(CC) +HOST_GCC = $(CC) endif +endif + +ifndef HOST_CXX +ifdef CROSS_COMPILE_ARCH +HOST_CXX = g++ +else +HOST_CXX = $(CXX) +endif +endif + +ifndef BUILD_GCC +ifdef CROSS_COMPILE_ARCH +BUILD_GCC = $(ALT_COMPILER_PATH)/gcc +else +BUILD_GCC = gcc +endif +endif + +ifndef BUILD_CXX +ifdef CROSS_COMPILE_ARCH +BUILD_CXX = $(ALT_COMPILER_PATH)/g++ +else +BUILD_CXX = g++ +endif +endif + +CXX = $(BUILD_CXX) +CC = $(BUILD_GCC) +HOSTCXX = $(HOST_CXX) +HOSTCC = $(HOST_GCC) AS = $(CC) -c @@ -61,7 +84,11 @@ # Compiler flags # position-independent code +ifneq ($(filter parisc ppc ppc64 s390 s390x sparc sparc64 sparcv9,$(ZERO_LIBARCH)),) PICFLAG = -fPIC +else +PICFLAG = -fpic +endif VM_PICFLAG/LIBJVM = $(PICFLAG) VM_PICFLAG/AOUT = @@ -123,7 +150,9 @@ endif # Compiler warnings are treated as errors +ifneq ($(COMPILER_WARNINGS_FATAL),false) WARNINGS_ARE_ERRORS = -Werror +endif # Except for a few acceptable ones # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit @@ -209,47 +238,48 @@ #------------------------------------------------------------------------ # Debug flags -# Use the stabs format for debugging information (this is the default -# on gcc-2.91). It's good enough, has all the information about line -# numbers and local variables, and libjvm_g.so is only about 16M. -# Change this back to "-g" if you want the most expressive format. -# (warning: that could easily inflate libjvm_g.so to 150M!) -# Note: The Itanium gcc compiler crashes when using -gstabs. -DEBUG_CFLAGS/ia64 = -g -DEBUG_CFLAGS/amd64 = -g -DEBUG_CFLAGS/arm = -g -DEBUG_CFLAGS/ppc = -g -DEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH)) -ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),) -DEBUG_CFLAGS += -gstabs -endif - -ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) - FASTDEBUG_CFLAGS/ia64 = -g - FASTDEBUG_CFLAGS/amd64 = -g - FASTDEBUG_CFLAGS/arm = -g - FASTDEBUG_CFLAGS/ppc = -g - FASTDEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH)) - ifeq ($(FASTDEBUG_CFLAGS/$(BUILDARCH)),) - FASTDEBUG_CFLAGS += -gstabs +# DEBUG_BINARIES uses full -g debug information for all configs +ifeq ($(DEBUG_BINARIES), true) + CFLAGS += -g +else + # Use the stabs format for debugging information (this is the default + # on gcc-2.91). It's good enough, has all the information about line + # numbers and local variables, and libjvm_g.so is only about 16M. + # Change this back to "-g" if you want the most expressive format. + # (warning: that could easily inflate libjvm_g.so to 150M!) + # Note: The Itanium gcc compiler crashes when using -gstabs. + DEBUG_CFLAGS/ia64 = -g + DEBUG_CFLAGS/amd64 = -g + DEBUG_CFLAGS/arm = -g + DEBUG_CFLAGS/ppc = -g From adomurad at redhat.com Fri Aug 9 11:36:57 2013 From: adomurad at redhat.com (Adam Domurad) Date: Fri, 09 Aug 2013 14:36:57 -0400 Subject: [rfc][icedtea-web] TinyHttpdImpl refactor In-Reply-To: <51FABB05.6030206@redhat.com> References: <51F2971C.7050005@redhat.com> <51F74E5C.7060706@redhat.com> <51FA7BAD.7090203@redhat.com> <51FAB629.50800@redhat.com> <51FABB05.6030206@redhat.com> Message-ID: <520536C9.9080205@redhat.com> On 08/01/2013 03:46 PM, Andrew Azores wrote: > On 08/01/2013 03:25 PM, Adam Domurad wrote: >> On 08/01/2013 11:15 AM, Andrew Azores wrote: >>> On 07/30/2013 01:25 AM, Jiri Vanek wrote: >>>> On 07/26/2013 05:34 PM, Andrew Azores wrote: >>>>> Changelog: >>>>> * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java >>>>> (TinyHttpdImpl): BufferedReader and DataOutputStream become member >>>>> variables rather than local to run. More informative/mnemonic >>>>> variable names >>>>> (writeErrorToPipe): new private method. >>>>> (writeToPipe): new private method. >>>>> (run): refactored to use writeToPipe and writeErrorToPipe, and >>>>> ensuring that streams are closed when no longer in use. More >>>>> informative/mnemonic variable names >>>>> >>>>> The patch looks big (relative to the size of the file) but it's >>>>> really almost entirely variable renaming and method extractions. :) >>>> Does not, I'm dealyed due to packaging stuff ;( Sorry >>>> Practicaly no objections to the code: >>>> * The unittests for this are however a must - for new method, >>>> constructors and especially for run - to ensure they behave as they >>>> behaved before. Not that the backward compatibility is important in >>>> tests extensions, but because it worked pretty well. >>>> I would rather this patch to be pushed to head only together with >>>> unittests, but if you swear, you can push in two pushes. >>>> >>>> Thanx for refactoring! >>>> J. >>> >>> Round two. >>> >>> Changelog: >>> * >>> tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java: >>> moved TinyHttpdImpl tests into new class >>> * >>> tests/test-extensions-tests/net/sourceforge/jnlp/TinyHttpdImplTest.java: >>> new class for testing TinyHttpdImpl specifically >>> * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: >>> refactored. "port" field removed as it was unused. Server now continues >>> to run after an HTTP 404. >>> * tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java: >>> removed "port" argument from TinyHttpdImpl constructor call >>> >>> I decided to undo some of my deeper changes to TinyHttpdImpl since they >>> were really done in the first place just to make the code look cleaner >>> (not good reasoning...), but I found better ways to clean it up without >>> making the reader/writer variables into fields. >>> >>> Andrew A >> >> I believe you forgot a patch >> >> Cheers, >> -Adam > > D'oh, this happens to me too frequently. Thanks. > > Andrew A Comments inline, patch first: > diff --git a/tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java b/tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java > --- a/tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java > +++ b/tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java > @@ -113,7 +113,7 @@ public class ServerLauncher implements R > try { > serverSocket = new ServerSocket(port); > while (running) { > - TinyHttpdImpl server = new TinyHttpdImpl(serverSocket.accept(), dir, port,false); > + TinyHttpdImpl server = new TinyHttpdImpl(serverSocket.accept(), dir, false); > server.setSupportingHeadRequest(isSupportingHeadRequest()); > server.start(); > } > 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 > @@ -59,120 +59,133 @@ import java.util.StringTokenizer; > */ > public class TinyHttpdImpl extends Thread { > > - Socket c; > - private final File dir; > - private final int port; > - private boolean canRun = true; > + private static final String CRLF = "\r\n"; > + private static final String HTTP_BAD_REQUEST = "HTTP/1.0 " + HttpURLConnection.HTTP_BAD_REQUEST + " Bad Request" + CRLF; > + private static final String HTTP_NOT_IMPLEMENTED = "HTTP/1.0 " + HttpURLConnection.HTTP_NOT_IMPLEMENTED + " Not Implemented" + CRLF; > + private static final String HTTP_NOT_FOUND = "HTTP/1.0 " + HttpURLConnection.HTTP_NOT_FOUND + " Not Found" + CRLF; > + private static final String HTTP_OK = "HTTP/1.0 " + HttpURLConnection.HTTP_OK + " OK" + CRLF; > private static final String XSX = "/XslowX"; > - private boolean supportingHeadRequest = true; > - > - public TinyHttpdImpl(Socket s, File f, int port) { > - this(s, f, port, true); > + > + private Socket mSocket; As discussed on IRC, this prefixing of 'm' before an instance variable is not used in icedtea-web. Please consider using 'this.variable' wherever you feel it is unclear. Personally for me IDE colouring renders scope differences obsolete. [.. snip ..] No qualms otherwise with the changes. Tests look good. I think you can push if you drop the mSomething naming convention. Cheers, -Adam From alex.kasko.lists at gmail.com Sun Aug 11 14:39:03 2013 From: alex.kasko.lists at gmail.com (Alex Kasko) Date: Mon, 12 Aug 2013 00:39:03 +0300 Subject: [rfc][icedtea7] patch for macosx build Message-ID: <52080477.1080102@gmail.com> Hi, I've built icedtea7 head (hg:0a8108854365) for macosx x86_64 and want to publish patch for possible upstreaming. I've used the same sources, as in windows build - obtained from "icedtea7/openjdk" directory by running: ./configure \ --disable-system-zlib \ --disable-system-jpeg \ --disable-system-png \ --disable-system-gif \ --disable-system-lcms \ --disable-compile-against-syscalls \ --disable-nss and "make" on debian wheezy. Then built these sources on macosx 10.7.5 with xcode 4.3.2 (gcc 4.2.1) as a separate openjdk build (without icedtea infrastructure) using additional environment variables: export FT2_CFLAGS='-I$(FREETYPE_HEADERS_PATH) -I$(FREETYPE_HEADERS_PATH)/freetype2' export DISABLE_INTREE_EC=true Patch was created against icedtea7-forest/jdk (hg:afaedb56b499): 2013-08-11 Alex Kasko *make/java/nio/Makefile: add "syscalls_fp.c" to compilation list in macosx specific section *make/sun/lwawt/FILES_c_macosx.gmk: add "cups_fp.c" to compilation list *make/sun/lwawt/Makefile: add "solaris/native/common/deps" directory to headers search list, and to vpath (not sure whether vpath is necessary here) -- Regards, Alex Kasko -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea7_macosx.patch Type: text/x-diff Size: 1583 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130812/1a03a3ce/icedtea7_macosx.patch From bugzilla-daemon at icedtea.classpath.org Mon Aug 12 01:28:20 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 12 Aug 2013 08:28:20 +0000 Subject: [Bug 1518] tomcat jdk bug In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1518 Severin Gehwolf changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |sgehwolf at redhat.com, | |unassigned at icedtea.classpat | |h.org Component|Thermostat |IcedTea Version|0.6 |6-1.12.6 Assignee|jon.vanalten at redhat.com |gnu.andrew at redhat.com Product|Thermostat |IcedTea --- Comment #1 from Severin Gehwolf --- Re-assigning product. -- 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/20130812/ff4c33fc/attachment.html From ptisnovs at icedtea.classpath.org Mon Aug 12 01:46:37 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 12 Aug 2013 08:46:37 +0000 Subject: /hg/gfx-test: Eight new tests added into BitBltConvolveOp test s... Message-ID: changeset 480fabf6ecdb in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=480fabf6ecdb author: Pavel Tisnovsky date: Mon Aug 12 10:50:18 2013 +0200 Eight new tests added into BitBltConvolveOp test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltConvolveOp.java | 112 +++++++++++++++++++++++ 2 files changed, 117 insertions(+), 0 deletions(-) diffs (134 lines): diff -r 4b6739fa6b0f -r 480fabf6ecdb ChangeLog --- a/ChangeLog Fri Aug 02 12:12:00 2013 +0200 +++ b/ChangeLog Mon Aug 12 10:50:18 2013 +0200 @@ -1,3 +1,8 @@ +2013-08-12 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltConvolveOp.java: + Eight new tests added into BitBltConvolveOp test suite. + 2013-08-02 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBufferedImageOp.java: diff -r 4b6739fa6b0f -r 480fabf6ecdb src/org/gfxtest/testsuites/BitBltConvolveOp.java --- a/src/org/gfxtest/testsuites/BitBltConvolveOp.java Fri Aug 02 12:12:00 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltConvolveOp.java Mon Aug 12 10:50:18 2013 +0200 @@ -354,6 +354,118 @@ } /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageType4ByteABGRPreBackgroundNoOpKernel1x1ROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGRPre(image, graphics2d, noopKernel1x1ROP); + } + + /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageType4ByteABGRPreBackgroundNoOpKernel3x3ROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGRPre(image, graphics2d, noopKernel3x3ROP); + } + + /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageType4ByteABGRPreBackgroundNoOpKernel5x5ROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGRPre(image, graphics2d, noopKernel5x5ROP); + } + + /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageType4ByteABGRPreBackgroundSmoothingKernel2x2ROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGRPre(image, graphics2d, smoothingKernel2x2ROP); + } + + /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageType4ByteABGRPreBackgroundSmoothingKernel2x23x3ROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGRPre(image, graphics2d, smoothingKernel3x3ROP); + } + + /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageType4ByteABGRPreBackgroundSmoothingKernel2x25x5ROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGRPre(image, graphics2d, smoothingKernel5x5ROP); + } + + /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageType4ByteABGRPreBackgroundSobelOperatorGxROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGRPre(image, graphics2d, sobelOperatorGxROP); + } + + /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageType4ByteABGRPreBackgroundSobelOperatorGyROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGRPre(image, graphics2d, sobelOperatorGyROP); + } + + /** * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. * * @param image From ptisnovs at icedtea.classpath.org Mon Aug 12 01:51:27 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 12 Aug 2013 08:51:27 +0000 Subject: /hg/rhino-tests: Added two new tests getGenericSuperclass() and ... Message-ID: changeset eabf4dfba019 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=eabf4dfba019 author: Pavel Tisnovsky date: Mon Aug 12 10:55:08 2013 +0200 Added two new tests getGenericSuperclass() and getGenericInterfaces() into CompiledScriptClassTest. diffstat: ChangeLog | 6 ++ src/org/RhinoTests/CompiledScriptClassTest.java | 54 +++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diffs (77 lines): diff -r ea551c7459e6 -r eabf4dfba019 ChangeLog --- a/ChangeLog Fri Aug 02 12:14:48 2013 +0200 +++ b/ChangeLog Mon Aug 12 10:55:08 2013 +0200 @@ -1,3 +1,9 @@ +2013-08-12 Pavel Tisnovsky + + * src/org/RhinoTests/CompiledScriptClassTest.java: + Added two new tests getGenericSuperclass() and getGenericInterfaces() + into CompiledScriptClassTest. + 2013-08-02 Pavel Tisnovsky * src/org/RhinoTests/CompiledScriptClassTest.java: diff -r ea551c7459e6 -r eabf4dfba019 src/org/RhinoTests/CompiledScriptClassTest.java --- a/src/org/RhinoTests/CompiledScriptClassTest.java Fri Aug 02 12:14:48 2013 +0200 +++ b/src/org/RhinoTests/CompiledScriptClassTest.java Mon Aug 12 10:55:08 2013 +0200 @@ -1122,6 +1122,60 @@ } /** + * Test for method javax.script.CompiledScript.getClass().getGenericSuperclass() + */ + protected void testGetGenericSuperclass() { + Type genericSuperclass = this.compiledScriptClass.getGenericSuperclass(); + assertNotNull(genericSuperclass, "getGenericSuperclass() does not return null"); + } + + /** + * Test for method javax.script.CompiledScript.getClass().getGenericInterfaces() + */ + protected void testGetGenericInterfaces() { + // array of interface names that should exists + final String[] genericInterfaceNames_jdk6 = { + }; + + final String[] genericInterfaceNames_jdk7 = { + }; + + final String[] genericInterfaceNames_jdk8 = { + }; + + // 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.compiledScriptClass.getGenericInterfaces(); + assertNotNull(genericInterfaces, "getGenericInterfaces() returns null"); + assertEquals(0, 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 method javax.script.CompiledScript.getClass().getEnumConstants() */ protected void testGetEnumConstants() { From aazores at icedtea.classpath.org Mon Aug 12 07:00:26 2013 From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org) Date: Mon, 12 Aug 2013 14:00:26 +0000 Subject: /hg/icedtea-web: Refactored TinyHttpdImpl. Changed constructor, ... Message-ID: changeset e71b4c00d418 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=e71b4c00d418 author: Andrew Azores date: Mon Aug 12 10:00:49 2013 -0400 Refactored TinyHttpdImpl. Changed constructor, reflect this in ServerLauncher. Unit tests moved out of ServerAccessTest into new TinyHttpdImplTest. New unit tests added. diffstat: ChangeLog | 16 +- tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java | 65 -- tests/test-extensions-tests/net/sourceforge/jnlp/TinyHttpdImplTest.java | 226 ++++++++++ tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java | 2 +- tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java | 183 ++++--- 5 files changed, 338 insertions(+), 154 deletions(-) diffs (truncated from 621 to 500 lines): diff -r 54c77e5ee2a6 -r e71b4c00d418 ChangeLog --- a/ChangeLog Thu Aug 01 14:57:29 2013 -0400 +++ b/ChangeLog Mon Aug 12 10:00:49 2013 -0400 @@ -1,4 +1,14 @@ -2013-08-01 Andrew Azores +2013-08-12 Andrew Azores + * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: refactored + * tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java: + TinyHttpdImpl constructor changed, reflecting this here + * tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java: + removed TinyHttpdImpl tests + * tests/test-extensions-tests/net/sourceforge/jnlp/TinyHttpdImplTest.java: + new unit tests for TinyHttpdImpl and moved old tests out of + ServerAccessTest + +2013-08-01 Andrew Azores * .hgignore: ignore generated HTML files (from AboutDialog) @@ -22,7 +32,7 @@ should be served by test server in reproducers run and so prevent FNF exception * ChangeLog: fixed few entries below (added emty line between author and body) -2013-07-25 Andrew Azores +2013-07-25 Andrew Azores * netx/net/sourceforge/jnlp/about/AboutDialog.java (AboutDialog, display): removed "throws IOException" @@ -35,7 +45,7 @@ * netx/net/sourceforge/jnlp/splashscreen/impls/DefaultSplashScreens2012Commons.java: same -2013-07-22 Andrew Azores +2013-07-22 Andrew Azores * netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java: (getProxiesWithoutCaching) added java.vm.name read permission to fix diff -r 54c77e5ee2a6 -r e71b4c00d418 tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java --- a/tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java Thu Aug 01 14:57:29 2013 -0400 +++ b/tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java Mon Aug 12 10:00:49 2013 -0400 @@ -39,7 +39,6 @@ import java.io.File; import java.io.FileInputStream; import java.net.URL; -import java.net.URLDecoder; import org.junit.Assert; import org.junit.Test; @@ -220,70 +219,6 @@ 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() { - 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); for (int i = 0; i < bb.length; i++) { diff -r 54c77e5ee2a6 -r e71b4c00d418 tests/test-extensions-tests/net/sourceforge/jnlp/TinyHttpdImplTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-extensions-tests/net/sourceforge/jnlp/TinyHttpdImplTest.java Mon Aug 12 10:00:49 2013 -0400 @@ -0,0 +1,226 @@ +package net.sourceforge.jnlp; + +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.ServerSocket; +import java.net.Socket; +import java.net.URLDecoder; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.junit.Assert; +import org.junit.Test; + +public class TinyHttpdImplTest { + + private static final String HTTP_OK = "HTTP/1.0 200 OK"; + private static final String HTTP_400 = "HTTP/1.0 400 Bad Request"; + private static final String HTTP_404 = "HTTP/1.0 404 Not Found"; + private static final String HTTP_501 = "HTTP/1.0 501 Not Implemented"; + private static final String CONTENT_JNLP = "Content-Type: application/x-java-jnlp-file"; + private static final String CONTENT_HTML = "Content-Type: text/html"; + private static final String CONTENT_JAR = "Content-Type: application/x-jar"; + private static final Pattern CONTENT_LENGTH = Pattern.compile("Content-Length:([0-9]+)"); + + 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" + }; + + private static BufferedReader mReader; + private static DataOutputStream mWriter; + private static TinyHttpdImpl mServer; + + static { + try { + ServerSocket sSocket = new ServerSocket(44322); + sSocket.setReuseAddress(true); + File dir = new File(System.getProperty("test.server.dir")); + Socket extSock = new Socket("localhost", 44322); + extSock.setReuseAddress(true); + mServer = new TinyHttpdImpl(extSock, dir); + + Socket socket = sSocket.accept(); + socket.setReuseAddress(true); + mReader = new BufferedReader(new InputStreamReader(socket.getInputStream())); + mWriter = new DataOutputStream(socket.getOutputStream()); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + @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() { + 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 headTestHelper(String request, String contentType) { + Matcher matcher = CONTENT_LENGTH.matcher(request); + + Assert.assertTrue("Status should have been " + HTTP_OK, request.contains(HTTP_OK)); + Assert.assertTrue("Content type should have been " + contentType, request.contains(contentType)); + Assert.assertTrue("Should have had a content length", matcher.find()); + } + + @Test + public void JnlpHeadTest() throws IOException, InterruptedException { + String head = getTinyHttpdImplResponse("HEAD", "/simpletest1.jnlp"); + headTestHelper(head, CONTENT_JNLP); + } + + @Test + public void HtmlHeadTest() throws Exception { + String head = getTinyHttpdImplResponse("HEAD", "/StripHttpPathParams.html"); + headTestHelper(head, CONTENT_HTML); + } + + @Test + public void JarHeadTest() throws Exception { + String head = getTinyHttpdImplResponse("HEAD", "/StripHttpPathParams.jar"); + headTestHelper(head, CONTENT_JAR); + } + + @Test + public void PngHeadTest() throws Exception { + // TinyHttpdImpl doesn't recognize PNG type - default content type should be HTML + String head = getTinyHttpdImplResponse("HEAD", "/netxPlugin.png"); + headTestHelper(head, CONTENT_HTML); + } + + @Test + public void SlowSendTest() throws Exception { + // This test is VERY SLOW due to the extremely slow sending speed TinyHttpdImpl uses when XslowX is specified. + // Running time will be over two minutes. + long fastStartTime = System.nanoTime(); + String req1 = getTinyHttpdImplResponse("GET", "/simpletest1.jnlp"); + long fastElapsed = System.nanoTime() - fastStartTime; + + long slowStartTime = System.nanoTime(); + String req2 = getTinyHttpdImplResponse("GET", "/XslowXsimpletest1.jnlp"); + long slowElapsed = System.nanoTime() - slowStartTime; + + Assert.assertTrue("Slow request should have returned the same data as normal request", req1.equals(req2)); + + // This isn't a very good test since as it is, getTinyHttpdImpl is slowing down its receive rate to + // deal with the reduced sending rate. It is hardcoded to be slower. + Assert.assertTrue("Slow request should have taken longer than normal request", slowElapsed > fastElapsed); + } + + @Test + public void GetTest() throws Exception { + String jnlpHead = getTinyHttpdImplResponse("HEAD", "/simpletest1.jnlp"); + String jnlpGet = getTinyHttpdImplResponse("GET", "/simpletest1.jnlp"); + + Assert.assertTrue("GET status should be " + HTTP_OK, jnlpGet.contains(HTTP_OK)); + Assert.assertTrue("GET content type should have been " + CONTENT_JNLP, jnlpGet.contains(CONTENT_JNLP)); + Assert.assertTrue("GET response should contain HEAD response", jnlpGet.contains(jnlpHead)); + Assert.assertTrue("GET response should have been longer than HEAD response", jnlpGet.length() > jnlpHead.length()); + } + + @Test + public void Error404DoesNotCauseShutdown() throws Exception { + // Pre-refactoring, 404 errors were sent after catching an IOException when trying to open the requested + // resource. However this was caught by a try/catch clause around the entire while loop, so a 404 would + // shut down the server. + String firstRequest = getTinyHttpdImplResponse("HEAD", "/no_such_file"); + String secondRequest = getTinyHttpdImplResponse("HEAD", "/simpletest1.jnlp"); + + Assert.assertTrue("First request should have been " + HTTP_404, firstRequest.trim().equals(HTTP_404)); + Assert.assertTrue("Second request should have been " + HTTP_OK, secondRequest.contains(HTTP_OK)); + } + + @Test + public void BadMethodTest() throws Exception { + String head = getTinyHttpdImplResponse("BADMETHOD", "/simpletest1.jnlp"); + + Assert.assertTrue("Status should have been " + HTTP_400, head.trim().equals(HTTP_400)); + } + + @Test + public void NotSupportingHeadRequest() throws Exception { + boolean headRequestSupport = mServer.isSupportingHeadRequest(); + mServer.setSupportingHeadRequest(false); + String head = getTinyHttpdImplResponse("HEAD", "/simpletest1.jnlp"); + + Assert.assertTrue("Status should have been " + HTTP_501, head.trim().equals(HTTP_501)); + + mServer.setSupportingHeadRequest(headRequestSupport); + } + + private String getTinyHttpdImplResponse(String requestType, String filePath) throws IOException, InterruptedException { + if (!filePath.startsWith("/")) { + filePath = "/" + filePath; + } + mWriter.writeBytes(requestType + " " + filePath + " HTTP/1.1\r\n"); + Thread.sleep(250); // Wait a while for server to be able to respond to request + + StringBuilder builder = new StringBuilder(); + while (mReader.ready()) { + // TODO: come up with a better way to deal with slow sending - this works but is hackish + if (filePath.startsWith("/XslowX")) { + Thread.sleep(2100); // Wait for next chunk to have been sent, otherwise it'll appear as if the response + // has finished being sent prematurely + } + builder.append(mReader.readLine()); + builder.append("\n"); + } + + return builder.toString(); + } + +} diff -r 54c77e5ee2a6 -r e71b4c00d418 tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java --- a/tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java Thu Aug 01 14:57:29 2013 -0400 +++ b/tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java Mon Aug 12 10:00:49 2013 -0400 @@ -113,7 +113,7 @@ try { serverSocket = new ServerSocket(port); while (running) { - TinyHttpdImpl server = new TinyHttpdImpl(serverSocket.accept(), dir, port,false); + TinyHttpdImpl server = new TinyHttpdImpl(serverSocket.accept(), dir, false); server.setSupportingHeadRequest(isSupportingHeadRequest()); server.start(); } diff -r 54c77e5ee2a6 -r e71b4c00d418 tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java --- a/tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java Thu Aug 01 14:57:29 2013 -0400 +++ b/tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java Mon Aug 12 10:00:49 2013 -0400 @@ -59,21 +59,26 @@ */ public class TinyHttpdImpl extends Thread { - Socket c; - private final File dir; - private final int port; + private static final String CRLF = "\r\n"; + private static final String HTTP_BAD_REQUEST = "HTTP/1.0 " + HttpURLConnection.HTTP_BAD_REQUEST + " Bad Request" + CRLF; + private static final String HTTP_NOT_IMPLEMENTED = "HTTP/1.0 " + HttpURLConnection.HTTP_NOT_IMPLEMENTED + " Not Implemented" + CRLF; + private static final String HTTP_NOT_FOUND = "HTTP/1.0 " + HttpURLConnection.HTTP_NOT_FOUND + " Not Found" + CRLF; + private static final String HTTP_OK = "HTTP/1.0 " + HttpURLConnection.HTTP_OK + " OK" + CRLF; + private static final String XSX = "/XslowX"; + + private Socket socket; + private final File testDir; private boolean canRun = true; - private static final String XSX = "/XslowX"; private boolean supportingHeadRequest = true; - - public TinyHttpdImpl(Socket s, File f, int port) { - this(s, f, port, true); + + public TinyHttpdImpl(Socket socket, File dir) { + this(socket, dir, true); } - public TinyHttpdImpl(Socket s, File f, int port, boolean start) { - c = s; - this.dir = f; - this.port = port; - if (start){ + + public TinyHttpdImpl(Socket socket, File dir, boolean start) { + this.socket = socket; + this.testDir = dir; + if (start) { start(); } } @@ -87,92 +92,100 @@ } public boolean isSupportingHeadRequest() { - return supportingHeadRequest; + return this.supportingHeadRequest; } - - public int getPort() { - return port; + return this.socket.getPort(); } @Override public void run() { try { - BufferedReader i = new BufferedReader(new InputStreamReader(c.getInputStream())); - DataOutputStream o = new DataOutputStream(c.getOutputStream()); + BufferedReader reader = new BufferedReader(new InputStreamReader(this.socket.getInputStream())); + DataOutputStream writer = new DataOutputStream(this.socket.getOutputStream()); try { while (canRun) { - String s = i.readLine(); - if (s.length() < 1) { + String line = reader.readLine(); + if (line.length() < 1) { break; } - boolean isGetRequest = s.startsWith("GET"); - boolean isHeadRequest = s.startsWith("HEAD"); - - if (isHeadRequest && !isSupportingHeadRequest()){ - o.writeBytes("HTTP/1.0 "+HttpURLConnection.HTTP_NOT_IMPLEMENTED+" Not Implemented\n"); + StringTokenizer t = new StringTokenizer(line, " "); + String request = t.nextToken(); + + boolean isHeadRequest = request.equals("HEAD"); + boolean isGetRequest = request.equals("GET"); + + if (isHeadRequest && !isSupportingHeadRequest()) { + ServerAccess.logOutputReprint("Received HEAD request but not supported"); + writer.writeBytes(HTTP_NOT_IMPLEMENTED); continue; } - - String request = "unknown"; - if (isGetRequest || isHeadRequest ) { - if (isGetRequest){ - request = "GET"; - } - if (isHeadRequest){ - request = "HEAD"; - } - StringTokenizer t = new StringTokenizer(s, " "); - t.nextToken(); - String op = t.nextToken(); - String p = op; - if (p.startsWith(XSX)) { - p = p.replace(XSX, "/"); - } - ServerAccess.logOutputReprint("Getting- " + request + ": " + p); - p = urlToFilePath(p); - ServerAccess.logOutputReprint("Serving- " + request + ": " + p); - File pp = new File(dir, p); - int l = (int) pp.length(); - byte[] b = new byte[l]; - FileInputStream f = new FileInputStream(pp); - f.read(b); - String content = ""; - String ct = "Content-Type: "; - if (p.toLowerCase().endsWith(".jnlp")) { - content = ct + "application/x-java-jnlp-file\n"; - } else if (p.toLowerCase().endsWith(".html")) { - content = ct + "text/html\n"; - } else if (p.toLowerCase().endsWith(".jar")) { - content = ct + "application/x-jar\n"; - } - o.writeBytes("HTTP/1.0 "+HttpURLConnection.HTTP_OK+" OK\nContent-Length:" + l + "\n" + content + "\n"); - if (isHeadRequest) { - continue; // Skip sending body - } + if (!isHeadRequest && !isGetRequest) { + ServerAccess.logOutputReprint("Received unknown request type " + request); + writer.writeBytes(HTTP_BAD_REQUEST); + continue; + } - if (op.startsWith(XSX)) { - byte[][] bb = splitArray(b, 10); + String filePath = t.nextToken(); + boolean slowSend = filePath.startsWith(XSX); + + if (slowSend) { From ptisnovs at icedtea.classpath.org Tue Aug 13 00:31:16 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 13 Aug 2013 07:31:16 +0000 Subject: /hg/gfx-test: Ten new tests added into BitBltAffineIdentityTrans... Message-ID: changeset ea7869a6a3b2 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=ea7869a6a3b2 author: Pavel Tisnovsky date: Tue Aug 13 09:34:56 2013 +0200 Ten new tests added into BitBltAffineIdentityTransformOp test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java | 140 ++++++++++ 2 files changed, 145 insertions(+), 0 deletions(-) diffs (162 lines): diff -r 480fabf6ecdb -r ea7869a6a3b2 ChangeLog --- a/ChangeLog Mon Aug 12 10:50:18 2013 +0200 +++ b/ChangeLog Tue Aug 13 09:34:56 2013 +0200 @@ -1,3 +1,8 @@ +2013-08-13 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java: + Ten new tests added into BitBltAffineIdentityTransformOp test suite. + 2013-08-12 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltConvolveOp.java: diff -r 480fabf6ecdb -r ea7869a6a3b2 src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java --- a/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java Mon Aug 12 10:50:18 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java Tue Aug 13 09:34:56 2013 +0200 @@ -184,6 +184,146 @@ } /** + * 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 testBitBltEmptyBufferedImageType4ByteABGRIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGR(image, graphics2d, IdentifyTranspormationOp1); + } + + /** + * 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 testBitBltEmptyBufferedImageType4ByteABGRIdentifyTranspormationOp2(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGR(image, graphics2d, IdentifyTranspormationOp2); + } + + /** + * 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 testBitBltEmptyBufferedImageType4ByteABGRIdentifyTranspormationOp3(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGR(image, graphics2d, IdentifyTranspormationOp3); + } + + /** + * 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 testBitBltEmptyBufferedImageType4ByteABGRIdentifyTranspormationOp4(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGR(image, graphics2d, IdentifyTranspormationOp4); + } + + /** + * 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 testBitBltEmptyBufferedImageType4ByteABGRIdentifyTranspormationOp5(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGR(image, graphics2d, IdentifyTranspormationOp5); + } + + /** + * 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 testBitBltEmptyBufferedImageType4ByteABGRIdentifyTranspormationOp6(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGR(image, graphics2d, IdentifyTranspormationOp6); + } + + /** + * 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 testBitBltEmptyBufferedImageType4ByteABGRPreIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGRPre(image, graphics2d, IdentifyTranspormationOp1); + } + + /** + * 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 testBitBltEmptyBufferedImageType4ByteABGRPreIdentifyTranspormationOp2(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGRPre(image, graphics2d, IdentifyTranspormationOp2); + } + + /** + * 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 testBitBltEmptyBufferedImageType4ByteABGRPreIdentifyTranspormationOp3(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGRPre(image, graphics2d, IdentifyTranspormationOp3); + } + + /** + * 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 testBitBltEmptyBufferedImageType4ByteABGRPreIdentifyTranspormationOp4(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGRPre(image, graphics2d, IdentifyTranspormationOp4); + } + + /** * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. * * @param image From ptisnovs at icedtea.classpath.org Tue Aug 13 01:21:58 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 13 Aug 2013 08:21:58 +0000 Subject: /hg/rhino-tests: Added four new tests testGetEnumConstants(), te... Message-ID: changeset d525cd24b29c in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=d525cd24b29c author: Pavel Tisnovsky date: Tue Aug 13 10:25:40 2013 +0200 Added four new tests testGetEnumConstants(), testGetTypeParameters(), testGetSigners() and testDesiredAssertionStatus() into ScriptContextClassTest. diffstat: ChangeLog | 7 ++++ src/org/RhinoTests/ScriptContextClassTest.java | 38 ++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diffs (82 lines): diff -r eabf4dfba019 -r d525cd24b29c ChangeLog --- a/ChangeLog Mon Aug 12 10:55:08 2013 +0200 +++ b/ChangeLog Tue Aug 13 10:25:40 2013 +0200 @@ -1,3 +1,10 @@ +2013-08-13 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptContextClassTest.java: + Added four new tests testGetEnumConstants(), testGetTypeParameters(), + testGetSigners() and testDesiredAssertionStatus() + into ScriptContextClassTest. + 2013-08-12 Pavel Tisnovsky * src/org/RhinoTests/CompiledScriptClassTest.java: diff -r eabf4dfba019 -r d525cd24b29c src/org/RhinoTests/ScriptContextClassTest.java --- a/src/org/RhinoTests/ScriptContextClassTest.java Mon Aug 12 10:55:08 2013 +0200 +++ b/src/org/RhinoTests/ScriptContextClassTest.java Tue Aug 13 10:25:40 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.ScriptContext; import javax.script.SimpleScriptContext; @@ -962,12 +964,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 @@ -1122,6 +1127,39 @@ } /** + * Test for method javax.script.ScriptContext.getClass().getEnumConstants() + */ + protected void testGetEnumConstants() { + Object[] enumConstants = this.scriptContextClass.getEnumConstants(); + assertNull(enumConstants, "getEnumConstants() does not return null"); + } + + /** + * Test for method javax.script.ScriptContext.getClass().getTypeParameters() + */ + protected void testGetTypeParameters() { + TypeVariable[] typeParameters = this.scriptContextClass.getTypeParameters(); + assertNotNull(typeParameters, "getTypeParameters() return null"); + assertEquals(0, typeParameters.length, "array of wrong size returned by getTypeParameters() " + typeParameters.length); + } + + /** + * Test for method javax.script.ScriptContext.getClass().getSigners() + */ + protected void testGetSigners() { + Object[] signers = this.scriptContextClass.getSigners(); + assertNull(signers, "getSigners() does not return null"); + } + + /** + * Test for method javax.script.ScriptContext.getClass().desiredAssertionStatus() + */ + protected void testDesiredAssertionStatus() { + assertFalse(this.scriptContextClass.desiredAssertionStatus(), + "Method ScriptContext.getClass().desiredAssertionStatus() returns wrong value"); + } + + /** * Test for instanceof operator applied to a class javax.script.ScriptContext */ @SuppressWarnings("cast") From bugzilla-daemon at icedtea.classpath.org Tue Aug 13 08:15:58 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 13 Aug 2013 15:15:58 +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 --- Comment #6 from Andrew Azores --- I don't mean to doubt what you're saying but this line: > Caused by: java.security.AccessControlException: access denied > ("java.io.FilePermission" "/chipster.log" "write") certainly looks like it's denying write access to a file in the root of the filesystem. It appears that this is an uncaught runtime exception being printed, not something being logged by log4j. As for the NoSuchMethodError. PropertyConfigurator#configure(InputStream inputStream) is documented by Apache as having been introduced in log4j version 1.2.17. Upon examination of your JAR and the bundled log4j implementation, it appears that your bundled log4j JAR within your application is version 1.2.15 (archive is named log4j-1.2.15.jar). I agree that it is very strange behaviour that you are receiving a NoSuchMethodError in only some cases, however it would appear that the cases where it does work are in fact the incorrect ones, as the bundled library is clearly not being used if you are able to call this method. I'll gladly continue investigating what exactly is happening here that is breaking your application, and if we do uncover a specific bug, I will work on fixing that. But at the moment I'm not entirely sure what is actually happening with this bug report. -- 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/20130813/6c7455a0/attachment.html From aazores at redhat.com Tue Aug 13 10:59:21 2013 From: aazores at redhat.com (Andrew Azores) Date: Tue, 13 Aug 2013 13:59:21 -0400 Subject: [rfc][icedtea-web] TinyHttpdImpl touchup again Message-ID: <520A73F9.2000805@redhat.com> Changelog: * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: no longer sends HTTP 400 BAD REQUEST messages * test/test-extensions-tests/net/sourceforge/jnlp/TinyHttpdImplTest.java: removed "bad request" test The 400 BAD REQUEST response was not necessary since the test server doesn't check for it anyway. Sending it has the potential to cause a connection reset, which would then break the reproducer test server as the files would never be sent. Thanks, -- Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: TinyHttpdImpl_fix.patch Type: text/x-patch Size: 2399 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130813/db71c6bd/TinyHttpdImpl_fix.patch From aazores at icedtea.classpath.org Tue Aug 13 11:03:29 2013 From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org) Date: Tue, 13 Aug 2013 18:03:29 +0000 Subject: /hg/icedtea-web: Removed HTTP 400 BAD REQUEST as it was unneeded... Message-ID: changeset 5d7b3a507709 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=5d7b3a507709 author: Andrew Azores date: Tue Aug 13 13:54:10 2013 -0400 Removed HTTP 400 BAD REQUEST as it was unneeded (test server won't be checking anyway) diffstat: ChangeLog | 6 ++++++ tests/test-extensions-tests/net/sourceforge/jnlp/TinyHttpdImplTest.java | 8 -------- tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java | 2 -- 3 files changed, 6 insertions(+), 10 deletions(-) diffs (57 lines): diff -r e71b4c00d418 -r 5d7b3a507709 ChangeLog --- a/ChangeLog Mon Aug 12 10:00:49 2013 -0400 +++ b/ChangeLog Tue Aug 13 13:54:10 2013 -0400 @@ -1,3 +1,9 @@ +2013-08-13 Andrew Azores + * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: no longer + sends HTTP 400 BAD REQUEST messages + * test/test-extensions-tests/net/sourceforge/jnlp/TinyHttpdImplTest.java: + removed "bad request" test + 2013-08-12 Andrew Azores * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: refactored * tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java: diff -r e71b4c00d418 -r 5d7b3a507709 tests/test-extensions-tests/net/sourceforge/jnlp/TinyHttpdImplTest.java --- a/tests/test-extensions-tests/net/sourceforge/jnlp/TinyHttpdImplTest.java Mon Aug 12 10:00:49 2013 -0400 +++ b/tests/test-extensions-tests/net/sourceforge/jnlp/TinyHttpdImplTest.java Tue Aug 13 13:54:10 2013 -0400 @@ -17,7 +17,6 @@ public class TinyHttpdImplTest { private static final String HTTP_OK = "HTTP/1.0 200 OK"; - private static final String HTTP_400 = "HTTP/1.0 400 Bad Request"; private static final String HTTP_404 = "HTTP/1.0 404 Not Found"; private static final String HTTP_501 = "HTTP/1.0 501 Not Implemented"; private static final String CONTENT_JNLP = "Content-Type: application/x-java-jnlp-file"; @@ -185,13 +184,6 @@ } @Test - public void BadMethodTest() throws Exception { - String head = getTinyHttpdImplResponse("BADMETHOD", "/simpletest1.jnlp"); - - Assert.assertTrue("Status should have been " + HTTP_400, head.trim().equals(HTTP_400)); - } - - @Test public void NotSupportingHeadRequest() throws Exception { boolean headRequestSupport = mServer.isSupportingHeadRequest(); mServer.setSupportingHeadRequest(false); diff -r e71b4c00d418 -r 5d7b3a507709 tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java --- a/tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java Mon Aug 12 10:00:49 2013 -0400 +++ b/tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java Tue Aug 13 13:54:10 2013 -0400 @@ -60,7 +60,6 @@ public class TinyHttpdImpl extends Thread { private static final String CRLF = "\r\n"; - private static final String HTTP_BAD_REQUEST = "HTTP/1.0 " + HttpURLConnection.HTTP_BAD_REQUEST + " Bad Request" + CRLF; private static final String HTTP_NOT_IMPLEMENTED = "HTTP/1.0 " + HttpURLConnection.HTTP_NOT_IMPLEMENTED + " Not Implemented" + CRLF; private static final String HTTP_NOT_FOUND = "HTTP/1.0 " + HttpURLConnection.HTTP_NOT_FOUND + " Not Found" + CRLF; private static final String HTTP_OK = "HTTP/1.0 " + HttpURLConnection.HTTP_OK + " OK" + CRLF; @@ -125,7 +124,6 @@ if (!isHeadRequest && !isGetRequest) { ServerAccess.logOutputReprint("Received unknown request type " + request); - writer.writeBytes(HTTP_BAD_REQUEST); continue; } From adomurad at redhat.com Tue Aug 13 11:26:11 2013 From: adomurad at redhat.com (Adam Domurad) Date: Tue, 13 Aug 2013 14:26:11 -0400 Subject: [rfc][icedtea-web] TinyHttpdImpl touchup again In-Reply-To: <520A73F9.2000805@redhat.com> References: <520A73F9.2000805@redhat.com> Message-ID: <520A7A43.4080609@redhat.com> On 08/13/2013 01:59 PM, Andrew Azores wrote: > Changelog: > * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: no > longer > sends HTTP 400 BAD REQUEST messages > * > test/test-extensions-tests/net/sourceforge/jnlp/TinyHttpdImplTest.java: > removed "bad request" test > > The 400 BAD REQUEST response was not necessary since the test server > doesn't check for it anyway. Sending it has the potential to cause a > connection reset, which would then break the reproducer test server as > the files would never be sent. > > Thanks, > Approved, -Adam From ebaron at redhat.com Tue Aug 13 15:07:27 2013 From: ebaron at redhat.com (Elliott Baron) Date: Tue, 13 Aug 2013 18:07:27 -0400 Subject: [rfc][icedtea7] Handle alternative Kerberos credential cache locations Message-ID: <520AAE1F.5000601@redhat.com> Hi, Kerberos 1.11 introduced a new configuration variable to override the default location of the credential cache at build time. Fedora 18 and up have used this new configuration variable to define an alternate default cache location (/run/user/$UID/krb5cc/tkt). This bug was initially reported against Fedora [1]. On Linux and Solaris systems, FileCredentialsCache.getDefaultCacheName() defaults to the previously hard-coded location (/tmp/krb5cc_$UID). This location will be incorrect if Kerberos was built with an alternative credential cache location set. Since this credential cache location can be arbitrary, we need to query the Kerberos API for the correct location. This patch implements this query using a new JNI call, which adds a dependency on libkrb5 for Linux and Solaris systems. This patch was prepared against icedtea7-forest/jdk, changeset afaedb56b499. 2013-08-12 Elliott Baron * make/sun/security/Makefile: Build krb5/internal/ccache on Linux and Solaris. * src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java: Replace hard-coded cache location with native call to Kerberos API. * make/sun/security/krb5/internal/ccache/Makefile: New file; builds JNI wrapper for needed Kerberos API. * src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c: New file; JNI function to query default cache location from Kerberos API. Thanks, Elliott [1] https://bugzilla.redhat.com/show_bug.cgi?id=991170 -------------- next part -------------- A non-text attachment was scrubbed... Name: jdk-krb5-default-ccache-fix.patch Type: text/x-patch Size: 12437 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130813/8d93dafa/jdk-krb5-default-ccache-fix.patch From weijun.wang at oracle.com Tue Aug 13 17:54:08 2013 From: weijun.wang at oracle.com (Weijun Wang) Date: Wed, 14 Aug 2013 08:54:08 +0800 Subject: [rfc][icedtea7] Handle alternative Kerberos credential cache locations In-Reply-To: <520AAE1F.5000601@redhat.com> References: <520AAE1F.5000601@redhat.com> Message-ID: <520AD530.5070200@oracle.com> Hi Elliott This is a very good feature. Can you contribute it to OpenJDK directly? One thing I don't understand is the _GNU_SOURCE macro defined. Thanks Max On 8/14/13 6:07 AM, Elliott Baron wrote: > Hi, > > Kerberos 1.11 introduced a new configuration variable to override the > default location of the credential cache at build time. Fedora 18 and up > have used this new configuration variable to define an alternate default > cache location (/run/user/$UID/krb5cc/tkt). This bug was initially > reported against Fedora [1]. > > On Linux and Solaris systems, FileCredentialsCache.getDefaultCacheName() > defaults to the previously hard-coded location (/tmp/krb5cc_$UID). This > location will be incorrect if Kerberos was built with an alternative > credential cache location set. Since this credential cache location can > be arbitrary, we need to query the Kerberos API for the correct > location. This patch implements this query using a new JNI call, which > adds a dependency on libkrb5 for Linux and Solaris systems. > > This patch was prepared against icedtea7-forest/jdk, changeset > afaedb56b499. > > 2013-08-12 Elliott Baron > * make/sun/security/Makefile: Build krb5/internal/ccache on Linux > and Solaris. > * > src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java: > Replace > hard-coded cache location with native call to Kerberos API. > * make/sun/security/krb5/internal/ccache/Makefile: New file; builds > JNI wrapper for > needed Kerberos API. > * > src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c: New > file; JNI function > to query default cache location from Kerberos API. > > Thanks, > Elliott > > [1] https://bugzilla.redhat.com/show_bug.cgi?id=991170 > From ptisnovs at icedtea.classpath.org Wed Aug 14 01:27:15 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 14 Aug 2013 08:27:15 +0000 Subject: /hg/gfx-test: Ten new tests added into BitBltBasicTests test suite. Message-ID: changeset 0a71a945bd3a in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=0a71a945bd3a author: Pavel Tisnovsky date: Wed Aug 14 10:30:52 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 ea7869a6a3b2 -r 0a71a945bd3a ChangeLog --- a/ChangeLog Tue Aug 13 09:34:56 2013 +0200 +++ b/ChangeLog Wed Aug 14 10:30:52 2013 +0200 @@ -1,3 +1,8 @@ +2013-08-14 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + Ten new tests added into BitBltBasicTests test suite. + 2013-08-13 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java: diff -r ea7869a6a3b2 -r 0a71a945bd3a src/org/gfxtest/testsuites/BitBltBasicTests.java --- a/src/org/gfxtest/testsuites/BitBltBasicTests.java Tue Aug 13 09:34:56 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Wed Aug 14 10:30:52 2013 +0200 @@ -5216,6 +5216,158 @@ } /** + * Test basic BitBlt operation for vertical yellow 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 testBitBltVerticalYellowGradientBufferedImageType4ByteABGR_PRE(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE); + } + + /** + * Test basic BitBlt operation for vertical yellow 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 testBitBltVerticalYellowGradientBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); + } + + /** + * Test basic BitBlt operation for vertical yellow 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 testBitBltVerticalYellowGradientBufferedImageTypeByteIndexed(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED); + } + + /** + * Test basic BitBlt operation for vertical yellow 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 testBitBltVerticalYellowGradientBufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY); + } + + /** + * Test basic BitBlt operation for vertical yellow 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 testBitBltVerticalYellowGradientBufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_INT_BGR); + } + + /** + * Test basic BitBlt operation for vertical yellow 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 testBitBltVerticalYellowGradientBufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_INT_RGB); + } + + /** + * Test basic BitBlt operation for vertical yellow 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 testBitBltVerticalYellowGradientBufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB); + } + + /** + * Test basic BitBlt operation for vertical yellow 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 testBitBltVerticalYellowGradientBufferedImageTypeIntARGB_Pre(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE); + } + + /** + * Test basic BitBlt operation for vertical yellow 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 testBitBltVerticalYellowGradientBufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB); + } + + /** + * Test basic BitBlt operation for vertical yellow 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 testBitBltVerticalYellowGradientBufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB); + } + + /** * Entry point to the test suite. * * @param args not used in this case From ptisnovs at icedtea.classpath.org Wed Aug 14 01:47:48 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 14 Aug 2013 08:47:48 +0000 Subject: /hg/rhino-tests: Added four new tests testGetEnumConstants(), te... Message-ID: changeset 3f08a736ce66 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=3f08a736ce66 author: Pavel Tisnovsky date: Wed Aug 14 10:51:30 2013 +0200 Added four new tests testGetEnumConstants(), testGetTypeParameters(), testGetSigners() and testDesiredAssertionStatus() into BindingsClassTest. diffstat: ChangeLog | 7 ++++++ src/org/RhinoTests/BindingsClassTest.java | 36 +++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 0 deletions(-) diffs (74 lines): diff -r d525cd24b29c -r 3f08a736ce66 ChangeLog --- a/ChangeLog Tue Aug 13 10:25:40 2013 +0200 +++ b/ChangeLog Wed Aug 14 10:51:30 2013 +0200 @@ -1,3 +1,10 @@ +2013-08-14 Pavel Tisnovsky + + * src/org/RhinoTests/BindingsClassTest.java: + Added four new tests testGetEnumConstants(), testGetTypeParameters(), + testGetSigners() and testDesiredAssertionStatus() + into BindingsClassTest. + 2013-08-13 Pavel Tisnovsky * src/org/RhinoTests/ScriptContextClassTest.java: diff -r d525cd24b29c -r 3f08a736ce66 src/org/RhinoTests/BindingsClassTest.java --- a/src/org/RhinoTests/BindingsClassTest.java Tue Aug 13 10:25:40 2013 +0200 +++ b/src/org/RhinoTests/BindingsClassTest.java Wed Aug 14 10:51: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.Bindings; import javax.script.SimpleBindings; @@ -898,6 +900,7 @@ }; final String[] annotationsThatShouldExists_jdk8 = { + // this should be really empty }; // get all annotations @@ -1052,6 +1055,39 @@ } /** + * Test for method javax.script.Bindings.getClass().getEnumConstants() + */ + protected void testGetEnumConstants() { + Object[] enumConstants = this.bindingsClass.getEnumConstants(); + assertNull(enumConstants, "getEnumConstants() does not return null"); + } + + /** + * Test for method javax.script.Bindings.getClass().getTypeParameters() + */ + protected void testGetTypeParameters() { + TypeVariable[] typeParameters = this.bindingsClass.getTypeParameters(); + assertNotNull(typeParameters, "getTypeParameters() return null"); + assertEquals(0, typeParameters.length, "array of wrong size returned by getTypeParameters() " + typeParameters.length); + } + + /** + * Test for method javax.script.Bindings.getClass().getSigners() + */ + protected void testGetSigners() { + Object[] signers = this.bindingsClass.getSigners(); + assertNull(signers, "getSigners() does not return null"); + } + + /** + * Test for method javax.script.Bindings.getClass().desiredAssertionStatus() + */ + protected void testDesiredAssertionStatus() { + assertFalse(this.bindingsClass.desiredAssertionStatus(), + "Method Bindings.getClass().desiredAssertionStatus() returns wrong value"); + } + + /** * Test for instanceof operator applied to a class javax.script.Bindings */ @SuppressWarnings("cast") From bugzilla-daemon at icedtea.classpath.org Wed Aug 14 04:27:19 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 14 Aug 2013 11:27:19 +0000 Subject: [Bug 1419] More fine grained permissions and capabilities In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1419 Severin Gehwolf changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |sgehwolf at redhat.com Blocks|1414 |1469 Resolution|--- |FIXED --- Comment #1 from Severin Gehwolf --- I think revision 8757e35030f2 implements this. -- 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/20130814/bde226c6/attachment.html From adomurad at redhat.com Wed Aug 14 06:28:14 2013 From: adomurad at redhat.com (Adam Domurad) Date: Wed, 14 Aug 2013 09:28:14 -0400 Subject: [rfc][icedtea-web] jnlp_href extensions inside HTML applets - PR974 In-Reply-To: <51FAB9FE.7080004@redhat.com> References: <51C9F3C1.8070307@redhat.com> <51F7534F.8090006@redhat.com> <51FAB9FE.7080004@redhat.com> Message-ID: <520B85EE.3070003@redhat.com> On 08/01/2013 03:41 PM, Andrew Azores wrote: > On 07/30/2013 01:46 AM, Jiri Vanek wrote: [.. snipped ..] >>> fix.patch >>> >>> >>> diff --git a/netx/net/sourceforge/jnlp/PluginBridge.java >>> b/netx/net/sourceforge/jnlp/PluginBridge.java >>> --- a/netx/net/sourceforge/jnlp/PluginBridge.java >>> +++ b/netx/net/sourceforge/jnlp/PluginBridge.java >>> @@ -26,19 +26,19 @@ import java.io.ByteArrayInputStream; >>> import java.io.File; >>> import java.io.IOException; >>> import java.io.InputStream; >>> +import java.net.MalformedURLException; >>> import java.net.URL; >>> -import java.net.MalformedURLException; >>> +import java.util.ArrayList; >>> +import java.util.Arrays; >>> import java.util.HashSet; >>> +import java.util.List; >>> import java.util.Locale; >>> -import java.util.List; >>> -import java.util.ArrayList; >>> import java.util.Map; >>> import java.util.Set; >>> >>> +import net.sourceforge.jnlp.runtime.JNLPRuntime; >>> import sun.misc.BASE64Decoder; >>> >>> -import net.sourceforge.jnlp.runtime.JNLPRuntime; >>> - >>> /** >>> * Allows reuse of code that expects a JNLPFile object, >>> * while overriding behaviour specific to applets. >>> @@ -47,6 +47,7 @@ public class PluginBridge extends JNLPFi >>> >>> private PluginParameters params; >>> private Set jars = new HashSet(); >>> + private List extensionJars = new >>> ArrayList(); >>> //Folders can be added to the code-base through the archive tag >>> private List codeBaseFolders = new ArrayList(); >>> private String[] cacheJars = new String[0]; >>> @@ -90,6 +91,7 @@ public class PluginBridge extends JNLPFi >>> this.codeBase = codebase; >>> this.sourceLocation = documentBase; >>> this.params = params; >>> + this.parserSettings = new ParserSettings(); >> >> I believe this is wrong. Parser settings are depending on commandline >> (plugin) parameters. >> So you need to crete correct parser. If you check the Main method of >> javaws, you will se it. Maybe extraction of the code from Boot to some >> factory method in ParserSettings is most correct, here, but the >> refactoring can e done as separate changeset (as you wish, but you >> will need this here anyway) > > Okay, this is taken into account now in the new patch set. > >> >> If you have just copy and paste the " this.parserSettings = new >> ParserSettings();" then probably also source was wrong. May you point >> it out? >>> >>> if (params.getJNLPHref() != null) { >>> useJNLPHref = true; >>> @@ -122,6 +124,9 @@ public class PluginBridge extends JNLPFi >>> String fileName = >>> jarDesc.getLocation().toExternalForm(); >>> this.jars.add(fileName); >>> } >>> + >>> + // Store any extensions listed in the JNLP file to >>> be returned later on, namely in getResources() >>> + extensionJars = >>> Arrays.asList(jnlpFile.getResources().getExtensions()); >>> } catch (MalformedURLException e) { >>> // Don't fail because we cannot get the jnlp file. >>> Parameters are optional not required. >>> // it is the site developer who should ensure that >>> file exist. >>> @@ -308,6 +313,8 @@ public class PluginBridge extends JNLPFi >>> return result; >>> } catch (MalformedURLException ex) { /* Ignored */ >>> } >>> + } else if (launchType.equals(ExtensionDesc.class)) { >>> + return (List) extensionJars; // this list is >>> populated when the PluginBridge is first constructed >>> } >>> return sharedResources.getResources(launchType); >>> } >>> >>> >>> reproducer.patch >>> >>> >>> diff --git >>> a/tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpHelper.jnlp >>> b/tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpHelper.jnlp >>> >> >> I do not think this is custom reproducer. See below. >> >>> new file mode 100644 >>> --- /dev/null >>> +++ >>> b/tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpHelper.jnlp >>> >>> @@ -0,0 +1,53 @@ >> >> ..snip (=ok:)) >> >>> diff --git >>> a/tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile >>> b/tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile >>> new file mode 100644 >>> --- /dev/null >>> +++ b/tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile >>> @@ -0,0 +1,34 @@ >>> +TESTNAME=ExtensionJnlpsInApplet >>> + >>> +SRC_FILES=ExtensionJnlpHelper.java ExtensionJnlpTestApplet.java >>> +RESOURCE_FILES=ExtensionJnlpTest.html ExtensionJnlpTestApplet.jnlp >>> ExtensionJnlpHelper.jnlp >>> +ENTRYPOINT_CLASSES=ExtensionJnlpHelper ExtensionJnlpTestApplet >>> + >>> +JAVAC_CLASSPATH=$(TEST_EXTENSIONS_DIR):$(NETX_DIR)/lib/classes.jar >>> +JAVAC=$(BOOT_DIR)/bin/javac >>> +JAR=$(BOOT_DIR)/bin/jar >>> + >>> +TMPDIR:=$(shell mktemp -d) >>> + >>> +prepare-reproducer: >>> + echo PREPARING REPRODUCER $(TESTNAME) >>> + >>> + $(JAVAC) -d $(TMPDIR) -classpath $(JAVAC_CLASSPATH) $(SRC_FILES) >>> + >>> + cd ../resources; \ >>> + cp $(RESOURCE_FILES) $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR); \ >>> + cd -; \ >>> + ls; \ >>> + for CLASS in $(ENTRYPOINT_CLASSES); \ >>> + do \ >>> + cd $(TMPDIR); \ >>> + $(JAR) cfe "$$CLASS.jar" "$$CLASS" "$$CLASS.class"; \ >>> + cd -;\ >>> + mv $(TMPDIR)/"$$CLASS.jar" >>> $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR); \ >>> + done; \ >>> + >>> + echo PREPARED REPRODUCER $(TESTNAME), removing $(TMPDIR) >>> + rm -rf $(TMPDIR) >>> + >> >> As far as I can read this just compile classes and jar them. Then copy >> ajr and resources. This is exactly what engine do for you for free. >> Unless I misread, please move this reproducer to simple ones. > > The simple reproducers get JAR'd up into a single JAR, but this test > specifically requires the srcs to end up in their own separate JARs. Is > there some way to make this happen for a simple reproducer? Not really. You can do this with two 'reproducers' (one without a test), but no need to change what you have. [.. snip ..] >> >> >> Also TBH I'm not fan of CLOSE_ON_BOTH. I woul like to encourage you >> to use only CloseOnOk. AThe reason is that some completely unrelated >> exception can be fired, and it will cause this reproducer to fail. >> >> Although we (Me, Omair and Adam) have long ago decided that it is a >> correct behaviour, the instability of reproducers is proving the >> opposite. Agreed here. [.. snip ..] Comments: First off, the tests look great, no changes needed from me. Fix comments: > diff --git a/netx/net/sourceforge/jnlp/ParserSettings.java b/netx/net/sourceforge/jnlp/ParserSettings.java > --- a/netx/net/sourceforge/jnlp/ParserSettings.java > +++ b/netx/net/sourceforge/jnlp/ParserSettings.java > @@ -37,6 +37,9 @@ exception statement from your version. > > package net.sourceforge.jnlp; > > +import java.util.ArrayList; > +import java.util.List; > + > /** > * Contains settings to be used by the Parser while parsing JNLP files. > * > @@ -44,9 +47,12 @@ package net.sourceforge.jnlp; > */ > public class ParserSettings { > > + private static final String doubleArgs = "-basedir -jnlp -arg -param -property -update"; > + This seems clearer as an array. As well, consider using the all-caps and underscore convention for constants. > private final boolean isStrict; > private final boolean extensionAllowed; > private final boolean malformedXmlAllowed; > + private static String[] cmdArgs; I prefer storing 'global parser settings' here. Setting some global parser settings is more obvious in intent than ParserSettings.setCommandLineArgs(...). > > /** Create a new ParserSettings with the defautl parser settings */ > public ParserSettings() { > @@ -75,4 +81,66 @@ public class ParserSettings { > return isStrict; > } > > -} > \ No newline at end of file > + public static void setCommandLineArgs(String[] args) { > + cmdArgs = args; > + } > + > + public static ParserSettings getCommandLineParserSettings() { Consider making this take a string parameter (combined with the recommended change above). > + if (cmdArgs == null || cmdArgs.length == 0) { > + return new ParserSettings(); > + } > + > + boolean strict = false; > + boolean malformedXmlAllowed = true; > + > + if (null != getOption("-strict")) { > + strict = true; > + } > + > + if (null != getOption("-xml")) { > + malformedXmlAllowed = false; > + } > + > + return new ParserSettings(strict, true, malformedXmlAllowed); > + } > + > + /** > + * Return value of the first occurence of the specified > + * option, or null if the option is not present. If the > + * option is a flag (0-parameter) and is present then the > + * option name is returned. > + */ > + private static String getOption(String option) { > + String result[] = getOptions(option); > + > + if (result.length == 0) > + return null; > + else > + return result[0]; > + } > + > + /** > + * Return all the values of the specified option, or an empty > + * array if the option is not present. If the option is a > + * flag (0-parameter) and is present then the option name is > + * returned once for each occurrence. > + */ > + private static String[] getOptions(String option) { > + List result = new ArrayList(); > + > + for (int i = 0; i < cmdArgs.length; i++) { > + if (option.equals(cmdArgs[i])) { > + if (-1 == doubleArgs.indexOf(option)) > + result.add(option); > + else if (i + 1 < cmdArgs.length) > + result.add(cmdArgs[i + 1]); > + } > + > + if (cmdArgs[i].startsWith("-") && -1 != doubleArgs.indexOf(cmdArgs[i])) > + i++; > + } > + > + return result.toArray(new String[result.size()]); > + } > + > +} > diff --git a/netx/net/sourceforge/jnlp/PluginBridge.java b/netx/net/sourceforge/jnlp/PluginBridge.java > --- a/netx/net/sourceforge/jnlp/PluginBridge.java > +++ b/netx/net/sourceforge/jnlp/PluginBridge.java > @@ -26,19 +26,19 @@ import java.io.ByteArrayInputStream; > import java.io.File; > import java.io.IOException; > import java.io.InputStream; > +import java.net.MalformedURLException; > import java.net.URL; > -import java.net.MalformedURLException; > +import java.util.ArrayList; > +import java.util.Arrays; > import java.util.HashSet; > +import java.util.List; > import java.util.Locale; > -import java.util.List; > -import java.util.ArrayList; > import java.util.Map; > import java.util.Set; > > +import net.sourceforge.jnlp.runtime.JNLPRuntime; > import sun.misc.BASE64Decoder; > > -import net.sourceforge.jnlp.runtime.JNLPRuntime; > - > /** > * Allows reuse of code that expects a JNLPFile object, > * while overriding behaviour specific to applets. > @@ -47,6 +47,7 @@ public class PluginBridge extends JNLPFi > > private PluginParameters params; > private Set jars = new HashSet(); > + private List extensionJars = new ArrayList(); > //Folders can be added to the code-base through the archive tag > private List codeBaseFolders = new ArrayList(); > private String[] cacheJars = new String[0]; > @@ -90,6 +91,7 @@ public class PluginBridge extends JNLPFi > this.codeBase = codebase; > this.sourceLocation = documentBase; > this.params = params; > + this.parserSettings = ParserSettings.getCommandLineParserSettings(); I prefer to have some reference to 'global settings' versus 'command line settings' - eg some 'getGlobalParserSettings' method. I am not really fully convinced this should be anything except 'new ParserSettings()' as you had before. > > if (params.getJNLPHref() != null) { > useJNLPHref = true; > @@ -122,6 +124,9 @@ public class PluginBridge extends JNLPFi > String fileName = jarDesc.getLocation().toExternalForm(); > this.jars.add(fileName); > } > + > + // Store any extensions listed in the JNLP file to be returned later on, namely in getResources() > + extensionJars = Arrays.asList(jnlpFile.getResources().getExtensions()); > } catch (MalformedURLException e) { > // Don't fail because we cannot get the jnlp file. Parameters are optional not required. > // it is the site developer who should ensure that file exist. > @@ -308,6 +313,8 @@ public class PluginBridge extends JNLPFi > return result; > } catch (MalformedURLException ex) { /* Ignored */ > } > + } else if (launchType.equals(ExtensionDesc.class)) { > + return (List) extensionJars; // this list is populated when the PluginBridge is first constructed > } > return sharedResources.getResources(launchType); > } > diff --git a/netx/net/sourceforge/jnlp/runtime/Boot.java b/netx/net/sourceforge/jnlp/runtime/Boot.java > --- a/netx/net/sourceforge/jnlp/runtime/Boot.java > +++ b/netx/net/sourceforge/jnlp/runtime/Boot.java > @@ -214,18 +214,9 @@ public final class Boot implements Privi > extra.put("arguments", getOptions("-arg")); > extra.put("parameters", getOptions("-param")); > extra.put("properties", getOptions("-property")); > - boolean strict = false; > - boolean malformedXmlAllowed = true; > > - if (null != getOption("-strict")) { > - strict = true; > - } > - > - if (null != getOption("-xml")) { > - malformedXmlAllowed = false; > - } > - > - ParserSettings settings = new ParserSettings(strict, true, malformedXmlAllowed); > + ParserSettings.setCommandLineArgs(args); > + ParserSettings settings = ParserSettings.getCommandLineParserSettings(); > > try { > Launcher launcher = new Launcher(false); Looks good, though. Thanks, -Adam From alex.kasko.lists at gmail.com Wed Aug 14 07:33:40 2013 From: alex.kasko.lists at gmail.com (Alex Kasko) Date: Wed, 14 Aug 2013 17:33:40 +0300 Subject: [icedtea7] 2.4.1 patch error on Debian Message-ID: <520B9544.2040901@gmail.com> I'm trying to build icedtea-2.4.1 (http://blog.fuseyism.com/index.php/2013/07/08/security-icedtea-2-4-1-for-openjdk-7-released/) on Debian Wheezy amd64 and got patch error. My build steps: $ uname -a Linux hp 3.2.0-4-amd64 #1 SMP Debian 3.2.46-1 x86_64 GNU/Linux $ sha256sum icedtea-2.4.1.tar.gz 65142e19ee14c28106345b30b6181f5a4926dd20be599c536d778e31a8a5812a icedtea-2.4.1.tar.gz $ cd icedtea-2.4.1/ $ ./configure $ make ... Checking patches/boot/ecj-diamond.patch 1 out of 4 hunks FAILED -- saving rejects to file openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java.rej 1 out of 3 hunks FAILED -- saving rejects to file openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java.rej ERROR patch patches/boot/ecj-diamond.patch FAILED! WARNING make clean-patch before retrying a fix make: *** [stamps/patch-boot.stamp] Error 2 Specified ".rej" files don't exists after this error. I've tried different configure settings and error is always reproducible. 2.4.0 version works fine. I'm not familiar with icedtea patching process - is there anything that I'm missing here? -- Regards, Alex Kasko From gnu_andrew at member.fsf.org Wed Aug 14 07:59:40 2013 From: gnu_andrew at member.fsf.org (=?UTF-8?B?QW5kw6/Drw==?=) Date: Wed, 14 Aug 2013 15:59:40 +0100 Subject: [icedtea7] 2.4.1 patch error on Debian In-Reply-To: <520B9544.2040901@gmail.com> References: <520B9544.2040901@gmail.com> Message-ID: On 14 August 2013 15:33, Alex Kasko wrote: > I'm trying to build icedtea-2.4.1 > (http://blog.fuseyism.com/index.php/2013/07/08/security-icedtea-2-4-1-for-openjdk-7-released/) > on Debian Wheezy amd64 and got patch error. My build steps: > > $ uname -a > Linux hp 3.2.0-4-amd64 #1 SMP Debian 3.2.46-1 x86_64 GNU/Linux > $ sha256sum icedtea-2.4.1.tar.gz > 65142e19ee14c28106345b30b6181f5a4926dd20be599c536d778e31a8a5812a > icedtea-2.4.1.tar.gz > $ cd icedtea-2.4.1/ > $ ./configure > $ make > ... > Checking patches/boot/ecj-diamond.patch > 1 out of 4 hunks FAILED -- saving rejects to file > openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java.rej > 1 out of 3 hunks FAILED -- saving rejects to file > openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java.rej > ERROR patch patches/boot/ecj-diamond.patch FAILED! > WARNING make clean-patch before retrying a fix > make: *** [stamps/patch-boot.stamp] Error 2 > > Specified ".rej" files don't exists after this error. I've tried different > configure settings and error is always reproducible. 2.4.0 version works > fine. > > I'm not familiar with icedtea patching process - is there anything that I'm > missing here? > > > -- > Regards, > Alex Kasko We're aware of the issue - https://bugs.gentoo.org/show_bug.cgi?id=478484 - and a new release will be out soon to fix it. As a workaround, a newer version of ecj that supports diamond will work, as will using an existing install of IcedTea 2.x. This can be specified using --with-jdk-home. On Debian, this can be achieved by: # apt-get install openjdk-7-jdk $ ./configure --with-java-home=/usr/lib/jvm/java-7-openjdk where # commands are performed as the root user (or via sudo) and $ commands are performed as a normal user. Apologies for the inconvenience. -- Andii :-) From xranby at icedtea.classpath.org Wed Aug 14 08:20:18 2013 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Wed, 14 Aug 2013 15:20:18 +0000 Subject: /hg/icedtea: JamVM: JSR 355 Lambda Expressions; JSR 292: enable ... Message-ID: changeset 8b48635893db in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8b48635893db author: Xerxes Ranby date: Wed Aug 14 15:38:27 2013 +0200 JamVM: JSR 355 Lambda Expressions; JSR 292: enable for OpenJDK 7/IcedTea 2; Update to 2013-07-14 revision. 2013-08-14 Xerxes R?nby Robert Lougher JamVM - JSR 292: enable for OpenJDK 7/IcedTea 2 - JSR 335: invokeinterface check in method resolution - JSR 335: java.lang.invoke.MagicLambdaImpl - JSR 292: invokedynamic is 5 bytes - non-direct interp - JSR 292: invokedynamic is 5 bytes in length - Minor formatting change - Minor fixes: use perror for mmap failure - FreeClassData: fix comment - FreeClassData: adjust method count for Miranda methods - JSR 335: remove GC hack - JSR 335: implement "bridge" methods for Mirandas - JSR 335: handle multiple defaults and conflicts * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated JamVM to 2013-07-14 revision. (JAMVM_SHA256SUM): Updated. diffstat: ChangeLog | 21 +++++++++++++++++++++ Makefile.am | 4 ++-- NEWS | 3 ++- 3 files changed, 25 insertions(+), 3 deletions(-) diffs (57 lines): diff -r 2e8f301c5848 -r 8b48635893db ChangeLog --- a/ChangeLog Tue May 07 15:37:42 2013 +0200 +++ b/ChangeLog Wed Aug 14 15:38:27 2013 +0200 @@ -1,3 +1,24 @@ +2013-08-14 Xerxes R??nby + Robert Lougher + + JamVM + - JSR 292: enable for OpenJDK 7/IcedTea 2 + - JSR 335: invokeinterface check in method resolution + - JSR 335: java.lang.invoke.MagicLambdaImpl + - JSR 292: invokedynamic is 5 bytes - non-direct interp + - JSR 292: invokedynamic is 5 bytes in length + - Minor formatting change + - Minor fixes: use perror for mmap failure + - FreeClassData: fix comment + - FreeClassData: adjust method count for Miranda methods + - JSR 335: remove GC hack + - JSR 335: implement "bridge" methods for Mirandas + - JSR 335: handle multiple defaults and conflicts + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2013-07-14 revision. + (JAMVM_SHA256SUM): Updated. + 2013-05-07 Xerxes R??nby JamVM diff -r 2e8f301c5848 -r 8b48635893db Makefile.am --- a/Makefile.am Tue May 07 15:37:42 2013 +0200 +++ b/Makefile.am Wed Aug 14 15:38:27 2013 +0200 @@ -26,8 +26,8 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 -JAMVM_VERSION = 7c8dceb90880616b7dd670f257961a1f5f371ec3 -JAMVM_SHA256SUM = 1584d8599bfd799a71baac0694bb3ed9b9fcd14a8548234b24266571e0acfc97 +JAMVM_VERSION = 1a58072f8339270f9372c273d82a00790e04375d +JAMVM_SHA256SUM = b6dafea4924a2772877597b07a59108ac5f95d6ec85fbb0bb2ea80653cdaaaaf JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz diff -r 2e8f301c5848 -r 8b48635893db NEWS --- a/NEWS Tue May 07 15:37:42 2013 +0200 +++ b/NEWS Wed Aug 14 15:38:27 2013 +0200 @@ -15,9 +15,10 @@ * JamVM - JSR 292: Invoke Dynamic - JSR 308: Type Annotations - - JSR 335: (lambda expressions) initial hack + - JSR 335: Lambda Expressions - JSR 901: VM support for method parameter reflection - JEP 171: Implement fence methods in sun.misc.Unsafe + - FreeClassData: adjust method count for Miranda methods - 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 From xranby at icedtea.classpath.org Wed Aug 14 08:20:57 2013 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Wed, 14 Aug 2013 15:20:57 +0000 Subject: /hg/icedtea7: JamVM: JSR 335: Lambda Expressions; JSR 292: enabl... Message-ID: changeset b5fa79fec364 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=b5fa79fec364 author: Xerxes Ranby date: Wed Aug 14 15:53:36 2013 +0200 JamVM: JSR 335: Lambda Expressions; JSR 292: enable for OpenJDK 7/IcedTea 2; Updated to 2013-07-14 revision. 2013-08-14 Xerxes R?nby Robert Lougher JamVM - JSR 292: enable for OpenJDK 7/IcedTea 2 - JSR 335: invokeinterface check in method resolution - JSR 335: java.lang.invoke.MagicLambdaImpl - JSR 292: invokedynamic is 5 bytes - non-direct interp - JSR 292: invokedynamic is 5 bytes in length - Minor formatting change - Minor fixes: use perror for mmap failure - FreeClassData: fix comment - FreeClassData: adjust method count for Miranda methods - JSR 335: remove GC hack - JSR 335: implement "bridge" methods for Mirandas - JSR 335: handle multiple defaults and conflicts * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated JamVM to 2013-07-14 revision. (JAMVM_SHA256SUM): Updated. diffstat: ChangeLog | 21 +++++++++++++++++++++ Makefile.am | 4 ++-- NEWS | 5 +++++ 3 files changed, 28 insertions(+), 2 deletions(-) diffs (57 lines): diff -r 0a8108854365 -r b5fa79fec364 ChangeLog --- a/ChangeLog Fri Jul 12 19:31:57 2013 +0100 +++ b/ChangeLog Wed Aug 14 15:53:36 2013 +0200 @@ -1,3 +1,24 @@ +2013-08-14 Xerxes R??nby + Robert Lougher + + JamVM + - JSR 292: enable for OpenJDK 7/IcedTea 2 + - JSR 335: invokeinterface check in method resolution + - JSR 335: java.lang.invoke.MagicLambdaImpl + - JSR 292: invokedynamic is 5 bytes - non-direct interp + - JSR 292: invokedynamic is 5 bytes in length + - Minor formatting change + - Minor fixes: use perror for mmap failure + - FreeClassData: fix comment + - FreeClassData: adjust method count for Miranda methods + - JSR 335: remove GC hack + - JSR 335: implement "bridge" methods for Mirandas + - JSR 335: handle multiple defaults and conflicts + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2013-07-14 revision. + (JAMVM_SHA256SUM): Updated. + 2013-07-12 Andrew John Hughes * patches/boot/ecj-diamond.patch: diff -r 0a8108854365 -r b5fa79fec364 Makefile.am --- a/Makefile.am Fri Jul 12 19:31:57 2013 +0100 +++ b/Makefile.am Wed Aug 14 15:53:36 2013 +0200 @@ -24,8 +24,8 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz -JAMVM_VERSION = 7c8dceb90880616b7dd670f257961a1f5f371ec3 -JAMVM_SHA256SUM = 1584d8599bfd799a71baac0694bb3ed9b9fcd14a8548234b24266571e0acfc97 +JAMVM_VERSION = 1a58072f8339270f9372c273d82a00790e04375d +JAMVM_SHA256SUM = b6dafea4924a2772877597b07a59108ac5f95d6ec85fbb0bb2ea80653cdaaaaf JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz diff -r 0a8108854365 -r b5fa79fec364 NEWS --- a/NEWS Fri Jul 12 19:31:57 2013 +0100 +++ b/NEWS Wed Aug 14 15:53:36 2013 +0200 @@ -14,6 +14,11 @@ New in release 2.5.0 (2012-XX-XX): +* JamVM + - JSR 292: Invoke Dynamic + - JSR 335: Lambda Expressions + - FreeClassData: adjust method count for Miranda methods + New in release 2.4.1 (2013-07-05): * Security fixes From xranby at icedtea.classpath.org Wed Aug 14 08:21:45 2013 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Wed, 14 Aug 2013 15:21:45 +0000 Subject: /hg/icedtea6: JamVM: JSR 335: Lambda Expressions; JSR 292: enabl... Message-ID: changeset e565715c45a7 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e565715c45a7 author: Xerxes Ranby date: Wed Aug 14 17:20:44 2013 +0200 JamVM: JSR 335: Lambda Expressions; JSR 292: enable for OpenJDK 7/IcedTea 2; Updated to 2013-07-14 revision. 2013-08-14 Xerxes R?nby Robert Lougher JamVM - JSR 292: enable for OpenJDK 7/IcedTea 2 - JSR 335: invokeinterface check in method resolution - JSR 335: java.lang.invoke.MagicLambdaImpl - JSR 292: invokedynamic is 5 bytes - non-direct interp - JSR 292: invokedynamic is 5 bytes in length - Minor formatting change - Minor fixes: use perror for mmap failure - FreeClassData: fix comment - FreeClassData: adjust method count for Miranda methods - JSR 335: remove GC hack - JSR 335: implement "bridge" methods for Mirandas - JSR 335: handle multiple defaults and conflicts * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated JamVM to 2013-07-14 revision. (JAMVM_SHA256SUM): Updated. diffstat: ChangeLog | 21 +++++++++++++++++++++ Makefile.am | 4 ++-- NEWS | 3 ++- 3 files changed, 25 insertions(+), 3 deletions(-) diffs (56 lines): diff -r ae086ffdfa67 -r e565715c45a7 ChangeLog --- a/ChangeLog Wed Aug 07 13:03:24 2013 +0100 +++ b/ChangeLog Wed Aug 14 17:20:44 2013 +0200 @@ -1,3 +1,24 @@ +2013-08-14 Xerxes R??nby + Robert Lougher + + JamVM + - JSR 292: enable for OpenJDK 7/IcedTea 2 + - JSR 335: invokeinterface check in method resolution + - JSR 335: java.lang.invoke.MagicLambdaImpl + - JSR 292: invokedynamic is 5 bytes - non-direct interp + - JSR 292: invokedynamic is 5 bytes in length + - Minor formatting change + - Minor fixes: use perror for mmap failure + - FreeClassData: fix comment + - FreeClassData: adjust method count for Miranda methods + - JSR 335: remove GC hack + - JSR 335: implement "bridge" methods for Mirandas + - JSR 335: handle multiple defaults and conflicts + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2013-07-14 revision. + (JAMVM_SHA256SUM): Updated. + 2013-08-07 Andrew John Hughes * hotspot.map: Bring in 2.3.12 tag. diff -r ae086ffdfa67 -r e565715c45a7 Makefile.am --- a/Makefile.am Wed Aug 07 13:03:24 2013 +0100 +++ b/Makefile.am Wed Aug 14 17:20:44 2013 +0200 @@ -11,8 +11,8 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz -JAMVM_VERSION = 7c8dceb90880616b7dd670f257961a1f5f371ec3 -JAMVM_SHA256SUM = 1584d8599bfd799a71baac0694bb3ed9b9fcd14a8548234b24266571e0acfc97 +JAMVM_VERSION = 1a58072f8339270f9372c273d82a00790e04375d +JAMVM_SHA256SUM = b6dafea4924a2772877597b07a59108ac5f95d6ec85fbb0bb2ea80653cdaaaaf JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz diff -r ae086ffdfa67 -r e565715c45a7 NEWS --- a/NEWS Wed Aug 07 13:03:24 2013 +0100 +++ b/NEWS Wed Aug 14 17:20:44 2013 +0200 @@ -26,8 +26,9 @@ - PR1318: Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM. - RH902004: very bad performance with E-Porto Add-In f??r OpenOffice Writer installed (hs23 only) * JamVM - - JSR 335: (lambda expressions) initial hack + - JSR 335: Lambda Expressions - JEP 171: Implement fence methods in sun.misc.Unsafe + - FreeClassData: adjust method count for Miranda methods - 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 From bugzilla-daemon at icedtea.classpath.org Wed Aug 14 08:29:30 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 14 Aug 2013 15:29:30 +0000 Subject: [Bug 1516] [IcedTea6] Multiple AWT event queues in 1.12.6 security update broke Java applications (NetBeans, VisualVM, JOSM) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1516 --- Comment #1 from Julien Gouesse --- (In reply to comment #0) > The latest security update (1.12.6) of IcedTea 6 appears to have broken > several Java applications. It seems to work with OpenJDK 1.7 and Icedtea 2.4 according to some Linux users. -- 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/20130814/d645dc5d/attachment.html From ebaron at redhat.com Wed Aug 14 08:31:10 2013 From: ebaron at redhat.com (Elliott Baron) Date: Wed, 14 Aug 2013 11:31:10 -0400 Subject: [rfc][icedtea7] Handle alternative Kerberos credential cache locations In-Reply-To: <2013210286.2398995.1376492057298.JavaMail.root@redhat.com> References: <520AAE1F.5000601@redhat.com> <2013210286.2398995.1376492057298.JavaMail.root@redhat.com> Message-ID: <520BA2BE.6000207@redhat.com> Hi Andrew, On 08/14/2013 10:54 AM, Andrew Hughes wrote: > ----- Original Message ----- >> Hi, >> >> Kerberos 1.11 introduced a new configuration variable to override the >> default location of the credential cache at build time. Fedora 18 and up >> have used this new configuration variable to define an alternate default >> cache location (/run/user/$UID/krb5cc/tkt). This bug was initially >> reported against Fedora [1]. >> >> On Linux and Solaris systems, FileCredentialsCache.getDefaultCacheName() >> defaults to the previously hard-coded location (/tmp/krb5cc_$UID). This >> location will be incorrect if Kerberos was built with an alternative >> credential cache location set. Since this credential cache location can >> be arbitrary, we need to query the Kerberos API for the correct >> location. This patch implements this query using a new JNI call, which >> adds a dependency on libkrb5 for Linux and Solaris systems. >> >> This patch was prepared against icedtea7-forest/jdk, changeset afaedb56b499. >> >> 2013-08-12 Elliott Baron >> * make/sun/security/Makefile: Build krb5/internal/ccache on Linux >> and Solaris. >> * >> src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java: >> Replace >> hard-coded cache location with native call to Kerberos API. >> * make/sun/security/krb5/internal/ccache/Makefile: New file; builds >> JNI wrapper for >> needed Kerberos API. >> * >> src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c: New >> file; JNI function >> to query default cache location from Kerberos API. >> >> Thanks, >> Elliott >> >> [1] https://bugzilla.redhat.com/show_bug.cgi?id=991170 >> >> > I'm building this now and will commit if it builds fine. I noticed that the > copyright header on the new Makefile didn't match that on the new source file, > so I copied over the one from the source file, as I assume you didn't change > to working for Oracle mid-patch ;) Thanks! As far as I know I didn't switch jobs mid-patch ;). The header was actually intentional, since this new Makefile is heavily derived from one of the existing JNI Makefiles. I was a bit unsure how to deal with this header. Thanks, Elliott From gnu.andrew at redhat.com Wed Aug 14 08:37:52 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Wed, 14 Aug 2013 11:37:52 -0400 (EDT) Subject: /hg/icedtea6: JamVM: JSR 335: Lambda Expressions; JSR 292: enabl... In-Reply-To: References: Message-ID: <738274674.2428358.1376494672827.JavaMail.root@redhat.com> ----- Original Message ----- > changeset e565715c45a7 in /hg/icedtea6 > details: > http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e565715c45a7 > author: Xerxes Ranby > date: Wed Aug 14 17:20:44 2013 +0200 > > JamVM: JSR 335: Lambda Expressions; JSR 292: enable for OpenJDK 7/IcedTea 2; > Updated to 2013-07-14 revision. > > 2013-08-14 Xerxes R?nby > Robert Lougher > > JamVM > - JSR 292: enable for OpenJDK 7/IcedTea 2 > - JSR 335: invokeinterface check in method resolution > - JSR 335: java.lang.invoke.MagicLambdaImpl > - JSR 292: invokedynamic is 5 bytes - non-direct interp > - JSR 292: invokedynamic is 5 bytes in length > - Minor formatting change > - Minor fixes: use perror for mmap failure > - FreeClassData: fix comment > - FreeClassData: adjust method count for Miranda methods > - JSR 335: remove GC hack > - JSR 335: implement "bridge" methods for Mirandas > - JSR 335: handle multiple defaults and conflicts > * NEWS: Updated. > * Makefile.am > (JAMVM_VERSION): Updated JamVM to 2013-07-14 revision. > (JAMVM_SHA256SUM): Updated. > > > diffstat: > > ChangeLog | 21 +++++++++++++++++++++ > Makefile.am | 4 ++-- > NEWS | 3 ++- > 3 files changed, 25 insertions(+), 3 deletions(-) > > diffs (56 lines): > > diff -r ae086ffdfa67 -r e565715c45a7 ChangeLog > --- a/ChangeLog Wed Aug 07 13:03:24 2013 +0100 > +++ b/ChangeLog Wed Aug 14 17:20:44 2013 +0200 > @@ -1,3 +1,24 @@ > +2013-08-14 Xerxes R??nby > + Robert Lougher > + > + JamVM > + - JSR 292: enable for OpenJDK 7/IcedTea 2 > + - JSR 335: invokeinterface check in method resolution > + - JSR 335: java.lang.invoke.MagicLambdaImpl > + - JSR 292: invokedynamic is 5 bytes - non-direct interp > + - JSR 292: invokedynamic is 5 bytes in length > + - Minor formatting change > + - Minor fixes: use perror for mmap failure > + - FreeClassData: fix comment > + - FreeClassData: adjust method count for Miranda methods > + - JSR 335: remove GC hack > + - JSR 335: implement "bridge" methods for Mirandas > + - JSR 335: handle multiple defaults and conflicts > + * NEWS: Updated. > + * Makefile.am > + (JAMVM_VERSION): Updated JamVM to 2013-07-14 revision. > + (JAMVM_SHA256SUM): Updated. > + > 2013-08-07 Andrew John Hughes > > * hotspot.map: Bring in 2.3.12 tag. > diff -r ae086ffdfa67 -r e565715c45a7 Makefile.am > --- a/Makefile.am Wed Aug 07 13:03:24 2013 +0100 > +++ b/Makefile.am Wed Aug 14 17:20:44 2013 +0200 > @@ -11,8 +11,8 @@ > CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz > CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz > > -JAMVM_VERSION = 7c8dceb90880616b7dd670f257961a1f5f371ec3 > -JAMVM_SHA256SUM = > 1584d8599bfd799a71baac0694bb3ed9b9fcd14a8548234b24266571e0acfc97 > +JAMVM_VERSION = 1a58072f8339270f9372c273d82a00790e04375d > +JAMVM_SHA256SUM = > b6dafea4924a2772877597b07a59108ac5f95d6ec85fbb0bb2ea80653cdaaaaf > JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm > JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz > JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz > diff -r ae086ffdfa67 -r e565715c45a7 NEWS > --- a/NEWS Wed Aug 07 13:03:24 2013 +0100 > +++ b/NEWS Wed Aug 14 17:20:44 2013 +0200 > @@ -26,8 +26,9 @@ > - PR1318: Fix automatic enabling of the Zero build on non-JIT > architectures which don't use CACAO or JamVM. > - RH902004: very bad performance with E-Porto Add-In f??r OpenOffice > Writer installed (hs23 only) > * JamVM > - - JSR 335: (lambda expressions) initial hack > + - JSR 335: Lambda Expressions > - JEP 171: Implement fence methods in sun.misc.Unsafe > + - FreeClassData: adjust method count for Miranda methods > - 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 > Is there a new release of JamVM imminent? We're nearing a 1.13.0 release and it would be better to use a known release rather than random snapshots. -- 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 ebaron at redhat.com Wed Aug 14 08:41:28 2013 From: ebaron at redhat.com (Elliott Baron) Date: Wed, 14 Aug 2013 11:41:28 -0400 Subject: [rfc][icedtea7] Handle alternative Kerberos credential cache locations In-Reply-To: <520AD530.5070200@oracle.com> References: <520AAE1F.5000601@redhat.com> <520AD530.5070200@oracle.com> Message-ID: <520BA528.7000100@redhat.com> Hi Max, On 08/13/2013 08:54 PM, Weijun Wang wrote: > Hi Elliott > > This is a very good feature. Can you contribute it to OpenJDK directly? Absolutely! I assume security-dev would be the correct list? > > One thing I don't understand is the _GNU_SOURCE macro defined. This is needed in order to use asprintf. If this is problematic, I could replace the asprintf usage with a helper function that manually allocates and concatenates the strings. At the very least, I will add a comment stating that the #define is for asprintf. > > Thanks > Max > > > On 8/14/13 6:07 AM, Elliott Baron wrote: >> Hi, >> >> Kerberos 1.11 introduced a new configuration variable to override the >> default location of the credential cache at build time. Fedora 18 and up >> have used this new configuration variable to define an alternate default >> cache location (/run/user/$UID/krb5cc/tkt). This bug was initially >> reported against Fedora [1]. >> >> On Linux and Solaris systems, FileCredentialsCache.getDefaultCacheName() >> defaults to the previously hard-coded location (/tmp/krb5cc_$UID). This >> location will be incorrect if Kerberos was built with an alternative >> credential cache location set. Since this credential cache location can >> be arbitrary, we need to query the Kerberos API for the correct >> location. This patch implements this query using a new JNI call, which >> adds a dependency on libkrb5 for Linux and Solaris systems. >> >> This patch was prepared against icedtea7-forest/jdk, changeset >> afaedb56b499. >> >> 2013-08-12 Elliott Baron >> * make/sun/security/Makefile: Build krb5/internal/ccache on Linux >> and Solaris. >> * >> src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java: >> >> Replace >> hard-coded cache location with native call to Kerberos API. >> * make/sun/security/krb5/internal/ccache/Makefile: New file; builds >> JNI wrapper for >> needed Kerberos API. >> * >> src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c: New >> file; JNI function >> to query default cache location from Kerberos API. >> >> Thanks, >> Elliott >> >> [1] https://bugzilla.redhat.com/show_bug.cgi?id=991170 >> Thanks, Elliott From xerxes at zafena.se Wed Aug 14 08:50:55 2013 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Wed, 14 Aug 2013 17:50:55 +0200 Subject: FYI: JamVM: JSR 335: Lambda Expressions; JSR 292: enable for OpenJDK 7/IcedTea 2; Updated to 2013-07-14 revision. Message-ID: <520BA75F.4000803@zafena.se> Robert Lougher have made stellar progress to enable stable JSR 335 and JSR 292 in JamVM. I have pushed his JamVM work to IcedTea 1.x, 2.x and 3.x HEAD: http://icedtea.classpath.org/hg/icedtea6/rev/e565715c45a7 http://icedtea.classpath.org/hg/icedtea7/rev/b5fa79fec364 http://icedtea.classpath.org/hg/icedtea/rev/8b48635893db This update brings in two major highlights quoted below: Thank you Robert for all the good work! A back-port to the OpenJDK 7/IcedTea 2.4 release branch will follow. Cheers Xerxes "JSR 292: enable for OpenJDK 7/IcedTea 2 IcedTea 2.4.0 is now based on OpenJDK update 40, which contains the backport of JSR 292 from OpenJDK 8. With a minor tweak (see previous checkins), JamVM's support for JSR 292 with OpenJDK 8 works with IcedTea 2.4.0. As IcedTea is the primary upstream client for JamVM/OpenJDK, this change enables JSR 292 for OpenJDK 7 in addition to OpenJDK 8. Signed-off-by: Robert Lougher " http://git.berlios.de/cgi-bin/cgit.cgi/jamvm/commit/?id=1a58072f8339270f9372c273d82a00790e04375d Proper JSR 335: Lambda Expressions "JSR 335: handle multiple defaults and conflicts With JSR 335, an interface can define default methods which are used if a class which implements the interface does not provide an implementation for that method. While this is straight-forward to understand in the simple case where a class ends up with a single default method, it gets complicated when a class ends up with multiple defaults from different interfaces. A class implements not only its direct interfaces but also the interfaces which its direct interfaces extends (recursively), plus all the interfaces of its superclasses. For a given unimplemented interface method there will potentially be several definitions in the set of implemented interfaces - some will be abstract and some will be defaults. In that set, only the most specific are relevant, i.e. if two interfaces define a default method foo, and B extends A, then B's default takes precedence over A. If we end up with only abstract most-specific methods, or a single most-specific default things are OK. However, if we end up with multiple defaults from unrelated interfaces we have a conflict. JamVM previously handled unimplemented interface methods (which before JSR 335 were all abstract) by creating Miranda methods for them when constructing the interface method table (if they were invoked, they threw an AbstractMethodError). For JSR 335, this was extended to create Miranda methods for unimplemented defaults - if they were invoked they executed the default. This change modifies the code to also handle multiple defaults and conflicting defaults. Previously, as all methods were abstract, multiple definitions didn't matter. Now, we need to ensure the correct default is chosen. This is made more complex as a Miranda may be inherited from a superclass. This Miranda may need to be overridden by an additional Miranda in the subclass. Note, if we have conflicting defaults an AbstractMethodError is thrown. This copies HotSpot. However, the JSR 335 spec states that an IncompatibleClassChangeError is thrown. I prefer to follow HotSpot rather than the spec, but I will keep a lookout in case HotSpot (or the spec) changes in the future... Signed-off-by: Robert Lougher " http://git.berlios.de/cgi-bin/cgit.cgi/jamvm/commit/?id=08e4b93b752f107eec983205c2225cef58b6ea7f From gnu.andrew at redhat.com Wed Aug 14 07:54:17 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Wed, 14 Aug 2013 10:54:17 -0400 (EDT) Subject: [rfc][icedtea7] Handle alternative Kerberos credential cache locations In-Reply-To: <520AAE1F.5000601@redhat.com> References: <520AAE1F.5000601@redhat.com> Message-ID: <2013210286.2398995.1376492057298.JavaMail.root@redhat.com> ----- Original Message ----- > Hi, > > Kerberos 1.11 introduced a new configuration variable to override the > default location of the credential cache at build time. Fedora 18 and up > have used this new configuration variable to define an alternate default > cache location (/run/user/$UID/krb5cc/tkt). This bug was initially > reported against Fedora [1]. > > On Linux and Solaris systems, FileCredentialsCache.getDefaultCacheName() > defaults to the previously hard-coded location (/tmp/krb5cc_$UID). This > location will be incorrect if Kerberos was built with an alternative > credential cache location set. Since this credential cache location can > be arbitrary, we need to query the Kerberos API for the correct > location. This patch implements this query using a new JNI call, which > adds a dependency on libkrb5 for Linux and Solaris systems. > > This patch was prepared against icedtea7-forest/jdk, changeset afaedb56b499. > > 2013-08-12 Elliott Baron > * make/sun/security/Makefile: Build krb5/internal/ccache on Linux > and Solaris. > * > src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java: > Replace > hard-coded cache location with native call to Kerberos API. > * make/sun/security/krb5/internal/ccache/Makefile: New file; builds > JNI wrapper for > needed Kerberos API. > * > src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c: New > file; JNI function > to query default cache location from Kerberos API. > > Thanks, > Elliott > > [1] https://bugzilla.redhat.com/show_bug.cgi?id=991170 > > I'm building this now and will commit if it builds fine. I noticed that the copyright header on the new Makefile didn't match that on the new source file, so I copied over the one from the source file, as I assume you didn't change to working for Oracle mid-patch ;) -- 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 xerxes at zafena.se Wed Aug 14 08:56:40 2013 From: xerxes at zafena.se (=?UTF-8?B?WGVyeGVzIFLDpW5ieQ==?=) Date: Wed, 14 Aug 2013 17:56:40 +0200 Subject: /hg/icedtea6: Is there a new release of JamVM imminent? In-Reply-To: <738274674.2428358.1376494672827.JavaMail.root@redhat.com> References: <738274674.2428358.1376494672827.JavaMail.root@redhat.com> Message-ID: <520BA8B8.3050206@zafena.se> 2013-08-14 17:37, Andrew Hughes skrev: >> >> JamVM: JSR 335: Lambda Expressions; JSR 292: enable for OpenJDK 7/IcedTea 2; >> Updated to 2013-07-14 revision. >> >> 2013-08-14 Xerxes R?nby >> Robert Lougher >> > > Is there a new release of JamVM imminent? We're nearing a 1.13.0 release > and it would be better to use a known release rather than random snapshots. > I will forward the JamVM release question to the jamvm-general mailinglist; "IcedTea is the primary upstream client for JamVM/OpenJDK" - Robert Lougher http://git.berlios.de/cgi-bin/cgit.cgi/jamvm/commit/?id=1a58072f8339270f9372c273d82a00790e04375d Cheers Xerxes From aph at redhat.com Wed Aug 14 08:57:23 2013 From: aph at redhat.com (Andrew Haley) Date: Wed, 14 Aug 2013 16:57:23 +0100 Subject: [rfc][icedtea7] Handle alternative Kerberos credential cache locations In-Reply-To: <520AAE1F.5000601@redhat.com> References: <520AAE1F.5000601@redhat.com> Message-ID: <520BA8E3.1040404@redhat.com> On 08/13/2013 11:07 PM, Elliott Baron wrote: > Kerberos 1.11 introduced a new configuration variable to override the > default location of the credential cache at build time. Fedora 18 and up > have used this new configuration variable to define an alternate default > cache location (/run/user/$UID/krb5cc/tkt). This bug was initially > reported against Fedora [1]. > > On Linux and Solaris systems, FileCredentialsCache.getDefaultCacheName() > defaults to the previously hard-coded location (/tmp/krb5cc_$UID). This > location will be incorrect if Kerberos was built with an alternative > credential cache location set. Since this credential cache location can > be arbitrary, we need to query the Kerberos API for the correct > location. This patch implements this query using a new JNI call, which > adds a dependency on libkrb5 for Linux and Solaris systems. > > This patch was prepared against icedtea7-forest/jdk, changeset afaedb56b499. Is this really an IcedTea-specific bug? Andrew. From ebaron at redhat.com Wed Aug 14 09:11:29 2013 From: ebaron at redhat.com (Elliott Baron) Date: Wed, 14 Aug 2013 12:11:29 -0400 Subject: [rfc][icedtea7] Handle alternative Kerberos credential cache locations In-Reply-To: <520BA8E3.1040404@redhat.com> References: <520AAE1F.5000601@redhat.com> <520BA8E3.1040404@redhat.com> Message-ID: <520BAC31.8080001@redhat.com> Hi Andrew, On 08/14/2013 11:57 AM, Andrew Haley wrote: > On 08/13/2013 11:07 PM, Elliott Baron wrote: >> Kerberos 1.11 introduced a new configuration variable to override the >> default location of the credential cache at build time. Fedora 18 and up >> have used this new configuration variable to define an alternate default >> cache location (/run/user/$UID/krb5cc/tkt). This bug was initially >> reported against Fedora [1]. >> >> On Linux and Solaris systems, FileCredentialsCache.getDefaultCacheName() >> defaults to the previously hard-coded location (/tmp/krb5cc_$UID). This >> location will be incorrect if Kerberos was built with an alternative >> credential cache location set. Since this credential cache location can >> be arbitrary, we need to query the Kerberos API for the correct >> location. This patch implements this query using a new JNI call, which >> adds a dependency on libkrb5 for Linux and Solaris systems. >> >> This patch was prepared against icedtea7-forest/jdk, changeset afaedb56b499. > Is this really an IcedTea-specific bug? > > Andrew. > It's not specific to IcedTea. I will also post the patch to the OpenJDK security-dev list. Thanks, Elliott From gnu.andrew at redhat.com Wed Aug 14 08:55:47 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Wed, 14 Aug 2013 11:55:47 -0400 (EDT) Subject: FYI: JamVM: JSR 335: Lambda Expressions; JSR 292: enable for OpenJDK 7/IcedTea 2; Updated to 2013-07-14 revision. In-Reply-To: <520BA75F.4000803@zafena.se> References: <520BA75F.4000803@zafena.se> Message-ID: <1648490416.2440553.1376495747089.JavaMail.root@redhat.com> ----- Original Message ----- > Robert Lougher have made stellar progress to enable stable JSR 335 and JSR > 292 in JamVM. > > I have pushed his JamVM work to IcedTea 1.x, 2.x and 3.x HEAD: > http://icedtea.classpath.org/hg/icedtea6/rev/e565715c45a7 > http://icedtea.classpath.org/hg/icedtea7/rev/b5fa79fec364 > http://icedtea.classpath.org/hg/icedtea/rev/8b48635893db > > This update brings in two major highlights quoted below: > Thank you Robert for all the good work! > A back-port to the OpenJDK 7/IcedTea 2.4 release branch will follow. > No. This is not acceptable for a release branch. > Cheers > Xerxes > > > > "JSR 292: enable for OpenJDK 7/IcedTea 2 > IcedTea 2.4.0 is now based on OpenJDK update 40, which > contains the backport of JSR 292 from OpenJDK 8. > > With a minor tweak (see previous checkins), JamVM's support > for JSR 292 with OpenJDK 8 works with IcedTea 2.4.0. As IcedTea > is the primary upstream client for JamVM/OpenJDK, this change > enables JSR 292 for OpenJDK 7 in addition to OpenJDK 8. > > Signed-off-by: Robert Lougher " > http://git.berlios.de/cgi-bin/cgit.cgi/jamvm/commit/?id=1a58072f8339270f9372c273d82a00790e04375d > > > > Proper JSR 335: Lambda Expressions > "JSR 335: handle multiple defaults and conflicts > > With JSR 335, an interface can define default methods which > are used if a class which implements the interface does not > provide an implementation for that method. > > While this is straight-forward to understand in the simple > case where a class ends up with a single default method, it > gets complicated when a class ends up with multiple defaults > from different interfaces. > > A class implements not only its direct interfaces but also > the interfaces which its direct interfaces extends (recursively), > plus all the interfaces of its superclasses. > > For a given unimplemented interface method there will potentially > be several definitions in the set of implemented interfaces - > some will be abstract and some will be defaults. > > In that set, only the most specific are relevant, i.e. if > two interfaces define a default method foo, and B extends A, > then B's default takes precedence over A. If we end up with > only abstract most-specific methods, or a single most-specific > default things are OK. However, if we end up with multiple > defaults from unrelated interfaces we have a conflict. > > JamVM previously handled unimplemented interface methods > (which before JSR 335 were all abstract) by creating Miranda > methods for them when constructing the interface method table > (if they were invoked, they threw an AbstractMethodError). > > For JSR 335, this was extended to create Miranda methods for > unimplemented defaults - if they were invoked they executed > the default. This change modifies the code to also handle > multiple defaults and conflicting defaults. Previously, as > all methods were abstract, multiple definitions didn't matter. > Now, we need to ensure the correct default is chosen. This > is made more complex as a Miranda may be inherited from a > superclass. This Miranda may need to be overridden by an > additional Miranda in the subclass. > > Note, if we have conflicting defaults an AbstractMethodError > is thrown. This copies HotSpot. However, the JSR 335 spec > states that an IncompatibleClassChangeError is thrown. I prefer > to follow HotSpot rather than the spec, but I will keep a lookout > in case HotSpot (or the spec) changes in the future... > > Signed-off-by: Robert Lougher " > http://git.berlios.de/cgi-bin/cgit.cgi/jamvm/commit/?id=08e4b93b752f107eec983205c2225cef58b6ea7f > -- 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 andrew at icedtea.classpath.org Wed Aug 14 09:15:09 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 14 Aug 2013 16:15:09 +0000 Subject: /hg/release/icedtea7-forest-2.3/jdk: 8021946: Disabling sun.refl... Message-ID: changeset a1ec65ac926d in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=a1ec65ac926d author: alanb date: Thu Aug 01 17:25:29 2013 +0100 8021946: Disabling sun.reflect.Reflection.getCallerCaller(int) by default breaks several frameworks and libraries Reviewed-by: chegar, dholmes, dfuchs diffstat: src/share/classes/sun/misc/VM.java | 20 +++++----- src/share/classes/sun/reflect/Reflection.java | 12 ++---- test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java | 1 + test/sun/reflect/GetCallerClass.java | 8 ++-- 4 files changed, 19 insertions(+), 22 deletions(-) diffs (107 lines): diff -r 6f1a1e26f521 -r a1ec65ac926d src/share/classes/sun/misc/VM.java --- a/src/share/classes/sun/misc/VM.java Thu Aug 08 01:48:56 2013 +0100 +++ b/src/share/classes/sun/misc/VM.java Thu Aug 01 17:25:29 2013 +0100 @@ -216,12 +216,13 @@ return allowArraySyntax; } - private static boolean allowGetCallerClass = false; + private static boolean allowGetCallerClass = true; - // Reflection.getCallerClass(int) is disabled by default. - // It can be enabled by setting the system property - // "jdk.reflect.allowGetCallerClass" and also used by - // logging stack walk of a resource bundle if it is turned on. + // Reflection.getCallerClass(int) is enabled by default. + // It can be disabled by setting the system property + // "jdk.reflect.allowGetCallerClass" to "false". It cannot be + // disabled if the logging stack walk (to find resource bundles) + // is enabled. public static boolean allowGetCallerClass() { return allowGetCallerClass; } @@ -290,14 +291,13 @@ ? defaultAllowArraySyntax : Boolean.parseBoolean(s)); - // Reflection.getCallerClass(int) is disabled by default. - // It can be enabled by setting the system property - // "jdk.reflect.allowGetCallerClass" and also used by - // logging stack walk of a resource bundle if it is turned on. + // Reflection.getCallerClass(int) is enabled by default. + // It can be disabled by setting a system property (but only if + // the logging stack walk is not enabled) s = props.getProperty("jdk.reflect.allowGetCallerClass"); allowGetCallerClass = (s != null ? (s.isEmpty() || Boolean.parseBoolean(s)) - : false) || + : true) || Boolean.valueOf(props.getProperty("jdk.logging.allowStackWalkSearch")); // Remove other private system properties diff -r 6f1a1e26f521 -r a1ec65ac926d src/share/classes/sun/reflect/Reflection.java --- a/src/share/classes/sun/reflect/Reflection.java Thu Aug 08 01:48:56 2013 +0100 +++ b/src/share/classes/sun/reflect/Reflection.java Thu Aug 01 17:25:29 2013 +0100 @@ -59,8 +59,8 @@ public static native Class getCallerClass(); /** - * @deprecated No replacement. This method will be removed in the next - * JDK 7 update release. + * @deprecated No replacement. This method will be removed in a future + * release. */ @Deprecated @CallerSensitive @@ -68,12 +68,8 @@ if (sun.misc.VM.allowGetCallerClass()) { return getCallerClass0(depth+1); } - throw new UnsupportedOperationException("This method is in the sun.* " + - "namespace so it is not a supported, public interface. " + - "The 7u40 release notes describe a temporary mechanism " + - "to reenable the historical functionality of this method. " + - "Update code to function properly and this method will be " + - "removed without further warning in a subsequent 7 update release."); + throw new UnsupportedOperationException("This method has been disabled by a " + + "system property"); } // If the VM enforces getting caller class with @CallerSensitive, diff -r 6f1a1e26f521 -r a1ec65ac926d test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java --- a/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java Thu Aug 08 01:48:56 2013 +0100 +++ b/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java Thu Aug 01 17:25:29 2013 +0100 @@ -29,6 +29,7 @@ * @build ResourceBundleSearchTest IndirectlyLoadABundle LoadItUp1 LoadItUp2 TwiceIndirectlyLoadABundle LoadItUp2Invoker * @run main/othervm ResourceBundleSearchTest * @run main/othervm -Djdk.logging.allowStackWalkSearch=true ResourceBundleSearchTest + * @run main/othervm -Djdk.reflect.allowGetCallerClass=false -Djdk.logging.allowStackWalkSearch=true ResourceBundleSearchTest */ import java.net.URL; import java.net.URLClassLoader; diff -r 6f1a1e26f521 -r a1ec65ac926d test/sun/reflect/GetCallerClass.java --- a/test/sun/reflect/GetCallerClass.java Thu Aug 08 01:48:56 2013 +0100 +++ b/test/sun/reflect/GetCallerClass.java Thu Aug 01 17:25:29 2013 +0100 @@ -23,7 +23,7 @@ /* * @test - * @bug 8016814 8014925 + * @bug 8016814 8014925 8021946 * @summary Test sun.reflect.Reflection.getCallerClass(int) disabled by default * @compile -XDignore.symbol.file GetCallerClass.java * @run main/othervm GetCallerClass @@ -36,10 +36,10 @@ public static void main(String[] args) throws Exception { String s = System.getProperty("jdk.reflect.allowGetCallerClass"); boolean allowed; - if (s == null || s.equals("false")) { + if (s == null || s.equals("") || s.equals("true")) { + allowed = true; + } else if (s.equals("false")) { allowed = false; - } else if (s.equals("") || s.equals("true")) { - allowed = true; } else { throw new RuntimeException("Unsupported test setting"); } From gnu.andrew at redhat.com Wed Aug 14 09:45:38 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Wed, 14 Aug 2013 12:45:38 -0400 (EDT) Subject: FYI: JamVM: JSR 335: Lambda Expressions; JSR 292: enable for OpenJDK 7/IcedTea 2; Updated to 2013-07-14 revision. In-Reply-To: <1648490416.2440553.1376495747089.JavaMail.root@redhat.com> References: <520BA75F.4000803@zafena.se> <1648490416.2440553.1376495747089.JavaMail.root@redhat.com> Message-ID: <487230737.2456840.1376498738418.JavaMail.root@redhat.com> ----- Original Message ----- > > > ----- Original Message ----- > > Robert Lougher have made stellar progress to enable stable JSR 335 and JSR > > 292 in JamVM. > > > > I have pushed his JamVM work to IcedTea 1.x, 2.x and 3.x HEAD: > > http://icedtea.classpath.org/hg/icedtea6/rev/e565715c45a7 > > http://icedtea.classpath.org/hg/icedtea7/rev/b5fa79fec364 > > http://icedtea.classpath.org/hg/icedtea/rev/8b48635893db > > > > This update brings in two major highlights quoted below: > > Thank you Robert for all the good work! > > A back-port to the OpenJDK 7/IcedTea 2.4 release branch will follow. > > > > No. This is not acceptable for a release branch. > On further consideration, with 2.4.0 still tracking u40, we could update JamVM at this stage in the same manner. What exactly are the changes needed here? > > Cheers > > Xerxes > > > > > > > > "JSR 292: enable for OpenJDK 7/IcedTea 2 > > IcedTea 2.4.0 is now based on OpenJDK update 40, which > > contains the backport of JSR 292 from OpenJDK 8. > > > > With a minor tweak (see previous checkins), JamVM's support > > for JSR 292 with OpenJDK 8 works with IcedTea 2.4.0. As IcedTea > > is the primary upstream client for JamVM/OpenJDK, this change > > enables JSR 292 for OpenJDK 7 in addition to OpenJDK 8. > > > > Signed-off-by: Robert Lougher " > > http://git.berlios.de/cgi-bin/cgit.cgi/jamvm/commit/?id=1a58072f8339270f9372c273d82a00790e04375d > > > > > > > > Proper JSR 335: Lambda Expressions > > "JSR 335: handle multiple defaults and conflicts > > > > With JSR 335, an interface can define default methods which > > are used if a class which implements the interface does not > > provide an implementation for that method. > > > > While this is straight-forward to understand in the simple > > case where a class ends up with a single default method, it > > gets complicated when a class ends up with multiple defaults > > from different interfaces. > > > > A class implements not only its direct interfaces but also > > the interfaces which its direct interfaces extends (recursively), > > plus all the interfaces of its superclasses. > > > > For a given unimplemented interface method there will potentially > > be several definitions in the set of implemented interfaces - > > some will be abstract and some will be defaults. > > > > In that set, only the most specific are relevant, i.e. if > > two interfaces define a default method foo, and B extends A, > > then B's default takes precedence over A. If we end up with > > only abstract most-specific methods, or a single most-specific > > default things are OK. However, if we end up with multiple > > defaults from unrelated interfaces we have a conflict. > > > > JamVM previously handled unimplemented interface methods > > (which before JSR 335 were all abstract) by creating Miranda > > methods for them when constructing the interface method table > > (if they were invoked, they threw an AbstractMethodError). > > > > For JSR 335, this was extended to create Miranda methods for > > unimplemented defaults - if they were invoked they executed > > the default. This change modifies the code to also handle > > multiple defaults and conflicting defaults. Previously, as > > all methods were abstract, multiple definitions didn't matter. > > Now, we need to ensure the correct default is chosen. This > > is made more complex as a Miranda may be inherited from a > > superclass. This Miranda may need to be overridden by an > > additional Miranda in the subclass. > > > > Note, if we have conflicting defaults an AbstractMethodError > > is thrown. This copies HotSpot. However, the JSR 335 spec > > states that an IncompatibleClassChangeError is thrown. I prefer > > to follow HotSpot rather than the spec, but I will keep a lookout > > in case HotSpot (or the spec) changes in the future... > > > > Signed-off-by: Robert Lougher " > > http://git.berlios.de/cgi-bin/cgit.cgi/jamvm/commit/?id=08e4b93b752f107eec983205c2225cef58b6ea7f > > > > -- > 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 gnu.andrew at redhat.com Wed Aug 14 09:48:31 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Wed, 14 Aug 2013 12:48:31 -0400 (EDT) Subject: [rfc][icedtea7] Handle alternative Kerberos credential cache locations In-Reply-To: <520BA2BE.6000207@redhat.com> References: <520AAE1F.5000601@redhat.com> <2013210286.2398995.1376492057298.JavaMail.root@redhat.com> <520BA2BE.6000207@redhat.com> Message-ID: <1635851124.2457604.1376498911471.JavaMail.root@redhat.com> ----- Original Message ----- > Hi Andrew, > > On 08/14/2013 10:54 AM, Andrew Hughes wrote: > > ----- Original Message ----- > >> Hi, > >> > >> Kerberos 1.11 introduced a new configuration variable to override the > >> default location of the credential cache at build time. Fedora 18 and up > >> have used this new configuration variable to define an alternate default > >> cache location (/run/user/$UID/krb5cc/tkt). This bug was initially > >> reported against Fedora [1]. > >> > >> On Linux and Solaris systems, FileCredentialsCache.getDefaultCacheName() > >> defaults to the previously hard-coded location (/tmp/krb5cc_$UID). This > >> location will be incorrect if Kerberos was built with an alternative > >> credential cache location set. Since this credential cache location can > >> be arbitrary, we need to query the Kerberos API for the correct > >> location. This patch implements this query using a new JNI call, which > >> adds a dependency on libkrb5 for Linux and Solaris systems. > >> > >> This patch was prepared against icedtea7-forest/jdk, changeset > >> afaedb56b499. > >> > >> 2013-08-12 Elliott Baron > >> * make/sun/security/Makefile: Build krb5/internal/ccache on Linux > >> and Solaris. > >> * > >> src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java: > >> Replace > >> hard-coded cache location with native call to Kerberos API. > >> * make/sun/security/krb5/internal/ccache/Makefile: New file; builds > >> JNI wrapper for > >> needed Kerberos API. > >> * > >> src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c: New > >> file; JNI function > >> to query default cache location from Kerberos API. > >> > >> Thanks, > >> Elliott > >> > >> [1] https://bugzilla.redhat.com/show_bug.cgi?id=991170 > >> > >> > > I'm building this now and will commit if it builds fine. I noticed that > > the > > copyright header on the new Makefile didn't match that on the new source > > file, > > so I copied over the one from the source file, as I assume you didn't > > change > > to working for Oracle mid-patch ;) > > Thanks! As far as I know I didn't switch jobs mid-patch ;). The header > was actually intentional, since this new Makefile is heavily derived > from one of the existing JNI Makefiles. I was a bit unsure how to deal > with this header. > I revised them slightly in the committed version: http://icedtea.classpath.org/hg/icedtea7-forest/jdk/rev/3e4e1a4ef584 Did you actually test on Solaris? If not, you probably shouldn't enable it there. I have a feeling the _GNU_SOURCE won't work there. > Thanks, > Elliott > -- 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 Wed Aug 14 09:56:32 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Wed, 14 Aug 2013 12:56:32 -0400 (EDT) Subject: [rfc][icedtea7] Handle alternative Kerberos credential cache locations In-Reply-To: <1635851124.2457604.1376498911471.JavaMail.root@redhat.com> References: <520AAE1F.5000601@redhat.com> <2013210286.2398995.1376492057298.JavaMail.root@redhat.com> <520BA2BE.6000207@redhat.com> <1635851124.2457604.1376498911471.JavaMail.root@redhat.com> Message-ID: <1969927697.2461115.1376499392361.JavaMail.root@redhat.com> ----- Original Message ----- > > > ----- Original Message ----- > > Hi Andrew, > > > > On 08/14/2013 10:54 AM, Andrew Hughes wrote: > > > ----- Original Message ----- > > >> Hi, > > >> > > >> Kerberos 1.11 introduced a new configuration variable to override the > > >> default location of the credential cache at build time. Fedora 18 and up > > >> have used this new configuration variable to define an alternate default > > >> cache location (/run/user/$UID/krb5cc/tkt). This bug was initially > > >> reported against Fedora [1]. > > >> > > >> On Linux and Solaris systems, FileCredentialsCache.getDefaultCacheName() > > >> defaults to the previously hard-coded location (/tmp/krb5cc_$UID). This > > >> location will be incorrect if Kerberos was built with an alternative > > >> credential cache location set. Since this credential cache location can > > >> be arbitrary, we need to query the Kerberos API for the correct > > >> location. This patch implements this query using a new JNI call, which > > >> adds a dependency on libkrb5 for Linux and Solaris systems. > > >> > > >> This patch was prepared against icedtea7-forest/jdk, changeset > > >> afaedb56b499. > > >> > > >> 2013-08-12 Elliott Baron > > >> * make/sun/security/Makefile: Build krb5/internal/ccache on Linux > > >> and Solaris. > > >> * > > >> src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java: > > >> Replace > > >> hard-coded cache location with native call to Kerberos API. > > >> * make/sun/security/krb5/internal/ccache/Makefile: New file; > > >> builds > > >> JNI wrapper for > > >> needed Kerberos API. > > >> * > > >> src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c: New > > >> file; JNI function > > >> to query default cache location from Kerberos API. > > >> > > >> Thanks, > > >> Elliott > > >> > > >> [1] https://bugzilla.redhat.com/show_bug.cgi?id=991170 > > >> > > >> > > > I'm building this now and will commit if it builds fine. I noticed that > > > the > > > copyright header on the new Makefile didn't match that on the new source > > > file, > > > so I copied over the one from the source file, as I assume you didn't > > > change > > > to working for Oracle mid-patch ;) > > > > Thanks! As far as I know I didn't switch jobs mid-patch ;). The header > > was actually intentional, since this new Makefile is heavily derived > > from one of the existing JNI Makefiles. I was a bit unsure how to deal > > with this header. > > > > I revised them slightly in the committed version: > > http://icedtea.classpath.org/hg/icedtea7-forest/jdk/rev/3e4e1a4ef584 > > Did you actually test on Solaris? If not, you probably shouldn't enable > it there. I have a feeling the _GNU_SOURCE won't work there. > >From my build log, it seems you may not need it... /usr/bin/gcc -O2 -fno-strict-aliasing -fPIC -W -Wall -Wno-unused -Wno-parentheses -pipe -fno-omit-frame-pointer -D_LITTLE_E\ NDIAN -g -DNDEBUG -DARCH='"amd64"' -Damd64 -DLINUX -DRELEASE='"1.7.0-internal"' -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTR\ ANT -D_LP64=1 -I. -I/home/andrew/builder/icedtea-2.5/tmp/sun/sun.security.krb5.internal.ccache/CClassHeaders -I../../../../../.\ ./src/solaris/javavm/export -I../../../../../../src/share/javavm/export -I../../../../../../src/share/native/common -I../../../\ ../../../src/solaris/native/common -I../../../../../../src/share/native/sun/security/krb5/internal/ccache -I../../../../../../s\ rc/solaris/native/sun/security/krb5/internal/ccache -c -o /home/andrew/builder/icedtea-2.5/tmp/sun/sun.security.krb5.interna\ l.ccache/obj64/krb5ccache.o ../../../../../../src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c ../../../../../../src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c:26:0: warning: "_GNU_SOURCE" redefined [ena\ bled by default] #define _GNU_SOURCE ^ :0:0: note: this is the location of the previous definition ../../../../../../src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c: In function 'Java_sun_security_krb5_intern\ al_ccache_FileCredentialsCache_nativeGetDefaultCacheName': ../../../../../../src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c:43:22: warning: unused parameter 'krbcredsC\ lass' [-Wunused-parameter] (JNIEnv *env, jclass krbcredsClass) -- 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 rob.lougher at gmail.com Wed Aug 14 10:28:01 2013 From: rob.lougher at gmail.com (Robert Lougher) Date: Wed, 14 Aug 2013 18:28:01 +0100 Subject: FYI: JamVM: JSR 335: Lambda Expressions; JSR 292: enable for OpenJDK 7/IcedTea 2; Updated to 2013-07-14 revision. In-Reply-To: <487230737.2456840.1376498738418.JavaMail.root@redhat.com> References: <520BA75F.4000803@zafena.se> <1648490416.2440553.1376495747089.JavaMail.root@redhat.com> <487230737.2456840.1376498738418.JavaMail.root@redhat.com> Message-ID: On 14 August 2013 17:45, Andrew Hughes wrote: > > > ----- Original Message ----- >> >> >> ----- Original Message ----- >> > Robert Lougher have made stellar progress to enable stable JSR 335 and JSR >> > 292 in JamVM. >> > >> > I have pushed his JamVM work to IcedTea 1.x, 2.x and 3.x HEAD: >> > http://icedtea.classpath.org/hg/icedtea6/rev/e565715c45a7 >> > http://icedtea.classpath.org/hg/icedtea7/rev/b5fa79fec364 >> > http://icedtea.classpath.org/hg/icedtea/rev/8b48635893db >> > >> > This update brings in two major highlights quoted below: >> > Thank you Robert for all the good work! >> > A back-port to the OpenJDK 7/IcedTea 2.4 release branch will follow. >> > >> >> No. This is not acceptable for a release branch. >> > > On further consideration, with 2.4.0 still tracking u40, we could update > JamVM at this stage in the same manner. What exactly are the changes needed > here? > The head of JamVM is tracking OpenJDK 8. This requires support for Lambda expressions and the new JSR 292 implementation based on LambdaForms. The JSR 292 stuff has been backported to OpenJDK 7 but without various bits for Lambda expressions (as OpenJDK 7 doesn't have them). The big change here is a configure change that enables JSR 292 when the class-library is openjdk7 (it used to be enabled only when it was openjdk8). The bits of the implementation that are in fact related to Lambda expressions have been guarded by JSR335, and are only built when the class-library is openjdk8. Some other changes for JSR335 which are not backwards compatible with OpenJDK 7 have also been guarded. Rob. >> > Cheers >> > Xerxes >> > >> > >> > >> > "JSR 292: enable for OpenJDK 7/IcedTea 2 >> > IcedTea 2.4.0 is now based on OpenJDK update 40, which >> > contains the backport of JSR 292 from OpenJDK 8. >> > >> > With a minor tweak (see previous checkins), JamVM's support >> > for JSR 292 with OpenJDK 8 works with IcedTea 2.4.0. As IcedTea >> > is the primary upstream client for JamVM/OpenJDK, this change >> > enables JSR 292 for OpenJDK 7 in addition to OpenJDK 8. >> > >> > Signed-off-by: Robert Lougher " >> > http://git.berlios.de/cgi-bin/cgit.cgi/jamvm/commit/?id=1a58072f8339270f9372c273d82a00790e04375d >> > >> > >> > >> > Proper JSR 335: Lambda Expressions >> > "JSR 335: handle multiple defaults and conflicts >> > >> > With JSR 335, an interface can define default methods which >> > are used if a class which implements the interface does not >> > provide an implementation for that method. >> > >> > While this is straight-forward to understand in the simple >> > case where a class ends up with a single default method, it >> > gets complicated when a class ends up with multiple defaults >> > from different interfaces. >> > >> > A class implements not only its direct interfaces but also >> > the interfaces which its direct interfaces extends (recursively), >> > plus all the interfaces of its superclasses. >> > >> > For a given unimplemented interface method there will potentially >> > be several definitions in the set of implemented interfaces - >> > some will be abstract and some will be defaults. >> > >> > In that set, only the most specific are relevant, i.e. if >> > two interfaces define a default method foo, and B extends A, >> > then B's default takes precedence over A. If we end up with >> > only abstract most-specific methods, or a single most-specific >> > default things are OK. However, if we end up with multiple >> > defaults from unrelated interfaces we have a conflict. >> > >> > JamVM previously handled unimplemented interface methods >> > (which before JSR 335 were all abstract) by creating Miranda >> > methods for them when constructing the interface method table >> > (if they were invoked, they threw an AbstractMethodError). >> > >> > For JSR 335, this was extended to create Miranda methods for >> > unimplemented defaults - if they were invoked they executed >> > the default. This change modifies the code to also handle >> > multiple defaults and conflicting defaults. Previously, as >> > all methods were abstract, multiple definitions didn't matter. >> > Now, we need to ensure the correct default is chosen. This >> > is made more complex as a Miranda may be inherited from a >> > superclass. This Miranda may need to be overridden by an >> > additional Miranda in the subclass. >> > >> > Note, if we have conflicting defaults an AbstractMethodError >> > is thrown. This copies HotSpot. However, the JSR 335 spec >> > states that an IncompatibleClassChangeError is thrown. I prefer >> > to follow HotSpot rather than the spec, but I will keep a lookout >> > in case HotSpot (or the spec) changes in the future... >> > >> > Signed-off-by: Robert Lougher " >> > http://git.berlios.de/cgi-bin/cgit.cgi/jamvm/commit/?id=08e4b93b752f107eec983205c2225cef58b6ea7f >> > >> >> -- >> 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 alex.kasko.lists at gmail.com Wed Aug 14 12:23:10 2013 From: alex.kasko.lists at gmail.com (Alex Kasko) Date: Wed, 14 Aug 2013 22:23:10 +0300 Subject: [icedtea7] 2.4.1 patch error on Debian In-Reply-To: References: <520B9544.2040901@gmail.com> Message-ID: <520BD91E.8070708@gmail.com> On 08/14/2013 05:59 PM, And?? wrote: > On 14 August 2013 15:33, Alex Kasko wrote: >> I'm trying to build icedtea-2.4.1 >> (http://blog.fuseyism.com/index.php/2013/07/08/security-icedtea-2-4-1-for-openjdk-7-released/) >> on Debian Wheezy amd64 and got patch error. My build steps: >> >> $ uname -a >> Linux hp 3.2.0-4-amd64 #1 SMP Debian 3.2.46-1 x86_64 GNU/Linux >> $ sha256sum icedtea-2.4.1.tar.gz >> 65142e19ee14c28106345b30b6181f5a4926dd20be599c536d778e31a8a5812a >> icedtea-2.4.1.tar.gz >> $ cd icedtea-2.4.1/ >> $ ./configure >> $ make >> ... >> Checking patches/boot/ecj-diamond.patch >> 1 out of 4 hunks FAILED -- saving rejects to file >> openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java.rej >> 1 out of 3 hunks FAILED -- saving rejects to file >> openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java.rej >> ERROR patch patches/boot/ecj-diamond.patch FAILED! >> WARNING make clean-patch before retrying a fix >> make: *** [stamps/patch-boot.stamp] Error 2 >> >> Specified ".rej" files don't exists after this error. I've tried different >> configure settings and error is always reproducible. 2.4.0 version works >> fine. >> >> I'm not familiar with icedtea patching process - is there anything that I'm >> missing here? >> >> >> -- >> Regards, >> Alex Kasko > > We're aware of the issue - > https://bugs.gentoo.org/show_bug.cgi?id=478484 - and a new release > will be out soon to fix it. > > As a workaround, a newer version of ecj that supports diamond will > work, as will using an existing install of IcedTea 2.x. > This can be specified using --with-jdk-home. On Debian, this can be > achieved by: > > # apt-get install openjdk-7-jdk > $ ./configure --with-java-home=/usr/lib/jvm/java-7-openjdk > > where # commands are performed as the root user (or via sudo) and $ > commands are performed as a normal user. > > Apologies for the inconvenience. > Thanks, it works fine with openjdk-7. -- Regards, Alex Kasko From weijun.wang at oracle.com Wed Aug 14 16:06:15 2013 From: weijun.wang at oracle.com (Weijun Wang) Date: Thu, 15 Aug 2013 07:06:15 +0800 Subject: [rfc][icedtea7] Handle alternative Kerberos credential cache locations In-Reply-To: <520BA528.7000100@redhat.com> References: <520AAE1F.5000601@redhat.com> <520AD530.5070200@oracle.com> <520BA528.7000100@redhat.com> Message-ID: <520C0D67.6050208@oracle.com> On 8/14/13 11:41 PM, Elliott Baron wrote: > Hi Max, > > On 08/13/2013 08:54 PM, Weijun Wang wrote: >> Hi Elliott >> >> This is a very good feature. Can you contribute it to OpenJDK directly? > > Absolutely! I assume security-dev would be the correct list? Correct. > >> >> One thing I don't understand is the _GNU_SOURCE macro defined. > > This is needed in order to use asprintf. If this is problematic, I could > replace the asprintf usage with a helper function that manually > allocates and concatenates the strings. At the very least, I will add a > comment stating that the #define is for asprintf. I'm not sure if it works on Solaris. Will give a try. Thanks Max > >> >> Thanks >> Max >> >> >> On 8/14/13 6:07 AM, Elliott Baron wrote: >>> Hi, >>> >>> Kerberos 1.11 introduced a new configuration variable to override the >>> default location of the credential cache at build time. Fedora 18 and up >>> have used this new configuration variable to define an alternate default >>> cache location (/run/user/$UID/krb5cc/tkt). This bug was initially >>> reported against Fedora [1]. >>> >>> On Linux and Solaris systems, FileCredentialsCache.getDefaultCacheName() >>> defaults to the previously hard-coded location (/tmp/krb5cc_$UID). This >>> location will be incorrect if Kerberos was built with an alternative >>> credential cache location set. Since this credential cache location can >>> be arbitrary, we need to query the Kerberos API for the correct >>> location. This patch implements this query using a new JNI call, which >>> adds a dependency on libkrb5 for Linux and Solaris systems. >>> >>> This patch was prepared against icedtea7-forest/jdk, changeset >>> afaedb56b499. >>> >>> 2013-08-12 Elliott Baron >>> * make/sun/security/Makefile: Build krb5/internal/ccache on Linux >>> and Solaris. >>> * >>> src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java: >>> >>> Replace >>> hard-coded cache location with native call to Kerberos API. >>> * make/sun/security/krb5/internal/ccache/Makefile: New file; builds >>> JNI wrapper for >>> needed Kerberos API. >>> * >>> src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c: New >>> file; JNI function >>> to query default cache location from Kerberos API. >>> >>> Thanks, >>> Elliott >>> >>> [1] https://bugzilla.redhat.com/show_bug.cgi?id=991170 >>> > > Thanks, > Elliott From ptisnovs at icedtea.classpath.org Thu Aug 15 01:16:56 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 15 Aug 2013 08:16:56 +0000 Subject: /hg/gfx-test: Six new tests added into BitBltUsingBgColor test s... Message-ID: changeset 4477ada87429 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=4477ada87429 author: Pavel Tisnovsky date: Thu Aug 15 10:20:35 2013 +0200 Six new tests added into BitBltUsingBgColor test suite, fixed typos in JavaDoc etc. diffstat: ChangeLog | 6 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 282 ++++++++++++++------ 2 files changed, 198 insertions(+), 90 deletions(-) diffs (truncated from 927 to 500 lines): diff -r 0a71a945bd3a -r 4477ada87429 ChangeLog --- a/ChangeLog Wed Aug 14 10:30:52 2013 +0200 +++ b/ChangeLog Thu Aug 15 10:20:35 2013 +0200 @@ -1,3 +1,9 @@ +2013-08-15 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Six new tests added into BitBltUsingBgColor test suite, fixed typos in + JavaDoc etc. + 2013-08-14 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBasicTests.java: diff -r 0a71a945bd3a -r 4477ada87429 src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Wed Aug 14 10:30:52 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Thu Aug 15 10:20:35 2013 +0200 @@ -1085,6 +1085,108 @@ } /** + * Test basic BitBlt operation for diagonal grid buffered image with type TYPE_BYTE_BINARY + * + * @param image + * image to be 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 doBitBltDiagonalGridBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type TYPE_BYTE_GRAY + * + * @param image + * image to be 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 doBitBltDiagonalGridBufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type TYPE_BYTE_INDEXED + * + * @param image + * image to be 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 doBitBltDiagonalGridBufferedImageTypeByteIndexed(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type TYPE_USHORT_555_RGB + * + * @param image + * image to be 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 doBitBltDiagonalGridBufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type TYPE_USHORT_565_RGB + * + * @param image + * image to be 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 doBitBltDiagonalGridBufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type TYPE_USHORT_GRAY + * + * @param image + * image to be 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 doBitBltDiagonalGridBufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(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. * @@ -1824,7 +1926,7 @@ * Background color is set to Color.blue. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -1839,7 +1941,7 @@ * Background color is set to Color.green. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -1854,7 +1956,7 @@ * Background color is set to Color.cyan. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -1869,7 +1971,7 @@ * Background color is set to Color.red. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -1884,7 +1986,7 @@ * Background color is set to Color.magenta. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -1899,7 +2001,7 @@ * Background color is set to Color.yellow. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -1914,7 +2016,7 @@ * Background color is set to Color.white. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -1929,7 +2031,7 @@ * Background color is set to Color.black. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -1944,7 +2046,7 @@ * Background color is set to Color.blue. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -1959,7 +2061,7 @@ * Background color is set to Color.green. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -1974,7 +2076,7 @@ * Background color is set to Color.cyan. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -1989,7 +2091,7 @@ * Background color is set to Color.red. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2004,7 +2106,7 @@ * Background color is set to Color.magenta. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2019,7 +2121,7 @@ * Background color is set to Color.yellow. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2034,7 +2136,7 @@ * Background color is set to Color.white. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2049,7 +2151,7 @@ * Background color is set to Color.black. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2064,7 +2166,7 @@ * Background color is set to Color.blue. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2079,7 +2181,7 @@ * Background color is set to Color.green. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2094,7 +2196,7 @@ * Background color is set to Color.cyan. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2109,7 +2211,7 @@ * Background color is set to Color.red. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2124,7 +2226,7 @@ * Background color is set to Color.magenta. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2139,7 +2241,7 @@ * Background color is set to Color.yellow. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2154,7 +2256,7 @@ * Background color is set to Color.white. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2169,7 +2271,7 @@ * Background color is set to Color.black. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2184,7 +2286,7 @@ * Background color is set to Color.blue. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2199,7 +2301,7 @@ * Background color is set to Color.green. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2214,7 +2316,7 @@ * Background color is set to Color.cyan. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2229,7 +2331,7 @@ * Background color is set to Color.red. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2244,7 +2346,7 @@ * Background color is set to Color.magenta. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2259,7 +2361,7 @@ * Background color is set to Color.yellow. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2274,7 +2376,7 @@ * Background color is set to Color.white. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2289,7 +2391,7 @@ * Background color is set to Color.black. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2304,7 +2406,7 @@ * Background color is set to Color.blue. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2319,7 +2421,7 @@ * Background color is set to Color.green. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2334,7 +2436,7 @@ * Background color is set to Color.cyan. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2349,7 +2451,7 @@ * Background color is set to Color.red. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2364,7 +2466,7 @@ * Background color is set to Color.magenta. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2379,7 +2481,7 @@ * Background color is set to Color.yellow. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2394,7 +2496,7 @@ * Background color is set to Color.white. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2409,7 +2511,7 @@ * Background color is set to Color.black. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2424,7 +2526,7 @@ * Background color is set to Color.blue. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -2439,7 +2541,7 @@ * Background color is set to Color.green. * * @param image - * image used as a destination for BitBlt-type operations + * image to be used as a destination for BitBlt-type operations From ptisnovs at icedtea.classpath.org Thu Aug 15 01:24:07 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 15 Aug 2013 08:24:07 +0000 Subject: /hg/rhino-tests: Added two new tests getGenericSuperclass() and ... Message-ID: changeset a336cdbee118 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=a336cdbee118 author: Pavel Tisnovsky date: Thu Aug 15 10:27:49 2013 +0200 Added two new tests getGenericSuperclass() and getGenericInterfaces() into BindingsClassTest. diffstat: ChangeLog | 6 +++ src/org/RhinoTests/BindingsClassTest.java | 57 +++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 0 deletions(-) diffs (80 lines): diff -r 3f08a736ce66 -r a336cdbee118 ChangeLog --- a/ChangeLog Wed Aug 14 10:51:30 2013 +0200 +++ b/ChangeLog Thu Aug 15 10:27:49 2013 +0200 @@ -1,3 +1,9 @@ +2013-08-15 Pavel Tisnovsky + + * src/org/RhinoTests/BindingsClassTest.java: + Added two new tests getGenericSuperclass() and getGenericInterfaces() + into BindingsClassTest. + 2013-08-14 Pavel Tisnovsky * src/org/RhinoTests/BindingsClassTest.java: diff -r 3f08a736ce66 -r a336cdbee118 src/org/RhinoTests/BindingsClassTest.java --- a/src/org/RhinoTests/BindingsClassTest.java Wed Aug 14 10:51:30 2013 +0200 +++ b/src/org/RhinoTests/BindingsClassTest.java Thu Aug 15 10:27:49 2013 +0200 @@ -1055,6 +1055,63 @@ } /** + * Test for method javax.script.Bindings.getClass().getGenericSuperclass() + */ + protected void testGetGenericSuperclass() { + Type genericSuperclass = this.bindingsClass.getGenericSuperclass(); + assertNull(genericSuperclass, "getGenericSuperclass() does not return null"); + } + + /** + * Test for method javax.script.Bindings.getClass().getGenericInterfaces() + */ + protected void testGetGenericInterfaces() { + // array of interface names that should exists + final String[] genericInterfaceNames_jdk6 = { + "java.util.Map" + }; + + final String[] genericInterfaceNames_jdk7 = { + "java.util.Map" + }; + + final String[] genericInterfaceNames_jdk8 = { + "java.util.Map" + }; + + // 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.bindingsClass.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 method javax.script.Bindings.getClass().getEnumConstants() */ protected void testGetEnumConstants() { From aazores at redhat.com Thu Aug 15 07:42:45 2013 From: aazores at redhat.com (Andrew Azores) Date: Thu, 15 Aug 2013 10:42:45 -0400 Subject: [rfc][icedtea-web] jnlp_href extensions inside HTML applets - PR974 In-Reply-To: <520B85EE.3070003@redhat.com> References: <51C9F3C1.8070307@redhat.com> <51F7534F.8090006@redhat.com> <51FAB9FE.7080004@redhat.com> <520B85EE.3070003@redhat.com> Message-ID: <520CE8E5.8010602@redhat.com> On 08/14/2013 09:28 AM, Adam Domurad wrote: > On 08/01/2013 03:41 PM, Andrew Azores wrote: >> On 07/30/2013 01:46 AM, Jiri Vanek wrote: > [ snip ] > > Fix comments: > >> diff --git a/netx/net/sourceforge/jnlp/ParserSettings.java >> b/netx/net/sourceforge/jnlp/ParserSettings.java >> --- a/netx/net/sourceforge/jnlp/ParserSettings.java >> +++ b/netx/net/sourceforge/jnlp/ParserSettings.java >> @@ -37,6 +37,9 @@ exception statement from your version. >> >> package net.sourceforge.jnlp; >> >> +import java.util.ArrayList; >> +import java.util.List; >> + >> /** >> * Contains settings to be used by the Parser while parsing JNLP files. >> * >> @@ -44,9 +47,12 @@ package net.sourceforge.jnlp; >> */ >> public class ParserSettings { >> >> + private static final String doubleArgs = "-basedir -jnlp -arg >> -param -property -update"; >> + > > This seems clearer as an array. As well, consider using the all-caps > and underscore convention for constants. I've taken these out completely. They were a leftover from the command line argument checks Boot.java does, but ParserSettings' needs are much much simpler, at least at the moment. > >> private final boolean isStrict; >> private final boolean extensionAllowed; >> private final boolean malformedXmlAllowed; >> + private static String[] cmdArgs; > > I prefer storing 'global parser settings' here. Setting some global > parser settings is more obvious in intent than > ParserSettings.setCommandLineArgs(...). This does make more sense, you're right. No need to save the args when they're just being used to make a single ParserSettings instance, which is really just a struct with three booleans... d'oh. :) > >> >> /** Create a new ParserSettings with the defautl parser settings */ >> public ParserSettings() { >> @@ -75,4 +81,66 @@ public class ParserSettings { >> return isStrict; >> } >> >> -} >> \ No newline at end of file >> + public static void setCommandLineArgs(String[] args) { >> + cmdArgs = args; >> + } >> + >> + public static ParserSettings getCommandLineParserSettings() { > > Consider making this take a string parameter (combined with the > recommended change above). Well, it's now a String[] parameter, since that's what the current single caller of this method has on-hand already. > >> + if (cmdArgs == null || cmdArgs.length == 0) { >> + return new ParserSettings(); >> + } >> + >> + boolean strict = false; >> + boolean malformedXmlAllowed = true; >> + >> + if (null != getOption("-strict")) { >> + strict = true; >> + } >> + >> + if (null != getOption("-xml")) { >> + malformedXmlAllowed = false; >> + } >> + >> + return new ParserSettings(strict, true, malformedXmlAllowed); >> + } >> + >> + /** >> + * Return value of the first occurence of the specified >> + * option, or null if the option is not present. If the >> + * option is a flag (0-parameter) and is present then the >> + * option name is returned. >> + */ >> + private static String getOption(String option) { >> + String result[] = getOptions(option); >> + >> + if (result.length == 0) >> + return null; >> + else >> + return result[0]; >> + } >> + >> + /** >> + * Return all the values of the specified option, or an empty >> + * array if the option is not present. If the option is a >> + * flag (0-parameter) and is present then the option name is >> + * returned once for each occurrence. >> + */ >> + private static String[] getOptions(String option) { >> + List result = new ArrayList(); >> + >> + for (int i = 0; i < cmdArgs.length; i++) { >> + if (option.equals(cmdArgs[i])) { >> + if (-1 == doubleArgs.indexOf(option)) >> + result.add(option); >> + else if (i + 1 < cmdArgs.length) >> + result.add(cmdArgs[i + 1]); >> + } >> + >> + if (cmdArgs[i].startsWith("-") && -1 != >> doubleArgs.indexOf(cmdArgs[i])) >> + i++; >> + } >> + >> + return result.toArray(new String[result.size()]); >> + } >> + >> +} >> diff --git a/netx/net/sourceforge/jnlp/PluginBridge.java >> b/netx/net/sourceforge/jnlp/PluginBridge.java >> --- a/netx/net/sourceforge/jnlp/PluginBridge.java >> +++ b/netx/net/sourceforge/jnlp/PluginBridge.java >> @@ -26,19 +26,19 @@ import java.io.ByteArrayInputStream; >> import java.io.File; >> import java.io.IOException; >> import java.io.InputStream; >> +import java.net.MalformedURLException; >> import java.net.URL; >> -import java.net.MalformedURLException; >> +import java.util.ArrayList; >> +import java.util.Arrays; >> import java.util.HashSet; >> +import java.util.List; >> import java.util.Locale; >> -import java.util.List; >> -import java.util.ArrayList; >> import java.util.Map; >> import java.util.Set; >> >> +import net.sourceforge.jnlp.runtime.JNLPRuntime; >> import sun.misc.BASE64Decoder; >> >> -import net.sourceforge.jnlp.runtime.JNLPRuntime; >> - >> /** >> * Allows reuse of code that expects a JNLPFile object, >> * while overriding behaviour specific to applets. >> @@ -47,6 +47,7 @@ public class PluginBridge extends JNLPFi >> >> private PluginParameters params; >> private Set jars = new HashSet(); >> + private List extensionJars = new >> ArrayList(); >> //Folders can be added to the code-base through the archive tag >> private List codeBaseFolders = new ArrayList(); >> private String[] cacheJars = new String[0]; >> @@ -90,6 +91,7 @@ public class PluginBridge extends JNLPFi >> this.codeBase = codebase; >> this.sourceLocation = documentBase; >> this.params = params; >> + this.parserSettings = >> ParserSettings.getCommandLineParserSettings(); > > I prefer to have some reference to 'global settings' versus 'command > line settings' - eg some 'getGlobalParserSettings' method. I am not > really fully convinced this should be anything except 'new > ParserSettings()' as you had before. I think it makes sense to make ParserSettings which respect the command line flags available like this, even if maybe the PluginBridge doesn't particularly need to care about what those settings are beyond not being a null reference. Then, might as well give it the correct settings if they're available, right? > [ snip ] > Looks good, though. > > Thanks, > -Adam Here's the Changelog again since I've also added some small unit tests. Changelog: * netx/net/sourceforge/jnlp/ParserSettings.java: (globalParserSettings) static ParserSettings instance to store settings. (getGlobalParserSettings) two new methods. Determine, store, and return globalParserSettings * netx/net/sourceforge/jnlp/PluginBridge.java: (extensionJars) stores list of JNLP extensions. (getResources) returns this list * netx/net/sourceforge/jnlp/runtime/Boot.java: minor refactor to use ParserSettings.getGlobalParserSettings() * tests/netx/unit/net/sourceforge/jnlp/ParserSettingsTest.java: ensure that ParserSettings.getGlobalParserSettings() works as intended * 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/ExtensionJnlpHelper.jnlp: same * tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpTest.html: 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 Thanks, -- Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: fix.patch Type: text/x-patch Size: 5271 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130815/e647615a/fix.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: reproducer.patch Type: text/x-patch Size: 17133 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130815/e647615a/reproducer.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: unit.patch Type: text/x-patch Size: 3457 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130815/e647615a/unit.patch From adomurad at redhat.com Thu Aug 15 08:16:08 2013 From: adomurad at redhat.com (Adam Domurad) Date: Thu, 15 Aug 2013 11:16:08 -0400 Subject: [rfc][icedtea-web] jnlp_href extensions inside HTML applets - PR974 In-Reply-To: <520CE8E5.8010602@redhat.com> References: <51C9F3C1.8070307@redhat.com> <51F7534F.8090006@redhat.com> <51FAB9FE.7080004@redhat.com> <520B85EE.3070003@redhat.com> <520CE8E5.8010602@redhat.com> Message-ID: <520CF0B8.4050807@redhat.com> On 08/15/2013 10:42 AM, Andrew Azores wrote: [..snip..] > diff --git a/netx/net/sourceforge/jnlp/ParserSettings.java b/netx/net/sourceforge/jnlp/ParserSettings.java > --- a/netx/net/sourceforge/jnlp/ParserSettings.java > +++ b/netx/net/sourceforge/jnlp/ParserSettings.java > @@ -37,6 +37,9 @@ > > package net.sourceforge.jnlp; > > +import java.util.Arrays; > +import java.util.List; > + > /** > * Contains settings to be used by the Parser while parsing JNLP files. > * > @@ -44,6 +47,8 @@ > */ > public class ParserSettings { > > + private static ParserSettings globalParserSettings = null; > + > private final boolean isStrict; > private final boolean extensionAllowed; > private final boolean malformedXmlAllowed; > @@ -75,4 +80,30 @@ > return isStrict; > } > > -} > \ No newline at end of file > + /** > + * Return the global parser settings in use. If the call getGlobalParserSettings(String[]) > + * has been made prior to this one, return the same settings. Otherwise, return default > + * settings. > + */ > + public static ParserSettings getGlobalParserSettings() { > + if (globalParserSettings == null) { > + globalParserSettings = new ParserSettings(); > + } > + return globalParserSettings; > + } > + > + /** > + * Return the ParserSettings to be used according to arguments specified > + * at boot on the command line. If no options specified, return default > + * settings. > + */ > + public static ParserSettings getGlobalParserSettings(String[] cmdArgs) { This should be called setGlobalParserSettings in my opinion. It's a general rule that if a method has a side-effect, and a return value, you should name it according to the side-effect. The logic being that the return value is easier to reason about. (There's a noteworthy example of this from the Java standard library: http://docs.oracle.com/javase/7/docs/api/java/lang/Thread.html#interrupted%28%29 This method should have been called 'clearInterrupt' or similar.) Anyway I would still somewhat prefer a method that goes from String[] -> ParserSettings, as well as a separate 'setGlobalParserSettings(ParserSettings parserSettings)', but it isn't a blocker or anything. > + List argList = Arrays.asList(cmdArgs); > + boolean strict = argList.contains("-strict"); > + boolean malformedXmlAllowed = !argList.contains("-xml"); > + > + globalParserSettings = new ParserSettings(strict, true, malformedXmlAllowed); > + return globalParserSettings; > + } > + > +} > diff --git a/netx/net/sourceforge/jnlp/PluginBridge.java b/netx/net/sourceforge/jnlp/PluginBridge.java > --- a/netx/net/sourceforge/jnlp/PluginBridge.java > +++ b/netx/net/sourceforge/jnlp/PluginBridge.java > @@ -26,19 +26,19 @@ > import java.io.File; > import java.io.IOException; > import java.io.InputStream; > +import java.net.MalformedURLException; > import java.net.URL; > -import java.net.MalformedURLException; > +import java.util.ArrayList; > +import java.util.Arrays; > import java.util.HashSet; > +import java.util.List; > import java.util.Locale; > -import java.util.List; > -import java.util.ArrayList; > import java.util.Map; > import java.util.Set; > > +import net.sourceforge.jnlp.runtime.JNLPRuntime; > import sun.misc.BASE64Decoder; > > -import net.sourceforge.jnlp.runtime.JNLPRuntime; > - > /** > * Allows reuse of code that expects a JNLPFile object, > * while overriding behaviour specific to applets. > @@ -47,6 +47,7 @@ > > private PluginParameters params; > private Set jars = new HashSet(); > + private List extensionJars = new ArrayList(); > //Folders can be added to the code-base through the archive tag > private List codeBaseFolders = new ArrayList(); > private String[] cacheJars = new String[0]; > @@ -90,6 +91,7 @@ > this.codeBase = codebase; > this.sourceLocation = documentBase; > this.params = params; > + this.parserSettings = ParserSettings.getGlobalParserSettings(); > > if (params.getJNLPHref() != null) { > useJNLPHref = true; > @@ -122,6 +124,9 @@ > String fileName = jarDesc.getLocation().toExternalForm(); > this.jars.add(fileName); > } > + > + // Store any extensions listed in the JNLP file to be returned later on, namely in getResources() > + extensionJars = Arrays.asList(jnlpFile.getResources().getExtensions()); > } catch (MalformedURLException e) { > // Don't fail because we cannot get the jnlp file. Parameters are optional not required. > // it is the site developer who should ensure that file exist. > @@ -308,6 +313,8 @@ > return result; > } catch (MalformedURLException ex) { /* Ignored */ > } > + } else if (launchType.equals(ExtensionDesc.class)) { > + return (List) extensionJars; // this list is populated when the PluginBridge is first constructed > } > return sharedResources.getResources(launchType); > } > diff --git a/netx/net/sourceforge/jnlp/runtime/Boot.java b/netx/net/sourceforge/jnlp/runtime/Boot.java > --- a/netx/net/sourceforge/jnlp/runtime/Boot.java > +++ b/netx/net/sourceforge/jnlp/runtime/Boot.java > @@ -214,18 +214,8 @@ > extra.put("arguments", getOptions("-arg")); > extra.put("parameters", getOptions("-param")); > extra.put("properties", getOptions("-property")); > - boolean strict = false; > - boolean malformedXmlAllowed = true; > > - if (null != getOption("-strict")) { > - strict = true; > - } > - > - if (null != getOption("-xml")) { > - malformedXmlAllowed = false; > - } > - > - ParserSettings settings = new ParserSettings(strict, true, malformedXmlAllowed); > + ParserSettings settings = ParserSettings.getGlobalParserSettings(args); > > try { > Launcher launcher = new Launcher(false); Looks good, approved other than s/getGlobalParserSettings(args)/setGlobalParserSettings(args)/ IMO Unit tests and reproducers approved too. Good stuff, overall. Thanks, -Adam From bugzilla-daemon at icedtea.classpath.org Thu Aug 15 12:02:07 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 15 Aug 2013 19:02:07 +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 Andrew Azores 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/20130815/2f7fdb1f/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu Aug 15 12:01:11 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 15 Aug 2013 19:01:11 +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 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea-web?cmd=changeset;node=6060b294b41d author: Andrew Azores date: Thu Aug 15 14:57:08 2013 -0400 Fix and tests for PR974, extension JNLPs unavailable when embedded in HTML applet tags -- 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/20130815/4927e610/attachment.html From aazores at icedtea.classpath.org Thu Aug 15 12:00:59 2013 From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org) Date: Thu, 15 Aug 2013 19:00:59 +0000 Subject: /hg/icedtea-web: Fix and tests for PR974, extension JNLPs unavai... Message-ID: changeset 6060b294b41d in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=6060b294b41d author: Andrew Azores date: Thu Aug 15 14:57:08 2013 -0400 Fix and tests for PR974, extension JNLPs unavailable when embedded in HTML applet tags diffstat: ChangeLog | 32 ++++ netx/net/sourceforge/jnlp/ParserSettings.java | 35 ++++- netx/net/sourceforge/jnlp/PluginBridge.java | 17 +- netx/net/sourceforge/jnlp/runtime/Boot.java | 12 +- tests/netx/unit/net/sourceforge/jnlp/ParserSettingsTest.java | 74 ++++++++++ tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpHelper.jnlp | 53 +++++++ tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpTest.html | 46 ++++++ tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpTestApplet.jnlp | 59 +++++++ tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/ExtensionJnlpHelper.java | 42 +++++ tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/ExtensionJnlpTestApplet.java | 55 +++++++ tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile | 34 ++++ tests/reproducers/custom/ExtensionJnlpsInApplet/testcases/ExtensionJnlpsInAppletTest.java | 73 +++++++++ 12 files changed, 515 insertions(+), 17 deletions(-) diffs (truncated from 657 to 500 lines): diff -r 5d7b3a507709 -r 6060b294b41d ChangeLog --- a/ChangeLog Tue Aug 13 13:54:10 2013 -0400 +++ b/ChangeLog Thu Aug 15 14:57:08 2013 -0400 @@ -1,10 +1,42 @@ +2013-08-15 Andrew Azores + + * netx/net/sourceforge/jnlp/ParserSettings.java: (globalParserSettings) + static ParserSettings instance to store settings. + (setGlobalParserSettingsFromArgs) Determine, store, and return + globalParserSettings. (getGlobalParserSettings) return stored + ParserSettings + * netx/net/sourceforge/jnlp/PluginBridge.java: (extensionJars) stores list + of JNLP extensions. (getResources) returns this list + * netx/net/sourceforge/jnlp/runtime/Boot.java: minor refactor to use + ParserSettings.setGlobalParserSettingsFromArgs() + + * tests/netx/unit/net/sourceforge/jnlp/ParserSettingsTest.java: ensure + that ParserSettings.setGlobalParserSettingsFromArgs() works as intended + + * 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/ExtensionJnlpHelper.jnlp: + same + * tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpTest.html: + 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 + 2013-08-13 Andrew Azores + * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: no longer sends HTTP 400 BAD REQUEST messages * test/test-extensions-tests/net/sourceforge/jnlp/TinyHttpdImplTest.java: removed "bad request" test 2013-08-12 Andrew Azores + * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: refactored * tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java: TinyHttpdImpl constructor changed, reflecting this here diff -r 5d7b3a507709 -r 6060b294b41d netx/net/sourceforge/jnlp/ParserSettings.java --- a/netx/net/sourceforge/jnlp/ParserSettings.java Tue Aug 13 13:54:10 2013 -0400 +++ b/netx/net/sourceforge/jnlp/ParserSettings.java Thu Aug 15 14:57:08 2013 -0400 @@ -37,6 +37,9 @@ package net.sourceforge.jnlp; +import java.util.Arrays; +import java.util.List; + /** * Contains settings to be used by the Parser while parsing JNLP files. * @@ -44,6 +47,8 @@ */ public class ParserSettings { + private static ParserSettings globalParserSettings = new ParserSettings(); + private final boolean isStrict; private final boolean extensionAllowed; private final boolean malformedXmlAllowed; @@ -75,4 +80,32 @@ return isStrict; } -} \ No newline at end of file + /** + * Return the global parser settings in use. + */ + public static ParserSettings getGlobalParserSettings() { + return globalParserSettings; + } + + /** + * Set the global ParserSettings to match the given settings. + */ + public static void setGlobalParserSettings(ParserSettings parserSettings) { + globalParserSettings = parserSettings; + } + + /** + * Return the ParserSettings to be used according to arguments specified + * at boot on the command line. These settings are also stored so they + * can be retrieved at a later time. + */ + public static ParserSettings setGlobalParserSettingsFromArgs(String[] cmdArgs) { + List argList = Arrays.asList(cmdArgs); + boolean strict = argList.contains("-strict"); + boolean malformedXmlAllowed = !argList.contains("-xml"); + + globalParserSettings = new ParserSettings(strict, true, malformedXmlAllowed); + return globalParserSettings; + } + +} diff -r 5d7b3a507709 -r 6060b294b41d netx/net/sourceforge/jnlp/PluginBridge.java --- a/netx/net/sourceforge/jnlp/PluginBridge.java Tue Aug 13 13:54:10 2013 -0400 +++ b/netx/net/sourceforge/jnlp/PluginBridge.java Thu Aug 15 14:57:08 2013 -0400 @@ -26,19 +26,19 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.net.MalformedURLException; import java.net.URL; -import java.net.MalformedURLException; +import java.util.ArrayList; +import java.util.Arrays; import java.util.HashSet; +import java.util.List; import java.util.Locale; -import java.util.List; -import java.util.ArrayList; import java.util.Map; import java.util.Set; +import net.sourceforge.jnlp.runtime.JNLPRuntime; import sun.misc.BASE64Decoder; -import net.sourceforge.jnlp.runtime.JNLPRuntime; - /** * Allows reuse of code that expects a JNLPFile object, * while overriding behaviour specific to applets. @@ -47,6 +47,7 @@ private PluginParameters params; private Set jars = new HashSet(); + private List extensionJars = new ArrayList(); //Folders can be added to the code-base through the archive tag private List codeBaseFolders = new ArrayList(); private String[] cacheJars = new String[0]; @@ -90,6 +91,7 @@ this.codeBase = codebase; this.sourceLocation = documentBase; this.params = params; + this.parserSettings = ParserSettings.getGlobalParserSettings(); if (params.getJNLPHref() != null) { useJNLPHref = true; @@ -122,6 +124,9 @@ String fileName = jarDesc.getLocation().toExternalForm(); this.jars.add(fileName); } + + // Store any extensions listed in the JNLP file to be returned later on, namely in getResources() + extensionJars = Arrays.asList(jnlpFile.getResources().getExtensions()); } catch (MalformedURLException e) { // Don't fail because we cannot get the jnlp file. Parameters are optional not required. // it is the site developer who should ensure that file exist. @@ -308,6 +313,8 @@ return result; } catch (MalformedURLException ex) { /* Ignored */ } + } else if (launchType.equals(ExtensionDesc.class)) { + return (List) extensionJars; // this list is populated when the PluginBridge is first constructed } return sharedResources.getResources(launchType); } diff -r 5d7b3a507709 -r 6060b294b41d netx/net/sourceforge/jnlp/runtime/Boot.java --- a/netx/net/sourceforge/jnlp/runtime/Boot.java Tue Aug 13 13:54:10 2013 -0400 +++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Thu Aug 15 14:57:08 2013 -0400 @@ -214,18 +214,8 @@ extra.put("arguments", getOptions("-arg")); extra.put("parameters", getOptions("-param")); extra.put("properties", getOptions("-property")); - boolean strict = false; - boolean malformedXmlAllowed = true; - if (null != getOption("-strict")) { - strict = true; - } - - if (null != getOption("-xml")) { - malformedXmlAllowed = false; - } - - ParserSettings settings = new ParserSettings(strict, true, malformedXmlAllowed); + ParserSettings settings = ParserSettings.setGlobalParserSettingsFromArgs(args); try { Launcher launcher = new Launcher(false); diff -r 5d7b3a507709 -r 6060b294b41d tests/netx/unit/net/sourceforge/jnlp/ParserSettingsTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/ParserSettingsTest.java Thu Aug 15 14:57:08 2013 -0400 @@ -0,0 +1,74 @@ +/* ParserSettingsTest.java + 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 org.junit.Assert; +import org.junit.Test; + +import net.sourceforge.jnlp.ParserSettings; + +public class ParserSettingsTest { + + @Test + public void testDefaultSettings() { + Assert.assertNotNull("Default parser settings should not be null", ParserSettings.getGlobalParserSettings()); + } + + @Test + public void testNoArgsSameAsDefault() { + ParserSettings defaultSettings, noArgs; + defaultSettings = new ParserSettings(); + noArgs = ParserSettings.setGlobalParserSettingsFromArgs(new String[0]); + + Assert.assertTrue("isExtensionAllowed should have been equal", defaultSettings.isExtensionAllowed() == noArgs.isExtensionAllowed()); + Assert.assertTrue("isStrict should have been equal", defaultSettings.isStrict() == noArgs.isStrict()); + Assert.assertTrue("isMalformedXmlAllowed should have been equal", defaultSettings.isMalformedXmlAllowed() == noArgs.isMalformedXmlAllowed()); + } + + @Test + public void testWithArgs() { + ParserSettings settings = ParserSettings.setGlobalParserSettingsFromArgs(new String[] { + "-strict", + "-xml", + }); + Assert.assertTrue("isStrict should have been true", settings.isStrict() == true); + Assert.assertTrue("isMalformedXmlAllowed should have been false", settings.isMalformedXmlAllowed() == false); + Assert.assertTrue("isExtensionAllowed should have been true", settings.isExtensionAllowed() == true); + } + +} diff -r 5d7b3a507709 -r 6060b294b41d tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpHelper.jnlp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpHelper.jnlp Thu Aug 15 14:57:08 2013 -0400 @@ -0,0 +1,53 @@ + + + + + + ExtensionJnlpHelper + IcedTea + + PR974 Test + + + + + + + + diff -r 5d7b3a507709 -r 6060b294b41d tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpTest.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpTest.html Thu Aug 15 14:57:08 2013 -0400 @@ -0,0 +1,46 @@ + + + + + + + + + + diff -r 5d7b3a507709 -r 6060b294b41d tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpTestApplet.jnlp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/custom/ExtensionJnlpsInApplet/resources/ExtensionJnlpTestApplet.jnlp Thu Aug 15 14:57:08 2013 -0400 @@ -0,0 +1,59 @@ + + + + + + ExtensionJnlpTestApplet + IcedTea + + PR974 Test + + + + + + + + + + diff -r 5d7b3a507709 -r 6060b294b41d tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/ExtensionJnlpHelper.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/ExtensionJnlpHelper.java Thu Aug 15 14:57:08 2013 -0400 @@ -0,0 +1,42 @@ +/* ExtensionJnlpHelper.java +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. + */ + +public class ExtensionJnlpHelper { + public static String help() { + return "Helper!"; + } +} diff -r 5d7b3a507709 -r 6060b294b41d tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/ExtensionJnlpTestApplet.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/ExtensionJnlpTestApplet.java Thu Aug 15 14:57:08 2013 -0400 @@ -0,0 +1,55 @@ +/* ExtensionJnlpTestApplet.java +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. From bugzilla-daemon at icedtea.classpath.org Thu Aug 15 12:10:47 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 15 Aug 2013 19:10:47 +0000 Subject: [Bug 1507] Opening a VPN episode (Citrix). Serious fatal error window pop-up. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1507 --- Comment #1 from Andrew Azores --- Hi, Do you have more information on how to reproduce this error? -- 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/20130815/cc947637/attachment.html From doko at ubuntu.com Thu Aug 15 12:25:10 2013 From: doko at ubuntu.com (Matthias Klose) Date: Thu, 15 Aug 2013 21:25:10 +0200 Subject: OpenJDK 7 Zero built for AArch64 Message-ID: <520D2B16.3000302@ubuntu.com> After three weeks build time, I have now OpenJDK 7 Zero packages available for AArch64. The AArch64 support announced in IcedTea 2.3.10 turned out to be non-working, so I'm wondering who was able to get a working build for AArch64 using this release. Binary packages are available from deb http://people.canonical.com/~doko/tmp/openjdk-aarch64 ./ I did need the following three patches to get it building. - hotspot-fork.diff, found at http://mail.openjdk.java.net/pipermail/porters-dev/2013-March/000469.html While the patch might not be generic enough it is needed for AArch64 because __NR_fork and __NR_execve are not defined, at least when using glibc 2.17 and kernel headers 3.10. - jdk-zero-arch.diff, not found anywhere, sets ARCH_DATA_MODEL and ZERO_ENDIANNESS correctly for AArch64. - aarch64-detection.diff, only needed for Debian/Ubuntu based builds. Correctly using the host and not the build macros, and translating arm64 to aarch64. Unfortunately Debian calls this port arm64 and not aarch64. All three patches attached. The build is a native build using gcj 4.8 from the 4.8 fsf branch for the stage1 build. No tests were run except using the stage1 build to build stage2. Matthias -------------- next part -------------- --- openjdk/jdk/make/common/shared/Platform.gmk.orig 2013-08-06 11:33:35.584904685 +0000 +++ openjdk/jdk/make/common/shared/Platform.gmk 2013-08-06 11:35:41.365862699 +0000 @@ -161,7 +161,7 @@ mach := $(shell uname -m) endif ifneq (,$(wildcard /usr/bin/dpkg-architecture)) - mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/') + mach := $(shell (dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/arm64/aarch64/;s/powerpc$$/ppc/;s/hppa/parisc/') endif archExpr = case "$(mach)" in \ i[3-9]86) \ --- openjdk/corba/make/common/shared/Platform.gmk.orig 2013-08-06 11:42:29.816950930 +0000 +++ openjdk/corba/make/common/shared/Platform.gmk 2013-08-06 11:42:34.945000504 +0000 @@ -154,7 +154,7 @@ # Arch and OS name/version mach := $(shell uname -m) ifneq (,$(wildcard /usr/bin/dpkg-architecture)) - mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/') + mach := $(shell (dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/arm64/aarch64/;s/powerpc$$/ppc/;s/hppa/parisc/') endif archExpr = case "$(mach)" in \ i[3-9]86) \ -------------- next part -------------- --- openjdk/hotspot/src/os/linux/vm/os_linux.cpp +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp @@ -5374,14 +5374,6 @@ void Parker::unpark() { extern char** environ; -#ifndef __NR_fork -#define __NR_fork IA32_ONLY(2) IA64_ONLY(not defined) AMD64_ONLY(57) -#endif - -#ifndef __NR_execve -#define __NR_execve IA32_ONLY(11) IA64_ONLY(1033) AMD64_ONLY(59) -#endif - // Run the specified command in a separate process. Return its exit value, // or -1 on failure (e.g. can't fork a new process). // Unlike system(), this function can be called from signal handler. It @@ -5392,10 +5384,11 @@ int os::fork_and_exec(char* cmd) { // fork() in LinuxThreads/NPTL is not async-safe. It needs to run // pthread_atfork handlers and reset pthread library. All we need is a // separate process to execve. Make a direct syscall to fork process. - // On IA64 there's no fork syscall, we have to use fork() and hope for - // the best... - pid_t pid = NOT_IA64(syscall(__NR_fork);) - IA64_ONLY(fork();) +#ifdef SYS_fork + pid_t pid = syscall(SYS_fork); +#else + pid_t pid = syscall(SYS_clone, SIGCHLD, 0, 0, 0, 0); +#endif if (pid < 0) { // fork failed @@ -5409,10 +5402,7 @@ int os::fork_and_exec(char* cmd) { // not reset by fork() (see notes above), execve() will instead kill // every thread in the parent process. We know this is the only thread // in the new process, so make a system call directly. - // IA64 should use normal execve() from glibc to match the glibc fork() - // above. - NOT_IA64(syscall(__NR_execve, "/bin/sh", argv, environ);) - IA64_ONLY(execve("/bin/sh", (char* const*)argv, environ);) + syscall(SYS_execve, "/bin/sh", argv, environ); // execve failed _exit(-1); -------------- next part -------------- --- openjdk/jdk/make/jdk_generic_profile.sh~ 2013-07-25 18:10:09.000000000 +0200 +++ openjdk/jdk/make/jdk_generic_profile.sh 2013-08-05 02:56:33.016845707 +0200 @@ -269,7 +269,7 @@ i386|ppc|s390|sparc|arm|sh) ARCH_DATA_MODEL=32 ;; - amd64|ppc64|s390x|sparcv9|ia64|alpha) + aarch64|amd64|ppc64|s390x|sparcv9|ia64|alpha) ARCH_DATA_MODEL=64 ;; *) @@ -280,7 +280,7 @@ # ZERO_ENDIANNESS is the endianness of the processor case "${ZERO_LIBARCH}" in - i386|amd64|ia64|arm) + i386|amd64|ia64|arm|aarch64|mipsel) ZERO_ENDIANNESS=little ;; ppc*|s390*|sparc*|alpha) @@ -307,7 +307,7 @@ s390) ZERO_ARCHFLAG="-m31" ;; - arm) + arm|aarch64) ZERO_ARCHFLAG="-D_LITTLE_ENDIAN" ;; *) From aazores at redhat.com Thu Aug 15 13:10:50 2013 From: aazores at redhat.com (Andrew Azores) Date: Thu, 15 Aug 2013 16:10:50 -0400 Subject: [rfc][icedtea-web] RH976833 ClassLoader deadlock Message-ID: <520D35CA.9070208@redhat.com> Changelog: * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: (loadClass) made unsynchronized. (available, jarIndexes, classpaths, jarEntries, jarLocationSecurityMap) wrapped in synchronized classes. An earlier change to the classloader made it possible for two threads to enter deadlock. This is resolved by not giving the thread which calls loadClass the lock on the JNLPClassLoader instance, and instead synchronizing the member variables which are accessed in loadClass and other methods called by loadClasss. Also made some for-loops into for-each-loops for readability. Thanks, -- Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: fix.patch Type: text/x-patch Size: 13932 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130815/3095a92f/fix.patch From bugzilla-daemon at icedtea.classpath.org Thu Aug 15 15:51:02 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 15 Aug 2013 22:51:02 +0000 Subject: [Bug 1523] New: can't load applet with plus (+) in the url Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1523 Bug ID: 1523 Summary: can't load applet with plus (+) in the url Classification: Unclassified Product: IcedTea-Web Version: 1.4 Hardware: x86_64 OS: Linux Status: NEW Severity: major Priority: P3 Component: Plugin Assignee: dbhole at redhat.com Reporter: samuel-icedtea at sieb.net CC: unassigned at icedtea.classpath.org If the applet path contains a + symbol, it gets converted to %20 and the download fails. This is caused by netx/net/sourceforge/jnlp/cache/ResourceTracker.java addResource calling UrlUtils.normalizeUrl. I know that + used to substitute for a space, but from the RFCs there is no indication that that is correct. At least firefox and chrome and apache accept having a + in the url without converting 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/20130815/6d1cad1b/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu Aug 15 18:17:05 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 16 Aug 2013 01:17:05 +0000 Subject: [Bug 1507] Opening a VPN episode (Citrix). Serious fatal error window pop-up. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1507 --- Comment #2 from Steve --- (In reply to comment #1) > Hi, > > Do you have more information on how to reproduce this error? Sure, anything specific I can provide to you? When I log in to my https://vpn.blahblah.com/etc account I get to the Juniper Networks. I get a Secure Access SSL VPN window where I can click a number of web bookmarks. When I click any of them they operate as expected. If I click the Citrix button to load the web interface all is good. I am taken to the Citrix ZenApp window. Here's when the trouble starts. Clicking the Windows Desktop button is when I get the IcedTea web Serious exception. Previous a number of updates (Version: 12.3.10 (2013-06-10)) this application worked. -- 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/20130816/ef28e362/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu Aug 15 18:23:04 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 16 Aug 2013 01:23:04 +0000 Subject: [Bug 1507] Opening a VPN episode (Citrix). Serious fatal error window pop-up. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1507 --- Comment #3 from Steve --- Created attachment 921 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=921&action=edit Screen shot Iced Tea Web Error Iced Tea Web plugin screeny 1.4 (suse-4.18.1-x86_64) -- 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/20130816/75488151/attachment.html From ptisnovs at icedtea.classpath.org Fri Aug 16 01:36:15 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 16 Aug 2013 08:36:15 +0000 Subject: /hg/gfx-test: Two new kernels and ROPs based on them added, four... Message-ID: changeset 01be1bd23272 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=01be1bd23272 author: Pavel Tisnovsky date: Fri Aug 16 10:39:51 2013 +0200 Two new kernels and ROPs based on them added, four new tests added into BitBltConvolveOp test suite too. diffstat: ChangeLog | 6 + src/org/gfxtest/testsuites/BitBltConvolveOp.java | 82 ++++++++++++++++++++++- 2 files changed, 82 insertions(+), 6 deletions(-) diffs (139 lines): diff -r 4477ada87429 -r 01be1bd23272 ChangeLog --- a/ChangeLog Thu Aug 15 10:20:35 2013 +0200 +++ b/ChangeLog Fri Aug 16 10:39:51 2013 +0200 @@ -1,3 +1,9 @@ +2013-08-16 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltConvolveOp.java: + Two new kernels and ROPs based on them added, four new tests added + into BitBltConvolveOp test suite too. + 2013-08-15 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r 4477ada87429 -r 01be1bd23272 src/org/gfxtest/testsuites/BitBltConvolveOp.java --- a/src/org/gfxtest/testsuites/BitBltConvolveOp.java Thu Aug 15 10:20:35 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltConvolveOp.java Fri Aug 16 10:39:51 2013 +0200 @@ -76,7 +76,7 @@ 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f - }); + }); private static final Kernel NoOpKernel5x5 = new Kernel(5, 5, new float[] { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, @@ -106,17 +106,28 @@ }); private static final Kernel SobelOperatorGx = new Kernel(3, 3, new float[] { - 1f, 0f, -1f, - 2f, 0f, -2f, - 1f, 0f, -1f + 1f, 0f, -1f, + 2f, 0f, -2f, + 1f, 0f, -1f }); private static final Kernel SobelOperatorGy = new Kernel(3, 3, new float[] { - 1f, 2f, 1f, - 0f, 0f, 0f, + 1f, 2f, 1f, + 0f, 0f, 0f, -1f, -2f, -1f }); + private static final Kernel LaplaceOperator = new Kernel(3, 3, new float[] { + 0f, 1f, 0f, + 1f,-4f, 1f, + 0f, 1f, 0f + }); + + private static final Kernel LaplaceOperatorDiag = new Kernel(3, 3, new float[] { + 1f, 1f, 1f, + 1f,-8f, 1f, + 1f, 1f, 1f + }); private static final ConvolveOp noopKernel1x1ROP = new ConvolveOp(NoOpKernel1x1); private static final ConvolveOp noopKernel3x3ROP = new ConvolveOp(NoOpKernel3x3); @@ -129,6 +140,9 @@ private static final ConvolveOp sobelOperatorGxROP = new ConvolveOp(SobelOperatorGx); private static final ConvolveOp sobelOperatorGyROP = new ConvolveOp(SobelOperatorGy); + private static final ConvolveOp laplaceOperatorROP = new ConvolveOp(LaplaceOperator); + private static final ConvolveOp laplaceOperatorDiagROP = new ConvolveOp(LaplaceOperatorDiag); + /** * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. * @@ -242,6 +256,34 @@ } /** + * 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 testBitBltEmptyBufferedImageType3ByteBGRbackgroundLaplaceOperatorROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, laplaceOperatorROP); + } + + /** + * 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 testBitBltEmptyBufferedImageType3ByteBGRbackgroundLaplaceOperatorDiagROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, laplaceOperatorDiagROP); + } + + /** * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. * * @param image @@ -578,6 +620,34 @@ } /** + * 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 testBitBltCheckerBufferedImageType3ByteBGRbackgroundLaplaceOperatorROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, laplaceOperatorROP); + } + + /** + * 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 testBitBltCheckerBufferedImageType3ByteBGRbackgroundLaplaceOperatorDiagROP(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, laplaceOperatorDiagROP); + } + + /** * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_3BYTE_BGR. * * @param image From ptisnovs at icedtea.classpath.org Fri Aug 16 01:39:36 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 16 Aug 2013 08:39:36 +0000 Subject: /hg/rhino-tests: Added two new tests getGenericSuperclass() and ... Message-ID: changeset baa3f1d2d03c in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=baa3f1d2d03c author: Pavel Tisnovsky date: Fri Aug 16 10:43:16 2013 +0200 Added two new tests getGenericSuperclass() and getGenericInterfaces() into ScriptContextClassTest. diffstat: ChangeLog | 6 ++ src/org/RhinoTests/ScriptContextClassTest.java | 54 ++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diffs (77 lines): diff -r a336cdbee118 -r baa3f1d2d03c ChangeLog --- a/ChangeLog Thu Aug 15 10:27:49 2013 +0200 +++ b/ChangeLog Fri Aug 16 10:43:16 2013 +0200 @@ -1,3 +1,9 @@ +2013-08-16 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptContextClassTest.java: + Added two new tests getGenericSuperclass() and getGenericInterfaces() + into ScriptContextClassTest. + 2013-08-15 Pavel Tisnovsky * src/org/RhinoTests/BindingsClassTest.java: diff -r a336cdbee118 -r baa3f1d2d03c src/org/RhinoTests/ScriptContextClassTest.java --- a/src/org/RhinoTests/ScriptContextClassTest.java Thu Aug 15 10:27:49 2013 +0200 +++ b/src/org/RhinoTests/ScriptContextClassTest.java Fri Aug 16 10:43:16 2013 +0200 @@ -1127,6 +1127,60 @@ } /** + * Test for method javax.script.ScriptContext.getClass().getGenericSuperclass() + */ + protected void testGetGenericSuperclass() { + Type genericSuperclass = this.scriptContextClass.getGenericSuperclass(); + assertNull(genericSuperclass, "getGenericSuperclass() does not return null"); + } + + /** + * Test for method javax.script.ScriptContext.getClass().getGenericInterfaces() + */ + protected void testGetGenericInterfaces() { + // array of interface names that should exists + final String[] genericInterfaceNames_jdk6 = { + }; + + final String[] genericInterfaceNames_jdk7 = { + }; + + final String[] genericInterfaceNames_jdk8 = { + }; + + // 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.scriptContextClass.getGenericInterfaces(); + assertNotNull(genericInterfaces, "getGenericInterfaces() returns null"); + assertEquals(0, 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 method javax.script.ScriptContext.getClass().getEnumConstants() */ protected void testGetEnumConstants() { From aazores at redhat.com Fri Aug 16 08:51:17 2013 From: aazores at redhat.com (Andrew Azores) Date: Fri, 16 Aug 2013 11:51:17 -0400 Subject: [rfc][icedtea-web] PR1271, Handle 'javascript:' urls, with tests In-Reply-To: <520254D7.2040704@redhat.com> References: <201308062126.r76LQS1v024270@mail-web01.excite.co.jp> <520254D7.2040704@redhat.com> Message-ID: <520E4A75.1060309@redhat.com> On 08/07/2013 10:08 AM, Adam Domurad wrote: > >>> + >>> + // Place an arbitrary handler, we only need the URL construction to not error-out >>> + handlers.put("javascript", new sun.net.www.protocol.http.Handler()); >>> + } catch (Exception e) { >> Uhh ahh, there are good reasons not to do this :) > Indeed, unless there are no better ideas. There isn't exactly an API for > doing this. Is there a more specific Exception type that could be caught? > > Happy hacking, > -Adam I think this looks good though. Thanks, -- Andrew A From bugzilla-daemon at icedtea.classpath.org Fri Aug 16 08:57:40 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 16 Aug 2013 15:57:40 +0000 Subject: [Bug 1513] Applet fails to load In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1513 Andrew Azores changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |aazores at redhat.com --- Comment #1 from Andrew Azores --- http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1507 Related perhaps? Very similar stack traces, reported more or less at the same time. -- 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/20130816/12b2a319/attachment.html From aph at redhat.com Fri Aug 16 10:31:39 2013 From: aph at redhat.com (Andrew Haley) Date: Fri, 16 Aug 2013 18:31:39 +0100 Subject: AArch64 Fedora OpenJDK pre-release Message-ID: <520E61FB.9090203@redhat.com> See http://aphredhat.wordpress.com/2013/08/16/openjdk-aarch64-and-fedora/ Andrew. From bugzilla-daemon at icedtea.classpath.org Fri Aug 16 11:53:39 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 16 Aug 2013 18:53:39 +0000 Subject: [Bug 1523] can't load applet with plus (+) in the url In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1523 Andrew Azores changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |aazores at redhat.com --- Comment #1 from Andrew Azores --- This seems to be a duplicate of 1465. http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1465 -- 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/20130816/5d16d8a4/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Aug 16 12:38:39 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 16 Aug 2013 19:38:39 +0000 Subject: [Bug 1507] Opening a VPN episode (Citrix). Serious fatal error window pop-up. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1507 --- Comment #4 from Andrew Azores --- (In reply to comment #2) > Previous a number of updates (Version: 12.3.10 (2013-06-10)) this > application worked. Do you mean that the application stopped working due to updates to IcedTea-Web, or due to updates to the application itself? -- 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/20130816/a2b8eddb/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Aug 16 14:56:46 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 16 Aug 2013 21:56:46 +0000 Subject: [Bug 1525] New: JVM Crash (libc.so.6, __memcpy_sse2_unaligned) while redeploying an application in glassfish from netbeans Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1525 Bug ID: 1525 Summary: JVM Crash (libc.so.6, __memcpy_sse2_unaligned) while redeploying an application in glassfish from netbeans 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: alexandre.jacob at robotrock.fr CC: unassigned at icedtea.classpath.org Created attachment 922 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=922&action=edit Crash report I'm getting this fatal error (see attachment) when trying to redeploy a web project (war) from netbeans to glassfish. Project setup : - Web Application bundled as a war - Core Application bundled as a jar The core application is a dependency of the web application, I'm using maven Steps to reproduce : - Launch Netbeans - Clean both project - Build core - Launch web project => Right now everything is fine, web application is deployed - Rebuild core - relaunching web application (without clearing it) - Glassfish crash with the attached information If I had clean the web application before redeploying it after a core build it would not have crashed. -- 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/20130816/af5d7076/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Aug 16 16:49:28 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 16 Aug 2013 23:49:28 +0000 Subject: [Bug 1507] Opening a VPN episode (Citrix). Serious fatal error window pop-up. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1507 --- Comment #5 from Steve --- Sorry I wasn't clear. The updates are the normal ones that come through with the YaST updater for OpenSUSE. So these would be the system-wide updates. -- 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/20130816/3cb7119d/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Aug 16 23:47:01 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 17 Aug 2013 06:47:01 +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 Samuel Sieb changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |samuel-icedtea at sieb.net --- Comment #12 from Samuel Sieb --- *** Bug 1523 has been marked as a duplicate of this 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/20130817/4118f3d4/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Aug 16 23:47:01 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 17 Aug 2013 06:47:01 +0000 Subject: [Bug 1523] can't load applet with plus (+) in the url In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1523 Samuel Sieb changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #2 from Samuel Sieb --- I would agree with that. I guess I missed it because it was already closed. *** This bug has been marked as a duplicate of bug 1465 *** -- 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/20130817/20ae92ef/attachment.html From ptisnovs at icedtea.classpath.org Mon Aug 19 01:43:44 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 19 Aug 2013 08:43:44 +0000 Subject: /hg/gfx-test: Added several new ROPs to the test suite Message-ID: changeset 08468f3db4f9 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=08468f3db4f9 author: Pavel Tisnovsky date: Mon Aug 19 10:47:27 2013 +0200 Added several new ROPs to the test suite BitBltAffineQuadrantRotateTransformOp. diffstat: ChangeLog | 6 + src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java | 46 ++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diffs (76 lines): diff -r 01be1bd23272 -r 08468f3db4f9 ChangeLog --- a/ChangeLog Fri Aug 16 10:39:51 2013 +0200 +++ b/ChangeLog Mon Aug 19 10:47:27 2013 +0200 @@ -1,3 +1,9 @@ +2013-08-19 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java: + Added several new ROPs to the test suite + BitBltAffineQuadrantRotateTransformOp. + 2013-08-16 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltConvolveOp.java: diff -r 01be1bd23272 -r 08468f3db4f9 src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java --- a/src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java Fri Aug 16 10:39:51 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java Mon Aug 19 10:47:27 2013 +0200 @@ -40,6 +40,16 @@ package org.gfxtest.testsuites; +import java.awt.Graphics2D; +import java.awt.RenderingHints; +import java.awt.geom.AffineTransform; +import java.awt.image.AffineTransformOp; +import java.awt.image.ConvolveOp; + + + +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; @@ -62,6 +72,42 @@ @Zoom(1) public class BitBltAffineQuadrantRotateTransformOp extends BitBltAffineTransformOp { + private static final int NUM_ROTATIONS = 5; + + private static final AffineTransform RotateTransformation[] = new AffineTransform[NUM_ROTATIONS]; + + private static final RenderingHints RenderingHintsNearestNeighbor; + private static final RenderingHints RenderingHintsBilinear; + private static final RenderingHints RenderingHintsBicubic; + + private static AffineTransformOp RotateTransformationNearest1Op[] = new AffineTransformOp[NUM_ROTATIONS]; + private static AffineTransformOp RotateTransformationBilinear1Op[] = new AffineTransformOp[NUM_ROTATIONS]; + private static AffineTransformOp RotateTransformationBicubic1Op[] = new AffineTransformOp[NUM_ROTATIONS]; + + private static AffineTransformOp RotateTransformationNearest2Op[] = new AffineTransformOp[NUM_ROTATIONS]; + private static AffineTransformOp RotateTransformationBilinear2Op[] = new AffineTransformOp[NUM_ROTATIONS]; + private static AffineTransformOp RotateTransformationBicubic2Op[] = new AffineTransformOp[NUM_ROTATIONS]; + + static + { + RenderingHintsNearestNeighbor = new RenderingHints(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR); + RenderingHintsBilinear = new RenderingHints(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR); + RenderingHintsBicubic = new RenderingHints(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC); + + for (int i = 0; i < NUM_ROTATIONS; i++) + { + RotateTransformation[i] = AffineTransform.getQuadrantRotateInstance(i); + + RotateTransformationNearest1Op[i] = new AffineTransformOp(RotateTransformation[i], AffineTransformOp.TYPE_NEAREST_NEIGHBOR); + RotateTransformationBilinear1Op[i] = new AffineTransformOp(RotateTransformation[i], AffineTransformOp.TYPE_BILINEAR); + RotateTransformationBicubic1Op[i] = new AffineTransformOp(RotateTransformation[i], AffineTransformOp.TYPE_BICUBIC); + + RotateTransformationNearest2Op[i] = new AffineTransformOp(RotateTransformation[i], RenderingHintsNearestNeighbor); + RotateTransformationBilinear2Op[i] = new AffineTransformOp(RotateTransformation[i], RenderingHintsBilinear); + RotateTransformationBicubic2Op[i] = new AffineTransformOp(RotateTransformation[i], RenderingHintsBicubic); + } + + } /** * Entry point to the test suite. * From ptisnovs at icedtea.classpath.org Mon Aug 19 02:01:10 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 19 Aug 2013 09:01:10 +0000 Subject: /hg/rhino-tests: Added new tests for checking expression return ... Message-ID: changeset 6e3bb66d34ab in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=6e3bb66d34ab author: Pavel Tisnovsky date: Mon Aug 19 11:04:52 2013 +0200 Added new tests for checking expression return types and values. diffstat: ChangeLog | 6 + src/org/RhinoTests/CompiledScriptTest.java | 96 ++++++++++++++++++++++++++++++ src/org/RhinoTests/JavaScriptSnippets.java | 22 ++++++- 3 files changed, 123 insertions(+), 1 deletions(-) diffs (172 lines): diff -r baa3f1d2d03c -r 6e3bb66d34ab ChangeLog --- a/ChangeLog Fri Aug 16 10:43:16 2013 +0200 +++ b/ChangeLog Mon Aug 19 11:04:52 2013 +0200 @@ -1,3 +1,9 @@ +2013-08-19 Pavel Tisnovsky + + * src/org/RhinoTests/CompiledScriptTest.java: + * src/org/RhinoTests/JavaScriptSnippets.java: + Added new tests for checking expression return types and values. + 2013-08-16 Pavel Tisnovsky * src/org/RhinoTests/ScriptContextClassTest.java: diff -r baa3f1d2d03c -r 6e3bb66d34ab src/org/RhinoTests/CompiledScriptTest.java --- a/src/org/RhinoTests/CompiledScriptTest.java Fri Aug 16 10:43:16 2013 +0200 +++ b/src/org/RhinoTests/CompiledScriptTest.java Mon Aug 19 11:04:52 2013 +0200 @@ -149,6 +149,30 @@ * @throws ScriptException * this exception is thrown when this test case failed. */ + protected void testEvalNumericExpression0() throws ScriptException { + final String expression = JavaScriptSnippets.NUMERIC_EXPRESSION_0; + CompiledScript script = getCompiledScript(expression); + Object result = script.eval(); + assertNotNull(result, "result should not be null"); + assertTrue(result instanceof Number, "result is not an instance of Number"); + if (getJavaVersion() >= 7) { + assertTrue(result instanceof Double, "result is not an instance of Double"); + double doubleResult = ((Double) result).doubleValue(); + assertEquals(doubleResult, 42, "wrong result " + doubleResult + " for the expression: '" + expression + "'"); + } + else { + assertTrue(result instanceof Integer, "result is not an instance of Integer"); + int integerResult = ((Integer) result).intValue(); + assertEquals(integerResult, 42, "wrong result " + integerResult + " for the expression: '" + expression + "'"); + } + } + + /** + * Test if it is possible to compile and then run script from a string. + * + * @throws ScriptException + * this exception is thrown when this test case failed. + */ protected void testEvalNumericExpression1() throws ScriptException { final String expression = JavaScriptSnippets.NUMERIC_EXPRESSION_1; CompiledScript script = getCompiledScript(expression); @@ -221,6 +245,78 @@ * @throws ScriptException * this exception is thrown when this test case failed. */ + protected void testEvalNumericExpression4() throws ScriptException { + final String expression = JavaScriptSnippets.NUMERIC_EXPRESSION_4; + CompiledScript script = getCompiledScript(expression); + Object result = script.eval(); + assertNotNull(result, "result should not be null"); + assertTrue(result instanceof Number, "result is not an instance of Number"); + if (getJavaVersion() >= 7) { + assertTrue(result instanceof Double, "result is not an instance of Double"); + double doubleResult = ((Double) result).doubleValue(); + assertEquals(doubleResult, 5, "wrong result " + doubleResult + " for the expression: '" + expression + "'"); + } + else { + assertTrue(result instanceof Integer, "result is not an instance of Integer"); + int integerResult = ((Integer) result).intValue(); + assertEquals(integerResult, 5, "wrong result " + integerResult + " for the expression: '" + expression + "'"); + } + } + + /** + * Test if it is possible to compile and then run script from a string. + * + * @throws ScriptException + * this exception is thrown when this test case failed. + */ + protected void testEvalNumericExpression5() throws ScriptException { + final String expression = JavaScriptSnippets.NUMERIC_EXPRESSION_5; + CompiledScript script = getCompiledScript(expression); + Object result = script.eval(); + assertNotNull(result, "result should not be null"); + assertTrue(result instanceof Number, "result is not an instance of Number"); + if (getJavaVersion() >= 7) { + assertTrue(result instanceof Double, "result is not an instance of Double"); + double doubleResult = ((Double) result).doubleValue(); + assertEquals(doubleResult, 7, "wrong result " + doubleResult + " for the expression: '" + expression + "'"); + } + else { + assertTrue(result instanceof Integer, "result is not an instance of Integer"); + int integerResult = ((Integer) result).intValue(); + assertEquals(integerResult, 7, "wrong result " + integerResult + " for the expression: '" + expression + "'"); + } + } + + /** + * Test if it is possible to compile and then run script from a string. + * + * @throws ScriptException + * this exception is thrown when this test case failed. + */ + protected void testEvalNumericExpression6() throws ScriptException { + final String expression = JavaScriptSnippets.NUMERIC_EXPRESSION_6; + CompiledScript script = getCompiledScript(expression); + Object result = script.eval(); + assertNotNull(result, "result should not be null"); + assertTrue(result instanceof Number, "result is not an instance of Number"); + if (getJavaVersion() >= 7) { + assertTrue(result instanceof Double, "result is not an instance of Double"); + double doubleResult = ((Double) result).doubleValue(); + assertEquals(doubleResult, 9, "wrong result " + doubleResult + " for the expression: '" + expression + "'"); + } + else { + assertTrue(result instanceof Integer, "result is not an instance of Integer"); + int integerResult = ((Integer) result).intValue(); + assertEquals(integerResult, 9, "wrong result " + integerResult + " for the expression: '" + expression + "'"); + } + } + + /** + * Test if it is possible to compile and then run script from a string. + * + * @throws ScriptException + * this exception is thrown when this test case failed. + */ protected void testEvalDoubleExpression1() throws ScriptException { final String expression = JavaScriptSnippets.DOUBLE_NUMERIC_EXPRESSION_1; CompiledScript script = getCompiledScript(expression); diff -r baa3f1d2d03c -r 6e3bb66d34ab src/org/RhinoTests/JavaScriptSnippets.java --- a/src/org/RhinoTests/JavaScriptSnippets.java Fri Aug 16 10:43:16 2013 +0200 +++ b/src/org/RhinoTests/JavaScriptSnippets.java Mon Aug 19 11:04:52 2013 +0200 @@ -1,7 +1,7 @@ /* Rhino test framework - Copyright (C) 2012 Red Hat + Copyright (C) 2012, 2013 Red Hat This file is part of IcedTea. @@ -120,6 +120,11 @@ /** * Numeric expression. */ + protected static final String NUMERIC_EXPRESSION_0 = "42"; + + /** + * Numeric expression. + */ protected static final String NUMERIC_EXPRESSION_1 = "1+2"; /** @@ -133,6 +138,21 @@ protected static final String NUMERIC_EXPRESSION_3 = "1+2*3"; /** + * Numeric expression. + */ + protected static final String NUMERIC_EXPRESSION_4 = "1*2+3"; + + /** + * Numeric expression. + */ + protected static final String NUMERIC_EXPRESSION_5 = "1+(2*3)"; + + /** + * Numeric expression. + */ + protected static final String NUMERIC_EXPRESSION_6 = "(1+2)*3"; + + /** * Numeric expression containing floating point value. */ protected static final String DOUBLE_NUMERIC_EXPRESSION_1 = "1./2"; From adomurad at redhat.com Mon Aug 19 07:38:48 2013 From: adomurad at redhat.com (Adam Domurad) Date: Mon, 19 Aug 2013 10:38:48 -0400 Subject: [rfc][icedtea-web] PR1271, Handle 'javascript:' urls, with tests In-Reply-To: <520E4A75.1060309@redhat.com> References: <201308062126.r76LQS1v024270@mail-web01.excite.co.jp> <520254D7.2040704@redhat.com> <520E4A75.1060309@redhat.com> Message-ID: <52122DF8.9080505@redhat.com> On 08/16/2013 11:51 AM, Andrew Azores wrote: > On 08/07/2013 10:08 AM, Adam Domurad wrote: >> >>>> + >>>> + // Place an arbitrary handler, we only need the URL construction to not error-out >>>> + handlers.put("javascript", new sun.net.www.protocol.http.Handler()); >>>> + } catch (Exception e) { >>> Uhh ahh, there are good reasons not to do this :) >> Indeed, unless there are no better ideas. There isn't exactly an API for >> doing this. > > Is there a more specific Exception type that could be caught? There are several, I can catch them all explicitly if you'd like. The exception should probably be logged even not in debug, come to think of it. > >> >> Happy hacking, >> -Adam > > I think this looks good though. Is that an approval ? :-) > > Thanks, > Happy hacking, -Adam From aazores at redhat.com Mon Aug 19 08:49:48 2013 From: aazores at redhat.com (Andrew Azores) Date: Mon, 19 Aug 2013 11:49:48 -0400 Subject: [rfc][icedtea-web] PR1271, Handle 'javascript:' urls, with tests In-Reply-To: <52122DF8.9080505@redhat.com> References: <201308062126.r76LQS1v024270@mail-web01.excite.co.jp> <520254D7.2040704@redhat.com> <520E4A75.1060309@redhat.com> <52122DF8.9080505@redhat.com> Message-ID: <52123E9C.8080408@redhat.com> On 08/19/2013 10:38 AM, Adam Domurad wrote: > On 08/16/2013 11:51 AM, Andrew Azores wrote: >> On 08/07/2013 10:08 AM, Adam Domurad wrote: >>>>> + >>>>> + // Place an arbitrary handler, we only need the URL construction to not error-out >>>>> + handlers.put("javascript", new sun.net.www.protocol.http.Handler()); >>>>> + } catch (Exception e) { >>>> Uhh ahh, there are good reasons not to do this :) >>> Indeed, unless there are no better ideas. There isn't exactly an API for >>> doing this. >> Is there a more specific Exception type that could be caught? > There are several, I can catch them all explicitly if you'd like. The > exception should probably be logged even not in debug, come to think of it. Up to you, I just prefer not to catch-all when feasible :) logging when not in debug also sounds like a good idea. > >>> Happy hacking, >>> -Adam >> I think this looks good though. > Is that an approval ? :-) Yes it is (other than minor nitpick above). > >> Thanks, >> > Happy hacking, > -Adam Thanks, -- Andrew A From bugzilla-daemon at icedtea.classpath.org Mon Aug 19 10:06:37 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 19 Aug 2013 17:06:37 +0000 Subject: [Bug 1271] icedtea-web does not handle 'javascript:' protocol URLs In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1271 --- Comment #3 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea-web?cmd=changeset;node=0fbf6f4ac546 author: Adam Domurad date: Mon Aug 19 13:01:03 2013 -0400 Fix PR1271: icedtea-web does not handle javascript:-protocol URLs -- 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/20130819/396b12bc/attachment.html From adomurad at icedtea.classpath.org Mon Aug 19 10:06:26 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Mon, 19 Aug 2013 17:06:26 +0000 Subject: /hg/icedtea-web: Fix PR1271: icedtea-web does not handle javascr... Message-ID: changeset 0fbf6f4ac546 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=0fbf6f4ac546 author: Adam Domurad date: Mon Aug 19 13:01:03 2013 -0400 Fix PR1271: icedtea-web does not handle javascript:-protocol URLs diffstat: ChangeLog | 15 + NEWS | 1 + plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 14 +- plugin/icedteanp/java/sun/applet/PluginMain.java | 25 +++ tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.html | 50 ++++++ tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.js | 6 + tests/reproducers/simple/JavascriptURLProtocol/srcs/JavascriptProtocol.java | 22 ++ tests/reproducers/simple/JavascriptURLProtocol/testcases/JavascriptProtocolTest.java | 78 ++++++++++ 8 files changed, 205 insertions(+), 6 deletions(-) diffs (296 lines): diff -r 6060b294b41d -r 0fbf6f4ac546 ChangeLog --- a/ChangeLog Thu Aug 15 14:57:08 2013 -0400 +++ b/ChangeLog Mon Aug 19 13:01:03 2013 -0400 @@ -1,3 +1,18 @@ +2013-08-19 Adam Domurad + + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Evaluate + javascript when it shows up in a 'showDocument' call. + * plugin/icedteanp/java/sun/applet/PluginMain.java: Install arbitrary + 'javascript:' protocol handler. + * tests/rproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.html: + Tests if javascript is run from a test applet using showDocument. + * tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.js: + Same. + * tests/reproducers/simple/JavascriptURLProtocol/srcs/JavascriptProtocol.java: + Same. + * tests/reproducers/simple/JavascriptURLProtocol/testcases/JavascriptProtocolTest.java: + Same. + 2013-08-15 Andrew Azores * netx/net/sourceforge/jnlp/ParserSettings.java: (globalParserSettings) diff -r 6060b294b41d -r 0fbf6f4ac546 NEWS --- a/NEWS Thu Aug 15 14:57:08 2013 -0400 +++ b/NEWS Mon Aug 19 13:01:03 2013 -0400 @@ -20,6 +20,7 @@ - Redesigned About dialogue layout and contents * Plugin - PR854: Resizing an applet several times causes 100% CPU load + - PR1271: icedtea-web does not handle 'javascript:'-protocol URLs New in release 1.4 (2013-XX-XX): * Added cs localization diff -r 6060b294b41d -r 0fbf6f4ac546 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Thu Aug 15 14:57:08 2013 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Aug 19 13:01:03 2013 -0400 @@ -115,6 +115,7 @@ import net.sourceforge.jnlp.splashscreen.SplashController; import net.sourceforge.jnlp.splashscreen.SplashPanel; import net.sourceforge.jnlp.splashscreen.SplashUtils; +import netscape.javascript.JSObject; import sun.awt.AppContext; import sun.awt.SunToolkit; import sun.awt.X11.XEmbeddedFrame; @@ -903,18 +904,19 @@ return v.elements(); } - /** - * Ignore. - */ public void showDocument(URL url) { PluginDebug.debug("Showing document..."); showDocument(url, "_self"); } - /** - * Ignore. - */ public void showDocument(URL url, String target) { + // If it is a javascript document, eval on current page. + if ("javascript".equals(url.getProtocol())) { + // Snip protocol off string + String evalString = url.toString().substring("javascript:".length()); + eval(getWindow(), evalString); + return; + } try { Long reference = getRequestIdentifier(); write("reference " + reference + " LoadURL " + UrlUtil.encode(url.toString(), "UTF-8") + " " + target); diff -r 6060b294b41d -r 0fbf6f4ac546 plugin/icedteanp/java/sun/applet/PluginMain.java --- a/plugin/icedteanp/java/sun/applet/PluginMain.java Thu Aug 15 14:57:08 2013 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginMain.java Mon Aug 19 13:01:03 2013 -0400 @@ -66,11 +66,15 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.lang.reflect.Field; import java.net.Authenticator; import java.net.CookieHandler; import java.net.CookieManager; import java.net.ProxySelector; +import java.net.URL; +import java.net.URLStreamHandler; import java.util.Enumeration; +import java.util.Hashtable; import java.util.Properties; import sun.awt.AppContext; import sun.awt.SunToolkit; @@ -91,6 +95,25 @@ // on whether the property that uses it is necessary/standard. private static final String theVersion = System.getProperty("java.version"); + /* Install a handler directly using reflection. This ensures that java doesn't error-out + * when javascript is used in a URL. We can then handle these URLs correctly in eg PluginAppletViewer.showDocument(). + */ + static private void installDummyJavascriptProtocolHandler() { + try { + Field handlersField = URL.class.getDeclaredField("handlers"); + handlersField.setAccessible(true); + + @SuppressWarnings("unchecked") + Hashtable handlers = (Hashtable)handlersField.get(null); + + // Place an arbitrary handler, we only need the URL construction to not error-out + handlers.put("javascript", new sun.net.www.protocol.http.Handler()); + } catch (Exception e) { + System.err.println("Unable to install 'javascript:' URL protocol handler!"); + e.printStackTrace(); + } + } + /** * The main entry point into AppletViewer. */ @@ -99,6 +122,8 @@ if (AppContext.getAppContext() == null) { SunToolkit.createNewAppContext(); } + installDummyJavascriptProtocolHandler(); + 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); diff -r 6060b294b41d -r 0fbf6f4ac546 tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.html Mon Aug 19 13:01:03 2013 -0400 @@ -0,0 +1,50 @@ + + + + + + + + + diff -r 6060b294b41d -r 0fbf6f4ac546 tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.js Mon Aug 19 13:01:03 2013 -0400 @@ -0,0 +1,6 @@ +var applet = document.getElementById('applet') + +function runSomeJS() { + applet.print("Javascript URL string was evaluated.") + applet.state = "HasRun"; +} diff -r 6060b294b41d -r 0fbf6f4ac546 tests/reproducers/simple/JavascriptURLProtocol/srcs/JavascriptProtocol.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/JavascriptURLProtocol/srcs/JavascriptProtocol.java Mon Aug 19 13:01:03 2013 -0400 @@ -0,0 +1,22 @@ +import java.applet.Applet; +import java.net.URL; +import netscape.javascript.JSObject; + +public class JavascriptProtocol extends Applet { + public String state = "HasntRun"; + @Override + public void start() { + try { + getAppletContext().showDocument(new URL("javascript:runSomeJS()")); + System.out.println("State after showDocument was " + state); + } catch (Exception e) { + e.printStackTrace(); + } + System.out.println("*** APPLET FINISHED ***"); + } + // Utility for JS side + public void print(String s) { + System.out.println(s); + } +} + diff -r 6060b294b41d -r 0fbf6f4ac546 tests/reproducers/simple/JavascriptURLProtocol/testcases/JavascriptProtocolTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/JavascriptURLProtocol/testcases/JavascriptProtocolTest.java Mon Aug 19 13:01:03 2013 -0400 @@ -0,0 +1,78 @@ +/* +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 static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import net.sourceforge.jnlp.ProcessResult; +import net.sourceforge.jnlp.ServerAccess.AutoClose; +import net.sourceforge.jnlp.annotations.Bug; +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.Test; + +public class JavascriptProtocolTest extends BrowserTest { + + private static final String END_STRING = AutoOkClosingListener.MAGICAL_OK_CLOSING_STRING; + + private static void assertContains(String source, String message, String substring) { + assertTrue(source + " should contain '" + substring + "' but did not!", + message.contains(substring)); + } + private static void assertNotContains(String source, String message, String substring) { + assertFalse(source + " should not contain '" + substring + "' but did!", + message.contains(substring)); + } + + @Test + @TestInBrowsers(testIn = { Browsers.all }) + @NeedsDisplay + @Bug(id = { "PR1271" }) + public void testJavascriptProtocolFollowed() throws Exception { + ProcessResult pr = server.executeBrowser("/JavascriptProtocol.html", + AutoClose.CLOSE_ON_BOTH); + assertNotContains("stdout", pr.stdout, "HasntRun"); + assertContains("stdout", pr.stdout, "Javascript URL string was evaluated."); + assertContains("stdout", pr.stdout, "HasRun"); + assertContains("stdout", pr.stdout, END_STRING); + } + +} From helpcrypto at gmail.com Tue Aug 20 01:57:53 2013 From: helpcrypto at gmail.com (helpcrypto helpcrypto) Date: Tue, 20 Aug 2013 10:57:53 +0200 Subject: New year Message-ID: Hello all. As I'm starting a new course next september (kind of new year), I'll like to thank you the HUGE effort you are placing on this project. That's all folks! ;) -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130820/1c13dd68/attachment.html From ptisnovs at icedtea.classpath.org Tue Aug 20 02:04:37 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 20 Aug 2013 09:04:37 +0000 Subject: /hg/gfx-test: Added several new ROPs to the test suite Message-ID: changeset 51a36cbbc011 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=51a36cbbc011 author: Pavel Tisnovsky date: Tue Aug 20 11:08:17 2013 +0200 Added several new ROPs to the test suite BitBltAffineRotateTransformOp. diffstat: ChangeLog | 6 + src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java | 145 ++++++++++ 2 files changed, 151 insertions(+), 0 deletions(-) diffs (175 lines): diff -r 08468f3db4f9 -r 51a36cbbc011 ChangeLog --- a/ChangeLog Mon Aug 19 10:47:27 2013 +0200 +++ b/ChangeLog Tue Aug 20 11:08:17 2013 +0200 @@ -1,3 +1,9 @@ +2013-08-20 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java: + Added several new ROPs to the test suite + BitBltAffineRotateTransformOp. + 2013-08-19 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java: diff -r 08468f3db4f9 -r 51a36cbbc011 src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java --- a/src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java Mon Aug 19 10:47:27 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java Tue Aug 20 11:08:17 2013 +0200 @@ -40,6 +40,15 @@ package org.gfxtest.testsuites; +import java.awt.Graphics2D; +import java.awt.RenderingHints; +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; @@ -62,6 +71,142 @@ @Zoom(1) public class BitBltAffineRotateTransformOp extends BitBltAffineTransformOp { + private static double ROTATIONS[] = {0.0, Math.PI/10.0, -Math.PI/4, Math.PI/4, Math.PI, 2 * Math.PI, 3*Math.PI/2}; + private static final int NUM_ROTATIONS = ROTATIONS.length; + + private static final AffineTransform RotateTransformation[] = new AffineTransform[NUM_ROTATIONS]; + + private static final RenderingHints RenderingHintsNearestNeighbor; + private static final RenderingHints RenderingHintsBilinear; + private static final RenderingHints RenderingHintsBicubic; + + private static AffineTransformOp RotateTransformationNearest1Op[] = new AffineTransformOp[NUM_ROTATIONS]; + private static AffineTransformOp RotateTransformationBilinear1Op[] = new AffineTransformOp[NUM_ROTATIONS]; + private static AffineTransformOp RotateTransformationBicubic1Op[] = new AffineTransformOp[NUM_ROTATIONS]; + + private static AffineTransformOp RotateTransformationNearest2Op[] = new AffineTransformOp[NUM_ROTATIONS]; + private static AffineTransformOp RotateTransformationBilinear2Op[] = new AffineTransformOp[NUM_ROTATIONS]; + private static AffineTransformOp RotateTransformationBicubic2Op[] = new AffineTransformOp[NUM_ROTATIONS]; + + static + { + RenderingHintsNearestNeighbor = new RenderingHints(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR); + RenderingHintsBilinear = new RenderingHints(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR); + RenderingHintsBicubic = new RenderingHints(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC); + + for (int i = 0; i < NUM_ROTATIONS; i++) + { + RotateTransformation[i] = AffineTransform.getRotateInstance(ROTATIONS[i]); + + RotateTransformationNearest1Op[i] = new AffineTransformOp(RotateTransformation[i], AffineTransformOp.TYPE_NEAREST_NEIGHBOR); + RotateTransformationBilinear1Op[i] = new AffineTransformOp(RotateTransformation[i], AffineTransformOp.TYPE_BILINEAR); + RotateTransformationBicubic1Op[i] = new AffineTransformOp(RotateTransformation[i], AffineTransformOp.TYPE_BICUBIC); + + RotateTransformationNearest2Op[i] = new AffineTransformOp(RotateTransformation[i], RenderingHintsNearestNeighbor); + RotateTransformationBilinear2Op[i] = new AffineTransformOp(RotateTransformation[i], RenderingHintsBilinear); + RotateTransformationBicubic2Op[i] = new AffineTransformOp(RotateTransformation[i], RenderingHintsBicubic); + } + + } + + /** + * 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 testBitBltCheckerBufferedImageType3ByteBGRRotateTransformation0Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, RotateTransformationNearest1Op[0]); + } + + /** + * 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 testBitBltCheckerBufferedImageType3ByteBGRRotateTransformation1Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, RotateTransformationNearest1Op[1]); + } + + /** + * 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 testBitBltCheckerBufferedImageType3ByteBGRRotateTransformation2Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, RotateTransformationNearest1Op[2]); + } + + /** + * 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 testBitBltCheckerBufferedImageType3ByteBGRRotateTransformation3Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, RotateTransformationNearest1Op[3]); + } + + /** + * 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 testBitBltCheckerBufferedImageType3ByteBGRRotateTransformation4Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, RotateTransformationNearest1Op[4]); + } + + /** + * 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 testBitBltCheckerBufferedImageType3ByteBGRRotateTransformation5Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, RotateTransformationNearest1Op[5]); + } + + /** + * 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 testBitBltCheckerBufferedImageType3ByteBGRRotateTransformation6Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, RotateTransformationNearest1Op[6]); + } + /** * Entry point to the test suite. * From ptisnovs at icedtea.classpath.org Tue Aug 20 02:15:58 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 20 Aug 2013 09:15:58 +0000 Subject: /hg/rhino-tests: Added four new tests for checking boolean expre... Message-ID: changeset 5674e01de2f4 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=5674e01de2f4 author: Pavel Tisnovsky date: Tue Aug 20 11:19:35 2013 +0200 Added four new tests for checking boolean expression return types and values. diffstat: ChangeLog | 8 +++- src/org/RhinoTests/CompiledScriptTest.java | 60 ++++++++++++++++++++++++++++++ src/org/RhinoTests/JavaScriptSnippets.java | 20 ++++++++++ 3 files changed, 87 insertions(+), 1 deletions(-) diffs (119 lines): diff -r 6e3bb66d34ab -r 5674e01de2f4 ChangeLog --- a/ChangeLog Mon Aug 19 11:04:52 2013 +0200 +++ b/ChangeLog Tue Aug 20 11:19:35 2013 +0200 @@ -1,8 +1,14 @@ +2013-08-20 Pavel Tisnovsky + + * src/org/RhinoTests/CompiledScriptTest.java: + * src/org/RhinoTests/JavaScriptSnippets.java: + Added four new tests for checking boolean expression return types and values. + 2013-08-19 Pavel Tisnovsky * src/org/RhinoTests/CompiledScriptTest.java: * src/org/RhinoTests/JavaScriptSnippets.java: - Added new tests for checking expression return types and values. + Added new tests for checking numeric expression return types and values. 2013-08-16 Pavel Tisnovsky diff -r 6e3bb66d34ab -r 5674e01de2f4 src/org/RhinoTests/CompiledScriptTest.java --- a/src/org/RhinoTests/CompiledScriptTest.java Mon Aug 19 11:04:52 2013 +0200 +++ b/src/org/RhinoTests/CompiledScriptTest.java Tue Aug 20 11:19:35 2013 +0200 @@ -365,6 +365,66 @@ * @throws ScriptException * this exception is thrown when this test case failed. */ + protected void testEvalBooleanExpression1() throws ScriptException { + final String expression = JavaScriptSnippets.BOOLEAN_EXPRESSION_1; + CompiledScript script = getCompiledScript(expression); + Object result = script.eval(); + assertTrue(result instanceof Boolean, "result is not an instance of Boolean"); + boolean booleanResult = ((Boolean) result).booleanValue(); + assertEquals(booleanResult, true, "wrong result " + booleanResult + " for the expression: '" + expression + "'"); + } + + /** + * Test if it is possible to compile and then run script from a string. + * + * @throws ScriptException + * this exception is thrown when this test case failed. + */ + protected void testEvalBooleanExpression2() throws ScriptException { + final String expression = JavaScriptSnippets.BOOLEAN_EXPRESSION_2; + CompiledScript script = getCompiledScript(expression); + Object result = script.eval(); + assertTrue(result instanceof Boolean, "result is not an instance of Boolean"); + boolean booleanResult = ((Boolean) result).booleanValue(); + assertEquals(booleanResult, false, "wrong result " + booleanResult + " for the expression: '" + expression + "'"); + } + + /** + * Test if it is possible to compile and then run script from a string. + * + * @throws ScriptException + * this exception is thrown when this test case failed. + */ + protected void testEvalBooleanExpression3() throws ScriptException { + final String expression = JavaScriptSnippets.BOOLEAN_EXPRESSION_3; + CompiledScript script = getCompiledScript(expression); + Object result = script.eval(); + assertTrue(result instanceof Boolean, "result is not an instance of Boolean"); + boolean booleanResult = ((Boolean) result).booleanValue(); + assertEquals(booleanResult, false, "wrong result " + booleanResult + " for the expression: '" + expression + "'"); + } + + /** + * Test if it is possible to compile and then run script from a string. + * + * @throws ScriptException + * this exception is thrown when this test case failed. + */ + protected void testEvalBooleanExpression4() throws ScriptException { + final String expression = JavaScriptSnippets.BOOLEAN_EXPRESSION_4; + CompiledScript script = getCompiledScript(expression); + Object result = script.eval(); + assertTrue(result instanceof Boolean, "result is not an instance of Boolean"); + boolean booleanResult = ((Boolean) result).booleanValue(); + assertEquals(booleanResult, true, "wrong result " + booleanResult + " for the expression: '" + expression + "'"); + } + + /** + * Test if it is possible to compile and then run script from a string. + * + * @throws ScriptException + * this exception is thrown when this test case failed. + */ protected void testEvalStringExpression1() throws ScriptException { final String expression = JavaScriptSnippets.STRING_EXPRESSION_1; CompiledScript script = getCompiledScript(expression); diff -r 6e3bb66d34ab -r 5674e01de2f4 src/org/RhinoTests/JavaScriptSnippets.java --- a/src/org/RhinoTests/JavaScriptSnippets.java Mon Aug 19 11:04:52 2013 +0200 +++ b/src/org/RhinoTests/JavaScriptSnippets.java Tue Aug 20 11:19:35 2013 +0200 @@ -168,6 +168,26 @@ protected static final String DOUBLE_NUMERIC_EXPRESSION_3 = "1./2."; /** + * Boolean expression containing simple boolean value. + */ + protected static final String BOOLEAN_EXPRESSION_1 = "true"; + + /** + * Boolean expression containing simple boolean value. + */ + protected static final String BOOLEAN_EXPRESSION_2 = "false"; + + /** + * Boolean expression. + */ + protected static final String BOOLEAN_EXPRESSION_3 = "! true"; + + /** + * Boolean expression. + */ + protected static final String BOOLEAN_EXPRESSION_4 = "! false"; + + /** * String expression (containing only string literal). */ protected static final String STRING_EXPRESSION_1 = "'Hello'"; From andrew at icedtea.classpath.org Tue Aug 20 08:27:58 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 20 Aug 2013 15:27:58 +0000 Subject: /hg/icedtea6: Rebase HotSpot 23 support on version in 7u. Message-ID: changeset a4e16f083f3b in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a4e16f083f3b author: Andrew John Hughes date: Tue Aug 20 16:27:39 2013 +0100 Rebase HotSpot 23 support on version in 7u. 2013-08-20 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add patches from IcedTea's HotSpot 23 (mainly the ARM port work). Move some patches back to being applied on both versions of HotSpot. (ports): Install ARM port in all builds. (clean-ports): Likewise for uninstall. * hotspot.map: Use HotSpot 23 from the 7u tree. * patches/arm/cc_compile-01.patch, * patches/arm/cc_compile-02.patch, * patches/arm/cc_compile-03.patch, * patches/arm/cc_compile-04.patch, * patches/arm/cc_compile-05.patch, * patches/arm/cc_compile-06.patch, * patches/hotspot/hs23/7188168-fix_debug_binaries.patch, * patches/hotspot/hs23/aarch64.patch: Patches from IcedTea's 2.3.x HotSpot. * patches/hotspot/original/alpha-fixes.patch, * patches/hotspot/hs23/alpha-fixes.patch: Split from patches/alpha-fixes.patch. * patches/hotspot/hs23/arm-01-hsx22.patch, * patches/hotspot/hs23/arm-03-invokedynamic.patch, * patches/hotspot/hs23/arm-04-invokedynamic_jit.patch, * patches/hotspot/hs23/arm-05-invokedynamic_methodhandle.patch, * patches/hotspot/hs23/arm-06-no_o0.patch, * patches/hotspot/hs23/arm-07-cleanup.patch, * patches/hotspot/hs23/arm-08-cleanup.patch, * patches/hotspot/hs23/arm-09-jvmti.patch, * patches/hotspot/hs23/arm-10-memory_protect.patch, * patches/hotspot/hs23/arm-11-thumb2_jit.patch, * patches/hotspot/hs23/arm-12-ldrexd.patch, * patches/hotspot/hs23/arm-13-sp_adjustment.patch, * patches/hotspot/hs23/arm-14-stage1.patch, * patches/hotspot/hs23/arm-15-stage2.patch, * patches/hotspot/hs23/arm-16-dont_save_locals.patch, * patches/hotspot/hs23/arm-17-no_debug_code.patch, * patches/hotspot/hs23/arm-18-correct_call.patch, * patches/hotspot/hs23/arm-19-fix_jit_bug.patch, * patches/hotspot/hs23/arm-20-function_renaming.patch, * patches/hotspot/hs23/arm-21-fix_compareandswaplong.patch, * patches/hotspot/hs23/arm-22-fix_trashed_thread_ptr.patch, * patches/hotspot/hs23/arm-25-hsx23.patch: HotSpot 23 only ARM port work. * patches/hotspot/hs23/arm-hsdis.patch: HotSpot 23 version of hsdis patch. * patches/hotspot/original/arm.patch, * patches/hotspot/hs23/arm.patch, Split from patches/arm.patch. * patches/hotspot/hs23/drop_unlicensed_test.patch: Patches from IcedTea's 2.3.x HotSpot. * patches/hotspot/original/gcc-suffix.patch, * patches/hotspot/hs23/gcc-suffix.patch: Split from patches/gcc-suffix-hotspot.patch. * patches/hotspot/original/jtreg-test7020373-fix.patch, * patches/hotspot/hs23/jtreg-test7020373-fix.patch: Split from patches/jtreg-hotspot-Test7020373-fix.patch. * patches/hotspot/hs23/no_useless_debuginfo_files.patch, * patches/hotspot/hs23/pr1101-sparc_symbols.patch: From IcedTea 2.3.x HotSpot. * patches/hotspot/original/text-relocations.patch: * patches/hotspot/hs23/text-relocations.patch: Split from patches/text-relocations.patch. * patches/hotspot/hs23/type_fixes.patch: From IcedTea 2.3.x HotSpot. * patches/hotspot/original/update-bootclasspath.patch, * patches/hotspot/hs23/update-bootclasspath.patch: Split from patches/update-bootclasspath.patch. * patches/hotspot/original/version.patch, * patches/hotspot/hs23/version.patch: Split from patches/version-hotspot.patch. * patches/hotspot/hs23/zero_fixes.patch, * patches/hotspot/hs23/zero_hs22.patch: HotSpot 23 only Zero work. * patches/hotspot/original/7032696-7029152_broke_vm.patch: Backported from 7u. * patches/hotspot/original/7140985-hsdis_caller_options.patch: Upstream version of part of the arm-hsdis patch. * patches/hotspot/original/arm-hsdis.patch: Remove 7140985 fragment. * patches/pr1095-werror.patch: Apply to both HotSpots. diffstat: ChangeLog | 84 + Makefile.am | 84 +- hotspot.map | 2 +- patches/alpha-fixes.patch | 21 - patches/arm.patch | 286 - patches/arm/cc_compile-01.patch | 23 + patches/arm/cc_compile-02.patch | 46 + patches/arm/cc_compile-03.patch | 21 + patches/arm/cc_compile-04.patch | 20 + patches/arm/cc_compile-05.patch | 29 + patches/arm/cc_compile-06.patch | 20 + patches/gcc-suffix-hotspot.patch | 31 - patches/hotspot/hs23/7188168-fix_debug_binaries.patch | 120 + patches/hotspot/hs23/aarch64.patch | 42 + patches/hotspot/hs23/alpha-fixes.patch | 21 + patches/hotspot/hs23/arm-01-hsx22.patch | 189 + patches/hotspot/hs23/arm-03-invokedynamic.patch | 171 + patches/hotspot/hs23/arm-04-invokedynamic_jit.patch | 322 + patches/hotspot/hs23/arm-05-invokedynamic_methodhandle.patch | 40 + patches/hotspot/hs23/arm-06-no_o0.patch | 32 + patches/hotspot/hs23/arm-07-cleanup.patch | 153 + patches/hotspot/hs23/arm-08-cleanup.patch | 29 + patches/hotspot/hs23/arm-09-jvmti.patch | 256 + patches/hotspot/hs23/arm-10-memory_protect.patch | 247 + patches/hotspot/hs23/arm-11-thumb2_jit.patch | 10888 ++++++++++ patches/hotspot/hs23/arm-12-ldrexd.patch | 28 + patches/hotspot/hs23/arm-13-sp_adjustment.patch | 31 + patches/hotspot/hs23/arm-14-stage1.patch | 135 + patches/hotspot/hs23/arm-15-stage2.patch | 56 + patches/hotspot/hs23/arm-16-dont_save_locals.patch | 263 + patches/hotspot/hs23/arm-17-no_debug_code.patch | 206 + patches/hotspot/hs23/arm-18-correct_call.patch | 19 + patches/hotspot/hs23/arm-19-fix_jit_bug.patch | 59 + patches/hotspot/hs23/arm-20-function_renaming.patch | 377 + patches/hotspot/hs23/arm-21-fix_compareandswaplong.patch | 52 + patches/hotspot/hs23/arm-22-fix_trashed_thread_ptr.patch | 24 + patches/hotspot/hs23/arm-25-hsx23.patch | 53 + patches/hotspot/hs23/arm-hsdis.patch | 63 + patches/hotspot/hs23/arm.patch | 295 + patches/hotspot/hs23/drop_unlicensed_test.patch | 43 + patches/hotspot/hs23/gcc-suffix.patch | 35 + patches/hotspot/hs23/jtreg-test7020373-fix.patch | 187 + patches/hotspot/hs23/no_useless_debuginfo_files.patch | 211 + patches/hotspot/hs23/pr1101-sparc_symbols.patch | 57 + patches/hotspot/hs23/text-relocations.patch | 40 + patches/hotspot/hs23/type_fixes.patch | 192 + patches/hotspot/hs23/update-bootclasspath.patch | 13 + patches/hotspot/hs23/version.patch | 56 + patches/hotspot/hs23/zero_fixes.patch | 644 + patches/hotspot/hs23/zero_hs22.patch | 216 + patches/hotspot/original/7032696-7029152_broke_vm.patch | 52 + patches/hotspot/original/7140985-hsdis_caller_options.patch | 23 + patches/hotspot/original/alpha-fixes.patch | 21 + patches/hotspot/original/arm-hsdis.patch | 10 - patches/hotspot/original/arm.patch | 286 + patches/hotspot/original/gcc-suffix.patch | 31 + patches/hotspot/original/jtreg-test7020373-fix.patch | 187 + patches/hotspot/original/text-relocations.patch | 63 + patches/hotspot/original/update-bootclasspath.patch | 13 + patches/hotspot/original/version.patch | 56 + patches/jtreg-hotspot-Test7020373-fix.patch | 187 - patches/pr1095-werror.patch | 64 + patches/text-relocations.patch | 63 - patches/update-bootclasspath.patch | 13 - patches/version-hotspot.patch | 56 - 65 files changed, 16965 insertions(+), 692 deletions(-) diffs (truncated from 17991 to 500 lines): diff -r e565715c45a7 -r a4e16f083f3b ChangeLog --- a/ChangeLog Wed Aug 14 17:20:44 2013 +0200 +++ b/ChangeLog Tue Aug 20 16:27:39 2013 +0100 @@ -1,3 +1,87 @@ +2013-08-20 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add patches from IcedTea's + HotSpot 23 (mainly the ARM port work). Move + some patches back to being applied on both + versions of HotSpot. + (ports): Install ARM port in all builds. + (clean-ports): Likewise for uninstall. + * hotspot.map: Use HotSpot 23 from the 7u + tree. + * patches/arm/cc_compile-01.patch, + * patches/arm/cc_compile-02.patch, + * patches/arm/cc_compile-03.patch, + * patches/arm/cc_compile-04.patch, + * patches/arm/cc_compile-05.patch, + * patches/arm/cc_compile-06.patch, + * patches/hotspot/hs23/7188168-fix_debug_binaries.patch, + * patches/hotspot/hs23/aarch64.patch: + Patches from IcedTea's 2.3.x HotSpot. + * patches/hotspot/original/alpha-fixes.patch, + * patches/hotspot/hs23/alpha-fixes.patch: + Split from patches/alpha-fixes.patch. + * patches/hotspot/hs23/arm-01-hsx22.patch, + * patches/hotspot/hs23/arm-03-invokedynamic.patch, + * patches/hotspot/hs23/arm-04-invokedynamic_jit.patch, + * patches/hotspot/hs23/arm-05-invokedynamic_methodhandle.patch, + * patches/hotspot/hs23/arm-06-no_o0.patch, + * patches/hotspot/hs23/arm-07-cleanup.patch, + * patches/hotspot/hs23/arm-08-cleanup.patch, + * patches/hotspot/hs23/arm-09-jvmti.patch, + * patches/hotspot/hs23/arm-10-memory_protect.patch, + * patches/hotspot/hs23/arm-11-thumb2_jit.patch, + * patches/hotspot/hs23/arm-12-ldrexd.patch, + * patches/hotspot/hs23/arm-13-sp_adjustment.patch, + * patches/hotspot/hs23/arm-14-stage1.patch, + * patches/hotspot/hs23/arm-15-stage2.patch, + * patches/hotspot/hs23/arm-16-dont_save_locals.patch, + * patches/hotspot/hs23/arm-17-no_debug_code.patch, + * patches/hotspot/hs23/arm-18-correct_call.patch, + * patches/hotspot/hs23/arm-19-fix_jit_bug.patch, + * patches/hotspot/hs23/arm-20-function_renaming.patch, + * patches/hotspot/hs23/arm-21-fix_compareandswaplong.patch, + * patches/hotspot/hs23/arm-22-fix_trashed_thread_ptr.patch, + * patches/hotspot/hs23/arm-25-hsx23.patch: + HotSpot 23 only ARM port work. + * patches/hotspot/hs23/arm-hsdis.patch: + HotSpot 23 version of hsdis patch. + * patches/hotspot/original/arm.patch, + * patches/hotspot/hs23/arm.patch, + Split from patches/arm.patch. + * patches/hotspot/hs23/drop_unlicensed_test.patch: + Patches from IcedTea's 2.3.x HotSpot. + * patches/hotspot/original/gcc-suffix.patch, + * patches/hotspot/hs23/gcc-suffix.patch: + Split from patches/gcc-suffix-hotspot.patch. + * patches/hotspot/original/jtreg-test7020373-fix.patch, + * patches/hotspot/hs23/jtreg-test7020373-fix.patch: + Split from patches/jtreg-hotspot-Test7020373-fix.patch. + * patches/hotspot/hs23/no_useless_debuginfo_files.patch, + * patches/hotspot/hs23/pr1101-sparc_symbols.patch: + From IcedTea 2.3.x HotSpot. + * patches/hotspot/original/text-relocations.patch: + * patches/hotspot/hs23/text-relocations.patch: + Split from patches/text-relocations.patch. + * patches/hotspot/hs23/type_fixes.patch: + From IcedTea 2.3.x HotSpot. + * patches/hotspot/original/update-bootclasspath.patch, + * patches/hotspot/hs23/update-bootclasspath.patch: + Split from patches/update-bootclasspath.patch. + * patches/hotspot/original/version.patch, + * patches/hotspot/hs23/version.patch: + Split from patches/version-hotspot.patch. + * patches/hotspot/hs23/zero_fixes.patch, + * patches/hotspot/hs23/zero_hs22.patch: + HotSpot 23 only Zero work. + * patches/hotspot/original/7032696-7029152_broke_vm.patch: + Backported from 7u. + * patches/hotspot/original/7140985-hsdis_caller_options.patch: + Upstream version of part of the arm-hsdis patch. + * patches/hotspot/original/arm-hsdis.patch: + Remove 7140985 fragment. + * patches/pr1095-werror.patch: Apply to both HotSpots. + 2013-08-14 Xerxes R??nby Robert Lougher diff -r e565715c45a7 -r a4e16f083f3b Makefile.am --- a/Makefile.am Wed Aug 14 17:20:44 2013 +0200 +++ b/Makefile.am Tue Aug 20 16:27:39 2013 +0100 @@ -717,34 +717,75 @@ patches/openjdk/8009987-tzdata2013b.patch \ patches/openjdk/7196533-timezone_bottleneck.patch \ patches/openjdk/6636370-appcontext_simplification.patch \ - patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch + patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch \ + patches/sparc-ptracefix.patch \ + patches/hotspot/$(HSBUILD)/alpha-fixes.patch \ + patches/hotspot/$(HSBUILD)/gcc-suffix.patch \ + patches/hotspot/$(HSBUILD)/text-relocations.patch \ + patches/hotspot/$(HSBUILD)/version.patch \ + patches/memory-limits.patch \ + patches/sh4-support.patch \ + patches/hotspot/$(HSBUILD)/aarch64.patch \ + patches/hotspot/$(HSBUILD)/arm.patch \ + patches/arm-debug.patch \ + patches/hotspot/$(HSBUILD)/jtreg-test7020373-fix.patch \ + patches/jtreg-6929067-fix.patch \ + patches/hotspot/$(HSBUILD)/update-bootclasspath.patch \ + patches/hotspot/original/jvmtiEnv.patch \ + patches/hotspot/original/7197906-handle_32_bit_shifts.patch \ + patches/sparc-trapsfix.patch \ + patches/print_lsb_release.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ patches/hotspot/hs23/remove_jsr292_tests.patch \ - patches/hotspot/hs23/revert-7017193.patch + patches/hotspot/hs23/revert-7017193.patch \ + patches/hotspot/hs23/7188168-fix_debug_binaries.patch \ + patches/hotspot/hs23/arm-01-hsx22.patch \ + patches/hotspot/hs23/arm-03-invokedynamic.patch \ + patches/hotspot/hs23/arm-04-invokedynamic_jit.patch \ + patches/hotspot/hs23/arm-05-invokedynamic_methodhandle.patch \ + patches/hotspot/hs23/arm-06-no_o0.patch \ + patches/hotspot/hs23/arm-07-cleanup.patch \ + patches/hotspot/hs23/arm-08-cleanup.patch \ + patches/hotspot/hs23/arm-09-jvmti.patch \ + patches/hotspot/hs23/arm-10-memory_protect.patch \ + patches/hotspot/hs23/arm-11-thumb2_jit.patch \ + patches/hotspot/hs23/arm-12-ldrexd.patch \ + patches/hotspot/hs23/arm-13-sp_adjustment.patch \ + patches/hotspot/hs23/arm-14-stage1.patch \ + patches/hotspot/hs23/arm-15-stage2.patch \ + patches/hotspot/hs23/arm-16-dont_save_locals.patch \ + patches/hotspot/hs23/arm-17-no_debug_code.patch \ + patches/hotspot/hs23/arm-18-correct_call.patch \ + patches/hotspot/hs23/arm-19-fix_jit_bug.patch \ + patches/hotspot/hs23/arm-20-function_renaming.patch \ + patches/hotspot/hs23/arm-21-fix_compareandswaplong.patch \ + patches/hotspot/hs23/arm-22-fix_trashed_thread_ptr.patch \ + patches/hotspot/hs23/arm-25-hsx23.patch \ + patches/hotspot/hs23/drop_unlicensed_test.patch \ + patches/hotspot/hs23/no_useless_debuginfo_files.patch \ + patches/hotspot/hs23/pr1101-sparc_symbols.patch \ + patches/hotspot/hs23/type_fixes.patch \ + patches/hotspot/hs23/zero_hs22.patch \ + patches/hotspot/hs23/zero_fixes.patch \ + patches/pr1095-werror.patch \ + patches/arm/cc_compile-01.patch \ + patches/arm/cc_compile-02.patch \ + patches/arm/cc_compile-03.patch \ + patches/arm/cc_compile-04.patch \ + patches/arm/cc_compile-05.patch \ + patches/arm/cc_compile-06.patch else # stdc-limit-macros is part of 7032458 # pr690-shark-jit-hs20.patch is part of 7032458 # pr696-zero-fast_aldc-hs20.patch is 7030207 & part of 7032458 ICEDTEA_PATCHES += \ patches/stdc-limit-macros.patch \ - patches/version-hotspot.patch \ - patches/text-relocations.patch \ - patches/gcc-suffix-hotspot.patch \ - patches/memory-limits.patch \ - patches/print_lsb_release.patch \ - patches/alpha-fixes.patch \ patches/use-idx_t.patch \ patches/params-cast-size_t.patch \ - patches/sparc-ptracefix.patch \ - patches/sparc-trapsfix.patch \ patches/openjdk/7019808-stack_noexec.patch \ - patches/sh4-support.patch \ - patches/update-bootclasspath.patch \ - patches/arm.patch \ patches/numa_on_early_glibc.patch \ - patches/jtreg-6929067-fix.patch \ patches/ia64-fix.patch \ patches/openjdk/7041156-gcc_export_dynamic.patch \ patches/openjdk/7032388-work_without_cmov_instruction.patch \ @@ -760,20 +801,19 @@ patches/jtreg-remove-test-6991596.patch \ patches/openjdk/7036220-shark_llvm_29_headers.patch \ patches/openjdk/7029152-String_intrinsics_miss_optimization.patch \ - patches/jtreg-hotspot-Test7020373-fix.patch \ patches/pr690-shark-jit-hs20.patch \ patches/pr696-zero-fast_aldc-hs20.patch \ - patches/arm-debug.patch \ patches/openjdk/7010849-modernise_sa.patch \ - patches/hotspot/original/7197906-handle_32_bit_shifts.patch \ patches/hotspot/original/fix_get_stack_bounds_leak.patch \ - patches/hotspot/original/jvmtiEnv.patch \ patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch \ - patches/hotspot/original/aarch64.patch \ + patches/hotspot/original/7032696-7029152_broke_vm.patch \ patches/hotspot/original/7022999-fastlocking_compiler1_only.patch \ - patches/hotspot/original/arm-hsdis.patch + patches/hotspot/original/7140985-hsdis_caller_options.patch endif +ICEDTEA_PATCHES += \ + patches/hotspot/$(HSBUILD)/arm-hsdis.patch + if WITH_RHINO ICEDTEA_PATCHES += \ patches/rhino.patch @@ -1386,25 +1426,21 @@ # Copy ports sources into tree stamps/ports.stamp: stamps/replace-hotspot.stamp -if !WITH_ALT_HSBUILD for target in $(abs_top_srcdir)/arm_port/hotspot/tools \ $(abs_top_srcdir)/arm_port/hotspot/src/*cpu/* ; do \ link=$$(dirname $$target | sed 's/^.*arm_port/openjdk/'); \ cp -rv $(SRC_DIR_LINK) $$target $$link; \ chmod -R ug+rwX $$link; \ done -endif mkdir -p stamps touch stamps/ports.stamp clean-ports: -if !WITH_ALT_HSBUILD for target in $(abs_top_srcdir)/arm_port/hotspot/tools \ $(abs_top_srcdir)/arm_port/hotspot/src/*cpu/* ; do \ link=$$(dirname $$target | sed 's/^.*arm_port/openjdk/'); \ rm -rf $$link; \ done -endif rm -f stamps/ports.stamp stamps/generated.stamp: stamps/ports.stamp diff -r e565715c45a7 -r a4e16f083f3b hotspot.map --- a/hotspot.map Wed Aug 14 17:20:44 2013 +0200 +++ b/hotspot.map Tue Aug 20 16:27:39 2013 +0100 @@ -1,2 +1,2 @@ # version url changeset sha256sum -hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot a6502a8a6b31 5c73225a03c33109a4cbea6274bf5af634a14feddb80ed7471af0c1445c93204 +hs23 http://hg.openjdk.java.net/jdk7u/jdk7u/hotspot jdk7u25-b15 3abb5efce289b1ac267d69410ed58e7c97e92bd9331a51c0f229b68ad9adc901 diff -r e565715c45a7 -r a4e16f083f3b patches/alpha-fixes.patch --- a/patches/alpha-fixes.patch Wed Aug 14 17:20:44 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -diff -Nru openjdk.orig/hotspot/agent/src/os/linux/Makefile openjdk/hotspot/agent/src/os/linux/Makefile ---- openjdk.orig/hotspot/agent/src/os/linux/Makefile 2010-09-19 14:44:40.000000000 +0100 -+++ openjdk/hotspot/agent/src/os/linux/Makefile 2010-09-19 15:34:47.064793576 +0100 -@@ -40,7 +40,7 @@ - - LIBS = -lthread_db - --CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) -+CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES) - - LIBSA = $(ARCH)/libsaproc.so - -@@ -73,7 +73,7 @@ - $(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(OBJS) $(LIBS) - - test.o: test.c -- $(GCC) -c -o test.o -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) test.c -+ $(GCC) -c -o test.o -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES) test.c - - test: test.o - $(GCC) -o test test.o -L$(ARCH) -lsaproc $(LIBS) diff -r e565715c45a7 -r a4e16f083f3b patches/arm.patch --- a/patches/arm.patch Wed Aug 14 17:20:44 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,286 +0,0 @@ -diff -Nru openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make ---- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make 2010-05-28 11:09:25.000000000 +0100 -+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make 2010-06-17 17:28:03.000000000 +0100 -@@ -25,6 +25,41 @@ - - # Setup common to Zero (non-Shark) and Shark versions of VM - -+ifeq ($(ZERO_LIBARCH),arm) -+ -+Obj_Files += asm_helper.o -+Obj_Files += cppInterpreter_arm.o -+Obj_Files += thumb2.o -+ -+CFLAGS += -DHOTSPOT_ASM -+ -+cppInterpreter_arm.o: offsets_arm.s bytecodes_arm.s -+thumb2.o: offsets_arm.s -+ -+offsets_arm.s: mkoffsets -+ @echo Generating assembler offsets -+ ./mkoffsets > $@ -+ -+bytecodes_arm.s: bytecodes_arm.def mkbc -+ @echo Generatine ARM assembler bytecode sequences -+ $(CC_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE) -+ -+mkbc: $(GAMMADIR)/tools/mkbc.c -+ @echo Compiling mkbc tool -+ $(CC_COMPILE) -o $@ $< $(COMPILE_DONE) -+ -+mkoffsets: asm_helper.cpp -+ @echo Compiling offset generator -+ $(QUIETLY) $(REMOVE_TARGET) -+ $(CC_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) -+ -+endif -+ -+%.o: %.S -+ @echo Assembling $< -+ $(QUIETLY) $(REMOVE_TARGET) -+ $(COMPILE.CC) -o $@ $< $(COMPILE_DONE) -+ - # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized - OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) - # The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized -diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp openjdk/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp ---- openjdk.orig/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp 2010-05-28 11:10:30.000000000 +0100 -+++ openjdk/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp 2010-06-17 17:29:30.000000000 +0100 -@@ -1,6 +1,7 @@ - /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. - * Copyright 2007 Red Hat, Inc. -+ * Copyright 2009 Edward Nevill - * 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,5 +28,54 @@ - #include "incls/_bytecodes_zero.cpp.incl" - - void Bytecodes::pd_initialize() { -- // No zero specific initialization -+#ifdef HOTSPOT_ASM -+ // Because iaccess_N can trap, we must say aload_N can trap, otherwise -+ // we get an assertion failure -+ def(_aload_1, "aload_1", "b", NULL, T_OBJECT , 1, true); -+ def(_aload_2, "aload_2", "b", NULL, T_OBJECT , 1, true); -+ def(_aload_3, "aload_3", "b", NULL, T_OBJECT , 1, true); -+ -+ def(_iaccess_0, "_iaccess_0", "b_jj", NULL, T_INT, 1, true, _aload_0); -+ def(_iaccess_1, "_iaccess_1", "b_jj", NULL, T_INT, 1, true, _aload_1); -+ def(_iaccess_2, "_iaccess_2", "b_jj", NULL, T_INT, 1, true, _aload_2); -+ def(_iaccess_3, "_iaccess_3", "b_jj", NULL, T_INT, 1, true, _aload_3); -+ -+ def(_invokeresolved, "invokeresolved", "bjj", NULL, T_ILLEGAL, -1, true, _invokevirtual); -+ def(_invokespecialresolved, "invokespecialresolved", "bjj", NULL, T_ILLEGAL, -1, true, _invokespecial); -+ def(_invokestaticresolved, "invokestaticresolved", "bjj", NULL, T_ILLEGAL, 0, true, _invokestatic); -+ -+ def(_dmac, "dmac", "b_", NULL, T_DOUBLE, -16, false, _dmul); -+ -+ def(_iload_iload, "iload_iload", "bi_i",NULL, T_INT, 2, false, _iload); -+ def(_iload_iload_N, "iload_iload_N", "bi_", NULL, T_INT, 2, false, _iload); -+ -+ def(_iload_0_iconst_N, "iload_0_iconst_N", "b_", NULL, T_INT, 2, false, _iload_0); -+ def(_iload_1_iconst_N, "iload_1_iconst_N", "b_", NULL, T_INT, 2, false, _iload_1); -+ def(_iload_2_iconst_N, "iload_2_iconst_N", "b_", NULL, T_INT, 2, false, _iload_2); -+ def(_iload_3_iconst_N, "iload_3_iconst_N", "b_", NULL, T_INT, 2, false, _iload_3); -+ def(_iload_iconst_N, "iload_iconst_N", "bi_", NULL, T_INT, 2, false, _iload); -+ -+ def(_iadd_istore_N, "iadd_istore_N", "b_", NULL, T_VOID, -2, false, _iadd); -+ def(_isub_istore_N, "isub_istore_N", "b_", NULL, T_VOID, -2, false, _isub); -+ def(_iand_istore_N, "iand_istore_N", "b_", NULL, T_VOID, -2, false, _iand); -+ def(_ior_istore_N, "ior_istore_N", "b_", NULL, T_VOID, -2, false, _ior); -+ def(_ixor_istore_N, "ixor_istore_N", "b_", NULL, T_VOID, -2, false, _ixor); -+ -+ def(_iadd_u4store, "iadd_u4store", "b_i", NULL, T_VOID, -2, false, _iadd); -+ def(_isub_u4store, "isub_u4store", "b_i", NULL, T_VOID, -2, false, _isub); -+ def(_iand_u4store, "iand_u4store", "b_i", NULL, T_VOID, -2, false, _iand); -+ def(_ior_u4store, "ior_u4store", "b_i", NULL, T_VOID, -2, false, _ior); -+ def(_ixor_u4store, "ixor_u4store", "b_i", NULL, T_VOID, -2, false, _ixor); -+ -+ def(_iload_0_iload, "iload_0_iload", "b_i", NULL, T_INT, 2, false, _iload_0); -+ def(_iload_1_iload, "iload_1_iload", "b_i", NULL, T_INT, 2, false, _iload_1); -+ def(_iload_2_iload, "iload_2_iload", "b_i", NULL, T_INT, 2, false, _iload_2); -+ def(_iload_3_iload, "iload_3_iload", "b_i", NULL, T_INT, 2, false, _iload_3); -+ -+ def(_iload_0_iload_N, "iload_0_iload_N", "b_", NULL, T_INT, 2, false, _iload_0); -+ def(_iload_1_iload_N, "iload_1_iload_N", "b_", NULL, T_INT, 2, false, _iload_1); -+ def(_iload_2_iload_N, "iload_2_iload_N", "b_", NULL, T_INT, 2, false, _iload_2); -+ def(_iload_3_iload_N, "iload_3_iload_N", "b_", NULL, T_INT, 2, false, _iload_3); -+ -+#endif // HOTSPOT_ASM - } -diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp ---- openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp 2010-06-16 14:11:07.000000000 +0100 -+++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp 2010-06-17 17:30:02.000000000 +0100 -@@ -724,10 +724,21 @@ - return generate_entry((address) CppInterpreter::normal_entry); - } - -+#ifdef HOTSPOT_ASM -+extern "C" address asm_generate_method_entry( -+ AbstractInterpreter::MethodKind kind); -+#endif // HOTSPOT_ASM -+ - address AbstractInterpreterGenerator::generate_method_entry( - AbstractInterpreter::MethodKind kind) { - address entry_point = NULL; - -+#ifdef HOTSPOT_ASM -+ address asm_entry = asm_generate_method_entry(kind); -+ if (asm_entry) -+ return ((InterpreterGenerator*) this)->generate_entry(asm_entry); -+#endif // HOTSPOT_ASM -+ - switch (kind) { - case Interpreter::zerolocals: - case Interpreter::zerolocals_synchronized: -diff -Nru openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp ---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2010-05-28 11:11:05.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2010-06-17 17:27:35.000000000 +0100 -@@ -82,6 +82,10 @@ - ShouldNotCallThis(); - } - -+#ifdef HOTSPOT_ASM -+extern "C" int asm_check_null_ptr(ucontext_t *uc); -+#endif // HOTSPOT_ASM -+ - extern "C" int - JVM_handle_linux_signal(int sig, - siginfo_t* info, -@@ -89,6 +93,12 @@ - int abort_if_unrecognized) { - ucontext_t* uc = (ucontext_t*) ucVoid; - -+#ifdef HOTSPOT_ASM -+ if (sig == SIGSEGV) { -+ if (asm_check_null_ptr(uc)) return 1; -+ } -+#endif // HOTSPOT_ASM -+ - Thread* t = ThreadLocalStorage::get_thread_slow(); - - SignalHandlerMark shm(t); -diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp openjdk/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp ---- openjdk.orig/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp 2011-01-25 22:57:24.000000000 +0000 -+++ openjdk/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp 2011-01-28 01:46:18.769782690 +0000 -@@ -1,6 +1,7 @@ - /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2009 Red Hat, Inc. -+ * Copyright 2009 Edward Nevill - * 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,6 +27,44 @@ - #ifndef CPU_ZERO_VM_BYTECODES_ZERO_HPP - #define CPU_ZERO_VM_BYTECODES_ZERO_HPP - --// This file is intentionally empty -+#ifdef HOTSPOT_ASM -+#define _iaccess_0 ((Bytecodes::Code)0xdb) -+#define _iaccess_1 ((Bytecodes::Code)0xdc) -+#define _iaccess_2 ((Bytecodes::Code)0xdd) -+#define _iaccess_3 ((Bytecodes::Code)0xde) -+ -+#define _invokeresolved ((Bytecodes::Code)0xdf) -+#define _invokespecialresolved ((Bytecodes::Code)0xe0) -+#define _invokestaticresolved ((Bytecodes::Code)0xe1) -+ -+#define _iload_iload ((Bytecodes::Code)0xe3) -+#define _iload_iload_N ((Bytecodes::Code)0xe4) -+ -+#define _dmac ((Bytecodes::Code)0xe8) -+ -+ _iload_0_iconst_N , // 233 0xe9 -+ _iload_1_iconst_N , // 234 0xea -+ _iload_2_iconst_N , // 235 0xeb -+ _iload_3_iconst_N , // 236 0xec -+ _iload_iconst_N , // 237 0xed -+ _iadd_istore_N , // 238 0xee -+ _isub_istore_N , // 239 0xef -+ _iand_istore_N , // 240 0xf0 -+ _ior_istore_N , // 241 0xf1 -+ _ixor_istore_N , // 242 0xf2 -+ _iadd_u4store , // 243 0xf3 -+ _isub_u4store , // 244 0xf4 -+ _iand_u4store , // 245 0xf5 -+ _ior_u4store , // 246 0xf6 -+ _ixor_u4store , // 247 0xf7 -+ _iload_0_iload , // 248 0xf8 -+ _iload_1_iload , // 249 0xf9 -+ _iload_2_iload , // 250 0xfa -+ _iload_3_iload , // 251 0xfb -+ _iload_0_iload_N , // 252 0xfc -+ _iload_1_iload_N , // 253 0xfd -+ _iload_2_iload_N , // 254 0xfe -+ _iload_3_iload_N , // 255 0xff -+#endif // HOTSPOT_ASM - - #endif // CPU_ZERO_VM_BYTECODES_ZERO_HPP ---- openjdk/hotspot/make/linux/makefiles/vm.make 2011-09-16 14:22:51.000000000 +0100 -+++ openjdk/hotspot/make/linux/makefiles/vm.make 2011-09-16 16:04:50.000000000 +0100 -@@ -183,7 +183,7 @@ - # Locate all source files in the given directory, excluding files in Src_Files_EXCLUDE. - define findsrc - $(notdir $(shell find $(1)/. ! -name . -prune \ -- -a \( -name \*.c -o -name \*.cpp -o -name \*.s \) \ From ptisnovs at icedtea.classpath.org Wed Aug 21 01:27:05 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 21 Aug 2013 08:27:05 +0000 Subject: /hg/gfx-test: Another ten new tests added into BitBltBasicTests ... Message-ID: changeset 928f2af52488 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=928f2af52488 author: Pavel Tisnovsky date: Wed Aug 21 10:30:47 2013 +0200 Another 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 51a36cbbc011 -r 928f2af52488 ChangeLog --- a/ChangeLog Tue Aug 20 11:08:17 2013 +0200 +++ b/ChangeLog Wed Aug 21 10:30:47 2013 +0200 @@ -1,3 +1,8 @@ +2013-08-21 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + Another ten new tests added into BitBltBasicTests test suite. + 2013-08-20 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java: diff -r 51a36cbbc011 -r 928f2af52488 src/org/gfxtest/testsuites/BitBltBasicTests.java --- a/src/org/gfxtest/testsuites/BitBltBasicTests.java Tue Aug 20 11:08:17 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Wed Aug 21 10:30:47 2013 +0200 @@ -5368,6 +5368,158 @@ } /** + * Test basic BitBlt operation for vertical yellow 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 testBitBltVerticalYellowGradientBufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithVerticalYellowGradientImage(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY); + } + + /** + * Test basic BitBlt operation for texture RGB pattern #1 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 testBitBltRGBTexture1BufferedImageType3ByteBGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture1Image(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR); + } + + /** + * Test basic BitBlt operation for texture RGB pattern #1 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 testBitBltRGBTexture1BufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture1Image(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR); + } + + /** + * Test basic BitBlt operation for texture RGB pattern #1 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 testBitBltRGBTexture1BufferedImageType4ByteABGR_PRE(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture1Image(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE); + } + + /** + * Test basic BitBlt operation for texture RGB pattern #1 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 testBitBltRGBTexture1BufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture1Image(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); + } + + /** + * Test basic BitBlt operation for texture RGB pattern #1 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 testBitBltRGBTexture1BufferedImageTypeByteIndexed(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture1Image(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED); + } + + /** + * Test basic BitBlt operation for texture RGB pattern #1 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 testBitBltRGBTexture1BufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture1Image(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY); + } + + /** + * Test basic BitBlt operation for texture RGB pattern #1 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 testBitBltRGBTexture1BufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture1Image(image, graphics2d, BufferedImage.TYPE_INT_BGR); + } + + /** + * Test basic BitBlt operation for texture RGB pattern #1 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 testBitBltRGBTexture1BufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture1Image(image, graphics2d, BufferedImage.TYPE_INT_RGB); + } + + /** + * Test basic BitBlt operation for texture RGB pattern #1 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 testBitBltRGBTexture1BufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture1Image(image, graphics2d, BufferedImage.TYPE_INT_ARGB); + } + + /** * Entry point to the test suite. * * @param args not used in this case From dbhole at redhat.com Wed Aug 21 06:01:59 2013 From: dbhole at redhat.com (Deepak Bhole) Date: Wed, 21 Aug 2013 09:01:59 -0400 Subject: New year In-Reply-To: References: Message-ID: <20130821130159.GV30200@redhat.com> * helpcrypto helpcrypto [2013-08-20 05:07]: > Hello all. > > > As I'm starting a new course next september (kind of new year), I'll like to > thank you the HUGE effort you are placing on this project. > Thank _you_ very much for all your efforts to help make icedtea-web a better project! Best of luck with the new courses :) Cheers, Deepak > That's all folks! > ;) From andrew at icedtea.classpath.org Wed Aug 21 06:25:45 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 21 Aug 2013 13:25:45 +0000 Subject: /hg/release/icedtea7-forest-2.4: 23 new changesets Message-ID: changeset cda093be8c6d in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=cda093be8c6d author: katleman date: Wed Jul 17 11:09:12 2013 -0700 Added tag jdk7u40-b34 for changeset a1ae13479e87 changeset f6f6f414cdfe in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=f6f6f414cdfe author: tbell date: Wed Jul 17 06:06:42 2013 -0700 8012366: Fix for 8007815 breaks down when only building OpenJDK (without deploy and install forests) Reviewed-by: dholmes, robilad changeset af755d12719e in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=af755d12719e author: lana date: Thu Jul 18 11:17:46 2013 -0700 Merge changeset 99b7811ca8ce in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=99b7811ca8ce author: katleman date: Wed Jul 24 14:44:49 2013 -0700 Added tag jdk7u40-b35 for changeset af755d12719e changeset da9a0cdf4afc in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=da9a0cdf4afc author: asaha date: Thu Apr 11 10:29:22 2013 -0700 Merge changeset 00d6834cb258 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=00d6834cb258 author: katleman date: Wed May 01 14:51:37 2013 -0700 Added tag jdk7u21-b31 for changeset da9a0cdf4afc changeset 183ae0f6af51 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=183ae0f6af51 author: asaha date: Thu Jun 06 13:13:37 2013 -0700 Merge changeset 5c8e90834e17 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=5c8e90834e17 author: katleman date: Tue May 28 10:36:17 2013 -0700 Added tag jdk7u21-b50 for changeset 170520883597 changeset eeb29025d52a in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=eeb29025d52a author: asaha date: Thu Jun 06 17:05:24 2013 -0700 Merge changeset e571b5c75bd1 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=e571b5c75bd1 author: katleman date: Tue Jun 11 17:48:54 2013 -0700 Added tag jdk7u25-b31 for changeset eeb29025d52a changeset 161e4656fea4 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=161e4656fea4 author: katleman date: Tue Jun 18 11:14:44 2013 -0700 Added tag jdk7u25-b33 for changeset e571b5c75bd1 changeset 0a668ed4711f in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=0a668ed4711f author: asaha date: Tue Jul 16 15:03:05 2013 -0700 Merge changeset b23a7a45d957 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=b23a7a45d957 author: katleman date: Thu Jul 18 20:46:09 2013 -0700 Added tag jdk7u25-b34 for changeset 161e4656fea4 changeset d2f28b069dc8 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=d2f28b069dc8 author: asaha date: Fri Jul 19 22:17:36 2013 -0700 Merge changeset a18ee06070df in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=a18ee06070df author: asaha date: Tue Jul 23 20:38:20 2013 -0700 Merge changeset e4bc26c4119a in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=e4bc26c4119a author: asaha date: Wed Jul 24 18:50:58 2013 -0700 Merge changeset 53fe3334f0b3 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=53fe3334f0b3 author: jeff date: Thu Jul 25 12:20:52 2013 -0700 8014850: Third Party License Readme updates for 7u40 Reviewed-by: lana, tbell changeset 59598f7b6a7b in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=59598f7b6a7b author: lana date: Thu Jul 25 14:09:48 2013 -0700 Merge changeset 5bfb3aa1655e in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=5bfb3aa1655e author: cl date: Wed Jul 31 21:26:52 2013 -0700 Added tag jdk7u40-b36 for changeset 59598f7b6a7b changeset 7d3e6ccad487 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=7d3e6ccad487 author: asaha date: Fri Aug 02 13:10:09 2013 -0700 Added tag jdk7u40-b37 for changeset 5bfb3aa1655e changeset a2ba8e069718 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=a2ba8e069718 author: asaha date: Wed Aug 07 12:08:58 2013 -0700 Added tag jdk7u40-b38 for changeset 7d3e6ccad487 changeset c9157eb582a5 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=c9157eb582a5 author: katleman date: Mon Aug 12 12:07:28 2013 -0700 Added tag jdk7u40-b39 for changeset a2ba8e069718 changeset 930763affcf3 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=930763affcf3 author: andrew date: Wed Aug 21 14:21:18 2013 +0100 Merge jdk7u40-b40 diffstat: .hgtags | 21 +++++++++++++++++++++ .jcheck/conf | 2 -- Makefile | 2 +- THIRD_PARTY_README | 33 +++++++++++++++++++++++++++++++-- make/Defs-internal.gmk | 3 ++- 5 files changed, 55 insertions(+), 6 deletions(-) diffs (194 lines): diff -r a1ae13479e87 -r 930763affcf3 .hgtags --- a/.hgtags Wed Jul 10 13:48:44 2013 -0700 +++ b/.hgtags Wed Aug 21 14:21:18 2013 +0100 @@ -50,6 +50,7 @@ 3ac6dcf7823205546fbbc3d4ea59f37358d0b0d4 jdk7-b73 2c88089b6e1c053597418099a14232182c387edc jdk7-b74 d1516b9f23954b29b8e76e6f4efc467c08c78133 jdk7-b75 +f0bfd9bd1a0e674288a8a4d17dcbb9e632b42e6d icedtea7-1.12 c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76 1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77 ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78 @@ -63,6 +64,7 @@ 433a60a9c0bf1b26ee7e65cebaa89c541f497aed jdk7-b86 6b1069f53fbc30663ccef49d78c31bb7d6967bde jdk7-b87 82135c848d5fcddb065e98ae77b81077c858f593 jdk7-b88 +195fcceefddce1963bb26ba32920de67806ed2db icedtea7-1.13 7f1ba4459972bf84b8201dc1cc4f62b1fe1c74f4 jdk7-b89 425ba3efabbfe0b188105c10aaf7c3c8fa8d1a38 jdk7-b90 97d8b6c659c29c8493a8b2b72c2796a021a8cf79 jdk7-b91 @@ -111,6 +113,7 @@ ddc2fcb3682ffd27f44354db666128827be7e3c3 jdk7-b134 783bd02b4ab4596059c74b10a1793d7bd2f1c157 jdk7-b135 2fe76e73adaa5133ac559f0b3c2c0707eca04580 jdk7-b136 +d4aea1a51d625f5601c840714c7c94f1de5bc1af icedtea-1.14 7654afc6a29e43cb0a1343ce7f1287bf690d5e5f jdk7-b137 fc47c97bbbd91b1f774d855c48a7e285eb1a351a jdk7-b138 7ed6d0b9aaa12320832a7ddadb88d6d8d0dda4c1 jdk7-b139 @@ -123,6 +126,7 @@ 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146 3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01 d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147 +3defd24c2671eb2e7796b5dc45b98954341d73a7 icedtea-2.0-branchpoint 34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02 bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03 f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04 @@ -141,6 +145,7 @@ b2deaf5bde5ec455a06786e8e2aea2e673be13aa jdk7u2-b12 c95558e566ac3605c480a3d070b1102088dab07f jdk7u2-b13 e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u2-b21 +a66b58021165f5a43e3974fe5fb9fead29824098 icedtea-2.1-branchpoint e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u3-b02 becd013ae6072a6633ba015fc4f5862fca589cee jdk7u3-b03 d64361a28584728aa25dca3781cffbaf4199e088 jdk7u3-b04 @@ -157,6 +162,7 @@ 2b07c262a8a9ff78dc908efb9d7b3bb099df9ac4 jdk7u4-b10 1abfee16e8cc7e3950052befa78dbf14a5ca9cfc jdk7u4-b11 e6f915094dccbba16df6ebeb002e6867392eda40 jdk7u4-b12 +e7886f5ad6cc837092386fa513e670d4a770456c icedtea-2.2-branchpoint 9108e3c2f07ffa218641d93893ac9928e95d213a jdk7u4-b13 d9580838fd08872fc0da648ecfc6782704b4aac1 jdk7u4-b14 008753000680a2008175d14b25373356f531aa07 jdk7u4-b15 @@ -191,6 +197,7 @@ 528f1589f5f2adf18d5d21384ba668b9aa79841e jdk7u6-b15 7b77364eb09faac4c37ce9dd2c2308ca5525f18f jdk7u6-b16 b7c1b441d131c70278de299b5d1e59dce0755dc5 jdk7u6-b17 +0e7b94bd450d4270d4e9bd6c040c94fa4be714a6 icedtea-2.3-branchpoint 9c41f7b1460b106d18676899d24b6ea07de5a369 jdk7u6-b18 56291720b5e578046bc02761dcad2a575f99fd8e jdk7u6-b19 e79fa743fe5a801db4acc7a7daa68f581423e5d3 jdk7u6-b20 @@ -258,6 +265,7 @@ c3e42860af1cfd997fe1895594f652f0d1e9984e jdk7u12-b07 1a03ef4794dc8face4de605ae480d4c763e6b494 jdk7u12-b08 87cf81226f2012e5c21131adac7880f7e4da1133 jdk7u12-b09 +8a10a3c51f1cd88009008cf1b82071797b5f516d icedtea-2.4-branchpoint 745a15bb6d94765bb5c68048ff146590df9b8441 jdk7u14-b10 2d8fdaa5bb55b937028e385633ce58de4dcdb69c jdk7u14-b11 594dbbbb84add4aa310d51af7e298470d8cda458 jdk7u14-b12 @@ -288,7 +296,9 @@ 602ad1a5b09fb9136e8bf1b708e0524fbdb35324 jdk7u21-b10 fa322ca378324750ea049f2e92357e51eca27ae4 jdk7u21-b11 450e8dde919df278fe75ae95e0eb0a6464f5bc41 jdk7u21-b30 +170520883597f90771aca8251a8d089e7566e4bf jdk7u21-b50 170520883597f90771aca8251a8d089e7566e4bf jdk7u21-b12 +da9a0cdf4afcfae3a7c47565e9acfd9170ba5a30 jdk7u21-b31 50bfbd21bf42f6ae4167226ac45cd79e0ab7758c jdk7u25-b03 a94c9aa356bbed13c1e2b4a9a380117ddff1668f jdk7u25-b04 29a789ae14dc09a50eb45d3445075642e77490a2 jdk7u25-b05 @@ -302,6 +312,9 @@ 37c4268341d79b16165bdaf7e1fad489d692bc83 jdk7u25-b13 9de1fc3635def64c19c51f272f09b51d8cf0ca98 jdk7u25-b14 2197dde877124579204c5266fa9d89166760b44f jdk7u25-b15 +eeb29025d52ab4ea9bc4f5afa37c3a4fbcaf0011 jdk7u25-b31 +e571b5c75bd194c1aaad6e8e75b1d40f6208391c jdk7u25-b33 +161e4656fea4720ececade6892247a73a2e31a42 jdk7u25-b34 9846c505054fb91762f3fd9b817d1a9760322029 jdk7u25-b30 12c2f4ce55d074f0be94781d98cbbbcf8299b666 jdk7u25-b16 40fde76d9b89f5acc63f4eeeccdc261d9999bf39 jdk7u25-b32 @@ -312,6 +325,7 @@ d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19 b4b7795ef8047e3d2b2ba48a70c08d9184073100 jdk7u14-b19 f413e7a22c198559af5aca28309356e6d4edd78f jdk7u14-b20 +30065a72715f046e4a4bdec1c0cc7d65153c9d99 icedtea-2.4.0 41686e19d8189a546434a52dd9679e9b6a0a68be jdk7u14-b21 3e3177719b43f732239d6d51e96d26ee18440960 jdk7u14-b22 8c6e2197930c79f6beafd83181714cc817b83229 jdk7u40-b23 @@ -322,6 +336,13 @@ ac751f3867ecffca814b25daf5e19d82d83fc755 jdk7u40-b28 dbe42a627813892d1bb59a4240c24f60ef22930a jdk7u40-b29 1c141e6fde911c4974c87e340eb698754607f422 jdk7u40-b30 +ae86c6974e8ee35ef66121810ea9e748b7e677d9 icedtea-2.4.1 58a2a470aa3bccd3eb3624e68bca9397c8cc26a2 jdk7u40-b31 da376fd5e4d68f8a45003a6e175267dc840711cc jdk7u40-b32 3fdfe7f1b06354e11e8af51b7c653c8a0adb3987 jdk7u40-b33 +a1ae13479e8767329fa20774b5cea5976aaeb37b jdk7u40-b34 +af755d12719e898e3af917e8a56b64ebf83019bc jdk7u40-b35 +59598f7b6a7be5e0470447694c1f5b7d951f6ff1 jdk7u40-b36 +5bfb3aa1655e5364a8c1c17343ff84dad7e13f25 jdk7u40-b37 +7d3e6ccad487d84e764932802cd42d2afebccd7a jdk7u40-b38 +a2ba8e069718677c267b3894df2a719148c15ac8 jdk7u40-b39 diff -r a1ae13479e87 -r 930763affcf3 .jcheck/conf --- a/.jcheck/conf Wed Jul 10 13:48:44 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r a1ae13479e87 -r 930763affcf3 Makefile --- a/Makefile Wed Jul 10 13:48:44 2013 -0700 +++ b/Makefile Wed Aug 21 14:21:18 2013 +0100 @@ -263,7 +263,7 @@ ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)/$(REL_JDK_OUTPUTDIR) \ DEBUG_NAME=$(DEBUG_NAME) \ GENERATE_DOCS=false \ - BUILD_INSTALL_BUNDLES=true \ + $(if $(findstring true,$(BUILD_INSTALL)),BUILD_INSTALL_BUNDLES=true,) \ CREATE_DEBUGINFO_BUNDLES=false \ $(BOOT_CYCLE_DEBUG_SETTINGS) \ generic_build_repo_series diff -r a1ae13479e87 -r 930763affcf3 THIRD_PARTY_README --- a/THIRD_PARTY_README Wed Jul 10 13:48:44 2013 -0700 +++ b/THIRD_PARTY_README Wed Aug 21 14:21:18 2013 +0100 @@ -1912,6 +1912,35 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to Sparkle v.1.5, +which is included with JRE 7 on Mac OS X. + +--- begin of LICENSE --- + +Copyright (c) 2012 Sparkle.org and Andy Matuschak + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- + %% Portions licensed from Taligent, Inc. ------------------------------------------------------------------------------- @@ -3169,12 +3198,12 @@ %% This notice is provided with respect to the following which is included with JRE 7, JDK 7, and OpenJDK 7, except where noted: - Apache Derby 10.8.1.2 [included with JDK 7 only] + Apache Derby 10.8.3.0 [included with JDK 7 only] Apache Jakarta BCEL 5.2 Apache Jakarta Regexp 1.4 Apache Santuario XMLSec-Java 1.4.2 Apache Xalan-Java 2.7.1 - Apache Xerces2 Java 2.10.0 + Apache Xerces2 Java 2.11.0 Apache XML Resolver 1.1 diff -r a1ae13479e87 -r 930763affcf3 make/Defs-internal.gmk --- a/make/Defs-internal.gmk Wed Jul 10 13:48:44 2013 -0700 +++ b/make/Defs-internal.gmk Wed Aug 21 14:21:18 2013 +0100 @@ -322,7 +322,8 @@ JDK_MICRO_VERSION=$(JDK_MICRO_VERSION) \ PREVIOUS_MAJOR_VERSION=$(PREVIOUS_MAJOR_VERSION) \ PREVIOUS_MINOR_VERSION=$(PREVIOUS_MINOR_VERSION) \ - PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION) + PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION) \ + STATIC_CXX=$(STATIC_CXX) ifdef ARCH_DATA_MODEL COMMON_BUILD_ARGUMENTS += ARCH_DATA_MODEL=$(ARCH_DATA_MODEL) From andrew at icedtea.classpath.org Wed Aug 21 06:25:51 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 21 Aug 2013 13:25:51 +0000 Subject: /hg/release/icedtea7-forest-2.4/corba: 21 new changesets Message-ID: changeset fab3339a833d in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=fab3339a833d author: katleman date: Wed Jul 17 11:09:13 2013 -0700 Added tag jdk7u40-b34 for changeset ddd543ddf330 changeset 061560751a50 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=061560751a50 author: katleman date: Wed Jul 24 14:44:50 2013 -0700 Added tag jdk7u40-b35 for changeset fab3339a833d changeset c0231d18f496 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=c0231d18f496 author: asaha date: Thu Apr 11 10:30:31 2013 -0700 Merge changeset 0512c60bbff6 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=0512c60bbff6 author: katleman date: Wed May 01 14:51:40 2013 -0700 Added tag jdk7u21-b31 for changeset c0231d18f496 changeset e1b39a63a6c3 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=e1b39a63a6c3 author: asaha date: Thu Jun 06 13:14:04 2013 -0700 Merge changeset eca82267e36c in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=eca82267e36c author: katleman date: Tue May 28 10:36:22 2013 -0700 Added tag jdk7u21-b50 for changeset fa2a377ce52d changeset ddff7b2f69fa in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=ddff7b2f69fa author: asaha date: Thu Jun 06 20:18:27 2013 -0700 Merge changeset 9e2247c5d4b8 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=9e2247c5d4b8 author: katleman date: Tue Jun 11 17:48:55 2013 -0700 Added tag jdk7u25-b31 for changeset ddff7b2f69fa changeset 1e888b6e1fb6 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=1e888b6e1fb6 author: katleman date: Tue Jun 18 11:14:50 2013 -0700 Added tag jdk7u25-b33 for changeset 9e2247c5d4b8 changeset 2d046d428608 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=2d046d428608 author: asaha date: Tue Jul 16 15:03:56 2013 -0700 Merge changeset ab49640a802e in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=ab49640a802e author: katleman date: Thu Jul 18 20:46:16 2013 -0700 Added tag jdk7u25-b34 for changeset 1e888b6e1fb6 changeset 9d6dfd600c51 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=9d6dfd600c51 author: asaha date: Fri Jul 19 22:17:58 2013 -0700 Merge changeset 692651f89f35 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=692651f89f35 author: asaha date: Tue Jul 23 20:38:34 2013 -0700 Merge changeset 9e13de8fda1e in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=9e13de8fda1e author: asaha date: Wed Jul 24 18:51:17 2013 -0700 Merge changeset 3eaff5b0cd97 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=3eaff5b0cd97 author: jeff date: Thu Jul 25 12:29:53 2013 -0700 8014850: Third Party License Readme updates for 7u40 Reviewed-by: lana, tbell changeset cd3871b15169 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=cd3871b15169 author: lana date: Thu Jul 25 14:09:57 2013 -0700 Merge changeset dc9a63376b39 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=dc9a63376b39 author: cl date: Wed Jul 31 21:26:55 2013 -0700 Added tag jdk7u40-b36 for changeset cd3871b15169 changeset 8391dff270bb in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=8391dff270bb author: asaha date: Fri Aug 02 13:10:12 2013 -0700 Added tag jdk7u40-b37 for changeset dc9a63376b39 changeset d7c73fd53c84 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=d7c73fd53c84 author: asaha date: Wed Aug 07 12:09:01 2013 -0700 Added tag jdk7u40-b38 for changeset 8391dff270bb changeset a91b57bf60bd in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=a91b57bf60bd author: katleman date: Mon Aug 12 12:07:29 2013 -0700 Added tag jdk7u40-b39 for changeset d7c73fd53c84 changeset edc7119d7a2a in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=edc7119d7a2a author: andrew date: Wed Aug 21 14:21:19 2013 +0100 Merge jdk7u40-b40 diffstat: .hgtags | 21 +++++++++++++++++++++ .jcheck/conf | 2 -- THIRD_PARTY_README | 33 +++++++++++++++++++++++++++++++-- make/Makefile | 2 +- make/common/shared/Platform.gmk | 9 +++++++++ 5 files changed, 62 insertions(+), 5 deletions(-) diffs (214 lines): diff -r ddd543ddf330 -r edc7119d7a2a .hgtags --- a/.hgtags Wed Jul 10 13:48:45 2013 -0700 +++ b/.hgtags Wed Aug 21 14:21:19 2013 +0100 @@ -50,6 +50,7 @@ b751c528c55560cf2adeaeef24b39ca1f4d1cbf7 jdk7-b73 5d0cf59a3203b9f57aceebc33ae656b884987955 jdk7-b74 0fb137085952c8e47878e240d1cb40f14de463c4 jdk7-b75 +d728db3889da23d9f74e45154b9261a43b4acd8d icedtea7-1.12 937144222e2219939101b0129d26a872a7956b13 jdk7-b76 6881f0383f623394b5ec73f27a5f329ff55d0467 jdk7-b77 a7f7276b48cd74d8eb1baa83fbf3d1ef4a2603c8 jdk7-b78 @@ -63,6 +64,7 @@ 6253e28826d16cf1aecc39ce04c8de1f6bf2df5f jdk7-b86 09a41111a401d327f65e453384d976a10154d9ea jdk7-b87 39e14d2da687c7e592142137517aaf689544820f jdk7-b88 +e805b4155d76f76d40ffae36a74546f79218c539 icedtea7-1.13 bb4424c5e778b842c064a8b1aa902b35f4397654 jdk7-b89 56ce07b0eb47b93a98a72adef0f21e602c460623 jdk7-b90 bcd2fc089227559ac5be927923609fac29f067fa jdk7-b91 @@ -111,6 +113,7 @@ 918003855fa0dba5acf4bf1fe36526d2fc4c1ba8 jdk7-b134 e0b72ae5dc5e824b342801c8d1d336a55eb54e2c jdk7-b135 48ef0c712e7cbf272f47f9224db92a3c6a9e2612 jdk7-b136 +b62418551e20fa19fbf57c49d4378b7096809e60 icedtea-1.14 a66c01d8bf895261715955df0b95545c000ed6a8 jdk7-b137 78d8cf04697e9df54f7f11e195b7da29b8e345a2 jdk7-b138 60b074ec6fcf5cdf9efce22fdfb02326ed8fa2d3 jdk7-b139 @@ -123,6 +126,7 @@ 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146 36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01 73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147 +d034cc90ecc266d78b87d1429c426669431fcc1f icedtea-2.0-branchpoint 9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02 dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03 eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04 @@ -141,6 +145,7 @@ 56b02f8ef70391a67c9fa71157a8faafbdff4b74 jdk7u2-b12 456ff1f14b14ef8cfe47cef95c8094f8443fa092 jdk7u2-b13 62b846b0c3259cae732e75df50a1b180a2541178 jdk7u2-b21 +ecb9fc90dea4720f5c1ba1354364ed610f463e41 icedtea-2.1-branchpoint 1b648adeeefa9b1fb022459e8e4f590b736c0fdd jdk7u3-b02 730fa05af5a9d10a3a7a1626d248b96d09f8069f jdk7u3-b03 7f7a9b1addb4925f4f6e17f6eb5cce986c3b626d jdk7u3-b04 @@ -157,6 +162,7 @@ 23777178e7eb61859be3f7240561aa1034ff9221 jdk7u4-b10 bdc37f3c09b6008667aff77432bb6d31cbae945e jdk7u4-b11 fddc26b35a31884d64315cf7c296570245e9c481 jdk7u4-b12 +9ffa2340e018131c900e9cc12c9f3a10698aa191 icedtea-2.2-branchpoint f7119745898016a98cddab3e69efb41c5a5aaf78 jdk7u4-b13 6a262c36caebb43972cbae5032cff632ce31d2cc jdk7u4-b14 d9bf21b76f093abfe451880d5db29e4932b1e72e jdk7u4-b15 @@ -191,6 +197,7 @@ 8da4015f405b0fa267cca4780d20cd012d0a9cb4 jdk7u6-b15 7674c7ed99a53a8dcf654ab8a6963199ef562a08 jdk7u6-b16 e4a676826cb3fe2f84e19105a027c15c097f98f1 jdk7u6-b17 +68c35d6e9548bc7be9c3ce73774c6d53b0d72d3b icedtea-2.3-branchpoint b3d767dbd67f518168c561e078be5e860bc60cfc jdk7u6-b18 5c046510b9308bf514f078d48fcf0112a376ad41 jdk7u6-b19 f0c51b691d34b4a06c1e22c7960be71e0d0ee84e jdk7u6-b20 @@ -258,6 +265,7 @@ 7969d5f219248de033c296ef75fff7aae7545bbd jdk7u12-b07 6f4d4c7a254d4aca3a7f2caabb75e6559a290393 jdk7u12-b08 c8c261b2220c5b966c07784682057a915defb0da jdk7u12-b09 +efbe4cef7fe2d46a197c39eb7a94e127e0bb4c5d icedtea-2.4-branchpoint 3877f9ae971eefbfbbcb16f2ff79c72ac10ac4bd jdk7u14-b10 3bd891cd98773cf841ad65f52f25e3e6fa185cef jdk7u14-b11 fbb83600db33de6211fc58ba2a2bbb6b356aa9c2 jdk7u14-b12 @@ -288,7 +296,9 @@ b2adfd931a2504948d4fee780e4175122be10484 jdk7u21-b10 61e2e2d9cfcea20132b50d8fb7ead66a8a373db7 jdk7u21-b11 3c774492beaaff241c654add2c4e683b9ff002f2 jdk7u21-b30 +fa2a377ce52dfa88fca858d735d78b53f2b5b754 jdk7u21-b50 fa2a377ce52dfa88fca858d735d78b53f2b5b754 jdk7u21-b12 +c0231d18f496dd0bc133e128f6b667a4d8f569a5 jdk7u21-b31 3d0f2d5b1866860f7089b51cca8ca0ca41c04d9c jdk7u25-b01 cdbafc5080eeb8ea3fec9fe7d071e0bf96635581 jdk7u25-b02 2057de7ee6b17ab3335ec6cd5730f88f4cfe9502 jdk7u25-b03 @@ -304,6 +314,9 @@ eca480919c71072a31f62a61cb3aad30677007e3 jdk7u25-b13 577c4dd1a6e9bc1bb2c2e5d5ecbab8eacb4121af jdk7u25-b14 4fde7ac2ecf4b170022ebbf8a961e6dbb229ccab jdk7u25-b15 +ddff7b2f69faaa8883e3986447daeab289f25e03 jdk7u25-b31 +9e2247c5d4b82798d393daf4e50cbadcaf0dc844 jdk7u25-b33 +1e888b6e1fb63cff9ea120bc7b0667578d82823b jdk7u25-b34 f4bec833a24b20f5ae770d0650350fc8950c9dc0 jdk7u25-b30 65d0e39500d56c6ea1fd52abbd1bef7966c3e87f jdk7u25-b16 d77153cbe030f91f432fae7c356cf6b5aab12a12 jdk7u25-b32 @@ -314,6 +327,7 @@ bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19 a921b45a1f9086a7d598a76f920639050386f996 jdk7u14-b19 54320e5d9da60df24f0e2c57c011809911dc06e1 jdk7u14-b20 +47084105fe834aa1c6f2ee2bbea01deaa05059dd icedtea-2.4.0 fb590ca4de9aaf1f6bca945be040dffc55b5e8d2 jdk7u14-b21 e5d89aa2c1a11dba841a646858dda9ea18dc8f57 jdk7u14-b22 d85df1552f877a1cc51f43bc07a42a0c48f18e0b jdk7u40-b23 @@ -324,6 +338,13 @@ c8b9201f88f4ce417df7a40efcb7fef656d94512 jdk7u40-b28 1ad0a5a3f7b1e9d95670d733d7e70714050ba6bf jdk7u40-b29 651dcadbd9774165e017f8b7d1bde7d7d280ae1d jdk7u40-b30 +23ae4e0e0cce13779c531a704bf95fda1764882b icedtea-2.4.1 3d2b811b8a798ff3b619f8330b08f551f7fdfd80 jdk7u40-b31 c5f85903c49aa716ee3cb93361dd60a3e88d866d jdk7u40-b32 1b7fbfdc31b859097d6a365ad0ba0e8ef92b4063 jdk7u40-b33 +ddd543ddf33017a15623cdf6908ae4ef2958e24e jdk7u40-b34 +fab3339a833da9631ead479621edcf6df2df457d jdk7u40-b35 +cd3871b1516988ea4a3099d6e1886abe2e74e771 jdk7u40-b36 +dc9a63376b39223bfb612d9e8efd275023de6399 jdk7u40-b37 +8391dff270bbf75dc434e53ed68993ab833475e8 jdk7u40-b38 +d7c73fd53c84cbb4333559cf788e554a2ef9326c jdk7u40-b39 diff -r ddd543ddf330 -r edc7119d7a2a .jcheck/conf --- a/.jcheck/conf Wed Jul 10 13:48:45 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r ddd543ddf330 -r edc7119d7a2a THIRD_PARTY_README --- a/THIRD_PARTY_README Wed Jul 10 13:48:45 2013 -0700 +++ b/THIRD_PARTY_README Wed Aug 21 14:21:19 2013 +0100 @@ -1912,6 +1912,35 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to Sparkle v.1.5, +which is included with JRE 7 on Mac OS X. + +--- begin of LICENSE --- + +Copyright (c) 2012 Sparkle.org and Andy Matuschak + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- + %% Portions licensed from Taligent, Inc. ------------------------------------------------------------------------------- @@ -3169,12 +3198,12 @@ %% This notice is provided with respect to the following which is included with JRE 7, JDK 7, and OpenJDK 7, except where noted: - Apache Derby 10.8.1.2 [included with JDK 7 only] + Apache Derby 10.8.3.0 [included with JDK 7 only] Apache Jakarta BCEL 5.2 Apache Jakarta Regexp 1.4 Apache Santuario XMLSec-Java 1.4.2 Apache Xalan-Java 2.7.1 - Apache Xerces2 Java 2.10.0 + Apache Xerces2 Java 2.11.0 Apache XML Resolver 1.1 diff -r ddd543ddf330 -r edc7119d7a2a make/Makefile --- a/make/Makefile Wed Jul 10 13:48:45 2013 -0700 +++ b/make/Makefile Wed Aug 21 14:21:19 2013 +0100 @@ -150,7 +150,7 @@ #----- bin.zip -BIN_ZIP_FILES = $(BUILD_DIR/lib/orb.idl $(BUILD_DIR)/lib/ir.idl +BIN_ZIP_FILES = $(BUILD_DIR)/lib/orb.idl $(BUILD_DIR)/lib/ir.idl BIN_ZIP = $(LIB_DIR)/bin.zip $(BIN_ZIP): $(BIN_ZIP_FILES) diff -r ddd543ddf330 -r edc7119d7a2a make/common/shared/Platform.gmk --- a/make/common/shared/Platform.gmk Wed Jul 10 13:48:45 2013 -0700 +++ b/make/common/shared/Platform.gmk Wed Aug 21 14:21:19 2013 +0100 @@ -153,6 +153,9 @@ OS_VERSION := $(shell uname -r) # Arch and OS name/version mach := $(shell uname -m) + ifneq (,$(wildcard /usr/bin/dpkg-architecture)) + mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/') + endif archExpr = case "$(mach)" in \ i[3-9]86) \ echo i586 \ @@ -169,6 +172,9 @@ arm*) \ echo arm \ ;; \ + sh*) \ + echo sh \ + ;; \ *) \ echo $(mach) \ ;; \ @@ -196,6 +202,9 @@ else ARCH_DATA_MODEL=64 endif + ifeq ($(ARCH), sh) + ARCH_DATA_MODEL=32 + endif endif endif From andrew at icedtea.classpath.org Wed Aug 21 06:26:05 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 21 Aug 2013 13:26:05 +0000 Subject: /hg/release/icedtea7-forest-2.4/jaxp: 24 new changesets Message-ID: changeset 4056df34b559 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=4056df34b559 author: katleman date: Wed Jul 17 11:09:22 2013 -0700 Added tag jdk7u40-b34 for changeset 23ba797b9e78 changeset b9d1d855a8fa in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=b9d1d855a8fa author: katleman date: Wed Jul 24 14:45:02 2013 -0700 Added tag jdk7u40-b35 for changeset 4056df34b559 changeset 19b243d00f77 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=19b243d00f77 author: asaha date: Thu Apr 11 10:34:35 2013 -0700 Merge changeset 936d94ee4fbb in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=936d94ee4fbb author: katleman date: Wed May 01 14:52:24 2013 -0700 Added tag jdk7u21-b31 for changeset 19b243d00f77 changeset a27a39484964 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=a27a39484964 author: asaha date: Thu Jun 06 13:20:00 2013 -0700 Merge changeset 3b3f67de012b in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=3b3f67de012b author: katleman date: Tue May 28 10:36:30 2013 -0700 Added tag jdk7u21-b50 for changeset a320a590b4ca changeset 35710c8bd73d in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=35710c8bd73d author: asaha date: Thu Jun 06 22:22:24 2013 -0700 Merge changeset c02dbd8fd8ca in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=c02dbd8fd8ca author: katleman date: Tue Jun 11 17:49:05 2013 -0700 Added tag jdk7u25-b31 for changeset 35710c8bd73d changeset ebe5d88948e9 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=ebe5d88948e9 author: katleman date: Tue Jun 18 11:15:04 2013 -0700 Added tag jdk7u25-b33 for changeset c02dbd8fd8ca changeset fdfab0b74b2d in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=fdfab0b74b2d author: asaha date: Tue Jul 16 15:30:49 2013 -0700 Merge changeset 4be5a82783d8 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=4be5a82783d8 author: katleman date: Thu Jul 18 20:46:40 2013 -0700 Added tag jdk7u25-b34 for changeset ebe5d88948e9 changeset 41ed89370291 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=41ed89370291 author: asaha date: Fri Jul 19 22:18:58 2013 -0700 Merge changeset 41dad9bdff95 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=41dad9bdff95 author: asaha date: Tue Jul 23 20:41:26 2013 -0700 Merge changeset 651037d8a713 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=651037d8a713 author: asaha date: Wed Jul 24 18:59:41 2013 -0700 Merge changeset 704518b26725 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=704518b26725 author: jeff date: Thu Jul 25 12:30:27 2013 -0700 8014850: Third Party License Readme updates for 7u40 Reviewed-by: lana, tbell changeset c83e85b19f60 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=c83e85b19f60 author: lana date: Thu Jul 25 14:12:54 2013 -0700 Merge changeset 07024f18376c in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=07024f18376c author: joehw date: Thu Jul 25 18:10:49 2013 -0700 8021148: Regression in SAXParserImpl in 7u40 b34 (NPE) Reviewed-by: chegar, lancea, dfuchs changeset f40f45bd95d4 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=f40f45bd95d4 author: cl date: Wed Jul 31 21:27:16 2013 -0700 Added tag jdk7u40-b36 for changeset 07024f18376c changeset 680bf140cdd5 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=680bf140cdd5 author: asaha date: Fri Aug 02 13:10:43 2013 -0700 Added tag jdk7u40-b37 for changeset f40f45bd95d4 changeset aa1a36b918b8 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=aa1a36b918b8 author: asaha date: Wed Aug 07 12:09:31 2013 -0700 Added tag jdk7u40-b38 for changeset 680bf140cdd5 changeset a9f9a58b21cc in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=a9f9a58b21cc author: joehw date: Fri Aug 09 13:57:37 2013 -0700 8022548: SPECJVM2008 has errors introduced in 7u40-b34 Reviewed-by: chegar, lancea changeset 322af0a5cdce in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=322af0a5cdce author: lana date: Fri Aug 09 14:39:43 2013 -0700 Merge changeset 6ea57bdf6030 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=6ea57bdf6030 author: katleman date: Mon Aug 12 12:07:40 2013 -0700 Added tag jdk7u40-b39 for changeset 322af0a5cdce changeset 90b1dbd6baf6 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=90b1dbd6baf6 author: andrew date: Wed Aug 21 14:21:20 2013 +0100 Merge jdk7u40-b40 diffstat: .hgtags | 21 +++++ .jcheck/conf | 2 - THIRD_PARTY_README | 33 ++++++++- src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java | 37 +++++++-- src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java | 9 ++- src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java | 9 ++- src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java | 12 ++- 7 files changed, 104 insertions(+), 19 deletions(-) diffs (375 lines): diff -r 23ba797b9e78 -r 90b1dbd6baf6 .hgtags --- a/.hgtags Tue Jul 16 11:03:40 2013 -0700 +++ b/.hgtags Wed Aug 21 14:21:20 2013 +0100 @@ -50,6 +50,7 @@ feb05980f9f2964e6bc2b3a8532f9b3054c2289b jdk7-b73 ea7b88c676dd8b269bc858a4a17c14dc96c8aed1 jdk7-b74 555fb78ee4cebed082ca7ddabff46d2e5b4c9026 jdk7-b75 +fb68fd18eb9f9d94bd7f307097b98a5883018da8 icedtea7-1.12 233a4871d3364ec305efd4a58cfd676620a03a90 jdk7-b76 bfadab8c7b1bf806a49d3e1bc19ec919717f057a jdk7-b77 7a12d3789e1b07a560fc79568b991818d617ede2 jdk7-b78 @@ -63,6 +64,7 @@ 81c0f115bbe5d3bcf59864465b5eca5538567c79 jdk7-b86 8b493f1aa136d86de0885fcba15262c4fa2b1412 jdk7-b87 d8ebd15910034f2ba50b2f129f959f86cca01419 jdk7-b88 +826bafcb6c4abbf24887bfc5a78868e13cddd068 icedtea7-1.13 d2818fd2b036f3b3154a9a7de41afcf4ac679c1b jdk7-b89 c5d932ee326d6f7fd4634b11c7185ea82d184df2 jdk7-b90 b89b2c3044a298d542f84a2e9d957202b7d8cdb9 jdk7-b91 @@ -111,6 +113,7 @@ d56b326ae0544fc16c3e0d0285876f3c82054db2 jdk7-b134 4aa9916693dc1078580c1865e6f2584046851e5a jdk7-b135 1759daa85d33800bd578853f9531f9de73f70fc7 jdk7-b136 +1c2f25bf36b1d43920e94fb82a0afdafd29b1735 icedtea-1.14 1d87f7460cde7f8f30af668490f82b52b879bfd8 jdk7-b137 be3758943770a0a3dd4be6a1cb4063507c4d7062 jdk7-b138 28c7c0ed2444607829ba11ad827f8d52197a2830 jdk7-b139 @@ -123,6 +126,7 @@ bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146 067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01 fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147 +b8d01501956a0d41f5587ff1bebbfe5a9b8fea5a icedtea-2.0-branchpoint 104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02 64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03 2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04 @@ -141,6 +145,7 @@ 0e61ef309edd2deb71f53f2bdaf6dcff1c80bfb8 jdk7u2-b12 d9ac427e5149d1db12c6f3e4aa4280587c06aed5 jdk7u2-b13 0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u2-b21 +7300d2ab9fb2068250a96ca4afc481c4beb6a42b icedtea-2.1-branchpoint 0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u3-b02 604dd391203960d0028fc95bc70b0ae161e09d99 jdk7u3-b03 551c076358f6691999f613db9b155c83ec9a648d jdk7u3-b04 @@ -157,6 +162,7 @@ 7a37651d304de62b18b343b3ae675ab1b08fc5fe jdk7u4-b10 3fbd87d50fbf4de3987e36ec5f3e8ce1c383ce3d jdk7u4-b11 b4e5df5b18bb75db15ed97da02e5df086d2c7930 jdk7u4-b12 +c51876b27811ba0f6ea3409ba19d357b7400908a icedtea-2.2-branchpoint 7d18bccaec3781f3d4f2d71879f91e257db2f0f7 jdk7u4-b13 82c5b3166b3194e7348b2a9d146b6760c9a77128 jdk7u4-b14 36490d49683f7be9d8fbbe1f8eefa1fe9fe550fa jdk7u5-b01 @@ -191,6 +197,7 @@ 94474d6f28284a1ef492984dd6d6f66f8787de80 jdk7u6-b15 0b329a8d325b6a58d89c6042dac62ce5852380ab jdk7u6-b16 5eb867cdd08ca299fe03b31760acd57aac2b5673 jdk7u6-b17 +445dd0b578fc2ed12c539eb6f9a71cbd40bed4f6 icedtea-2.3-branchpoint 1c4b9671de5c7ed5713f55509cb2ada38b36dffe jdk7u6-b18 3ba4c395d2cf973c8c603b2aedc846bd4ae54656 jdk7u6-b19 4f7b77cc3b252098f52a8f30a74f603783a2e0f1 jdk7u6-b20 @@ -258,6 +265,7 @@ 1b914599a6d5560e743b9fecd390924ed0bf7d15 jdk7u12-b07 427a603569db59f61721e709fcb8a73390d468ae jdk7u12-b08 366ebbf581df0134d9039b649abc315e87f23772 jdk7u12-b09 +14adb683be4ebc49ee729f0253d012795a4a2ae4 icedtea-2.4-branchpoint 23191c790e12841f81ac1cf956e7dbc0b45914ee jdk7u14-b10 825eda7553590ce19eb4fa0686c4405d97daafdb jdk7u14-b11 560e5cf5b57fc91e2bc6dd1809badd58c6eb25bd jdk7u14-b12 @@ -288,7 +296,9 @@ bf2d62ea518d5e4130e442e07705e7a50b821ad9 jdk7u21-b10 3e0e331bdfb8f3adfd0cc78118e0ac588e73a2b5 jdk7u21-b11 980fe893d8fd86d8aee14771167b6e0ac75fa208 jdk7u21-b30 +a320a590b4cac6eeff53829bde520ef46880b006 jdk7u21-b50 a320a590b4cac6eeff53829bde520ef46880b006 jdk7u21-b12 +19b243d00f7740072d051d3fb531f01083cbe999 jdk7u21-b31 5704dc942da676677a820d16c9a08fc6cad5b3bb jdk7u25-b01 f9c1fe7cd1194e785807f07005369631b35b28d8 jdk7u25-b02 fe858d7d6a13829d0ef0a1f762bd0e769cd24fa1 jdk7u25-b03 @@ -304,6 +314,9 @@ 83b80c094befd08cbac4247d9b8f12c6a039f23f jdk7u25-b13 68cc0d2a49f09b5c611b2775f2e66de1022bdedc jdk7u25-b14 503f75b55b34ae22f43b2992b1e56c96e35a60de jdk7u25-b15 +35710c8bd73dbfdd4805e8b3c506f500daf553c7 jdk7u25-b31 +c02dbd8fd8ca142e3987537f7ac43da361fcf9d4 jdk7u25-b33 +ebe5d88948e9f2fd707c808eceb9343f4f32e122 jdk7u25-b34 8c35f2344beeb42e85d718e95813e6fdc2f0a605 jdk7u25-b30 9cebeb3118aca6e356f80a37ac38088ddcc8fb73 jdk7u25-b16 0d4cfe518086198516e6729fc28b161f66524a66 jdk7u25-b32 @@ -314,6 +327,7 @@ 331e489ecb7b19fa98c60324f7ce5d168284a8c8 jdk7u14-b19 c3c9f04cf10c2fe576b208f6a8ca3777b1d31145 jdk7u14-b19 5e1fee011646b4a3ff29b7b9cdc208e0a0577cb4 jdk7u14-b20 +7f04ed6cb0c382a16c2ffaad05c6122482e03b2e icedtea-2.4.0 d1c8bb1cbc9183fc994b5fedf26886ceda0d59f9 jdk7u14-b21 d1c6afebdfe28eb07eb2d03a6911a0f33b619165 jdk7u14-b22 0e4c549d3635122145ac88bad7b98716976ca49e jdk7u40-b23 @@ -324,6 +338,13 @@ 9186b6efd2b2eafa7fee5be1b043f59f25db12a6 jdk7u40-b28 740942c76fb668a04bf89feccf069f6958651d54 jdk7u40-b29 09b080236bc1a1a68f8b411196cbfa52475c0755 jdk7u40-b30 +5be6b670d08bb0464e0e259ef77fca6adba24b05 icedtea-2.4.1 5b31380e2e0b6f8386dcf0ca122461154f2d2704 jdk7u40-b31 75bb397c4ae26c384e1fcb75bbf4b70479f2c5f7 jdk7u40-b32 ce771024e07d2bb6521735a14ce68745a2376bd8 jdk7u40-b33 +23ba797b9e78231806d837f7fb4f9feef6dcd61a jdk7u40-b34 +4056df34b559b904edc9f94a323769f19cf8f426 jdk7u40-b35 +07024f18376ce9597ec8679ebcb9f2efdc5afab0 jdk7u40-b36 +f40f45bd95d4140f691c03132f2ab2c8a0233a8f jdk7u40-b37 +680bf140cdd58e7878318ecafc41c9db47ebfacd jdk7u40-b38 +322af0a5cdce6cad8421a73c1b9af345361dfba0 jdk7u40-b39 diff -r 23ba797b9e78 -r 90b1dbd6baf6 .jcheck/conf --- a/.jcheck/conf Tue Jul 16 11:03:40 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 23ba797b9e78 -r 90b1dbd6baf6 THIRD_PARTY_README --- a/THIRD_PARTY_README Tue Jul 16 11:03:40 2013 -0700 +++ b/THIRD_PARTY_README Wed Aug 21 14:21:20 2013 +0100 @@ -1912,6 +1912,35 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to Sparkle v.1.5, +which is included with JRE 7 on Mac OS X. + +--- begin of LICENSE --- + +Copyright (c) 2012 Sparkle.org and Andy Matuschak + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- + %% Portions licensed from Taligent, Inc. ------------------------------------------------------------------------------- @@ -3169,12 +3198,12 @@ %% This notice is provided with respect to the following which is included with JRE 7, JDK 7, and OpenJDK 7, except where noted: - Apache Derby 10.8.1.2 [included with JDK 7 only] + Apache Derby 10.8.3.0 [included with JDK 7 only] Apache Jakarta BCEL 5.2 Apache Jakarta Regexp 1.4 Apache Santuario XMLSec-Java 1.4.2 Apache Xalan-Java 2.7.1 - Apache Xerces2 Java 2.10.0 + Apache Xerces2 Java 2.11.0 Apache XML Resolver 1.1 diff -r 23ba797b9e78 -r 90b1dbd6baf6 src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java --- a/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java Tue Jul 16 11:03:40 2013 -0700 +++ b/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java Wed Aug 21 14:21:20 2013 +0100 @@ -112,7 +112,7 @@ /** Initial EntityResolver */ private final EntityResolver fInitEntityResolver; - private XMLSecurityPropertyManager fSecurityPropertyMgr; + private final XMLSecurityPropertyManager fSecurityPropertyMgr; /** * Create a SAX parser with the associated features @@ -130,8 +130,10 @@ SAXParserImpl(SAXParserFactoryImpl spf, Hashtable features, boolean secureProcessing) throws SAXException { + fSecurityPropertyMgr = new XMLSecurityPropertyManager(); + // Instantiate a SAXParser directly and not through SAX so that we use the right ClassLoader - xmlReader = new JAXPSAXParser(this); + xmlReader = new JAXPSAXParser(this, fSecurityPropertyMgr); // JAXP "namespaceAware" == SAX Namespaces feature // Note: there is a compatibility problem here with default values: @@ -150,7 +152,6 @@ xmlReader.setFeature0(XINCLUDE_FEATURE, true); } - fSecurityPropertyMgr = new XMLSecurityPropertyManager(); xmlReader.setProperty0(XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr); // If the secure processing feature is on set a security manager. @@ -397,14 +398,32 @@ private final HashMap fInitFeatures = new HashMap(); private final HashMap fInitProperties = new HashMap(); private final SAXParserImpl fSAXParser; + private XMLSecurityPropertyManager fSecurityPropertyMgr; + public JAXPSAXParser() { - this(null); + this(null, null); } - JAXPSAXParser(SAXParserImpl saxParser) { + JAXPSAXParser(SAXParserImpl saxParser, XMLSecurityPropertyManager spm) { super(); fSAXParser = saxParser; + fSecurityPropertyMgr = spm; + + /** + * This class may be used directly. So initialize the security manager if + * it is null. + */ + if (fSecurityPropertyMgr == null) { + fSecurityPropertyMgr = new XMLSecurityPropertyManager(); + try { + super.setProperty(XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr); + } catch (SAXException e) { + throw new UnsupportedOperationException( + SAXMessageFormatter.formatMessage(fConfiguration.getLocale(), + "property-not-recognized", new Object [] {SECURITY_MANAGER}), e); + } + } } /** @@ -542,9 +561,9 @@ setSchemaValidatorProperty(name, value); } /** Check to see if the property is managed by the property manager **/ - int index = fSAXParser.fSecurityPropertyMgr.getIndex(name); + int index = (fSecurityPropertyMgr != null) ? fSecurityPropertyMgr.getIndex(name) : -1; if (index > -1) { - fSAXParser.fSecurityPropertyMgr.setValue(index, + fSecurityPropertyMgr.setValue(index, XMLSecurityPropertyManager.State.APIPROPERTY, (String)value); } else { if (!fInitProperties.containsKey(name)) { @@ -564,9 +583,9 @@ // JAXP 1.2 support return fSAXParser.schemaLanguage; } - int index = fSAXParser.fSecurityPropertyMgr.getIndex(name); + int index = (fSecurityPropertyMgr != null) ? fSecurityPropertyMgr.getIndex(name) : -1; if (index > -1) { - return fSAXParser.fSecurityPropertyMgr.getValueByIndex(index); + return fSecurityPropertyMgr.getValueByIndex(index); } return super.getProperty(name); diff -r 23ba797b9e78 -r 90b1dbd6baf6 src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java --- a/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java Tue Jul 16 11:03:40 2013 -0700 +++ b/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java Wed Aug 21 14:21:20 2013 +0100 @@ -38,6 +38,7 @@ import com.sun.org.apache.xerces.internal.util.PropertyState; import com.sun.org.apache.xerces.internal.util.Status; import com.sun.org.apache.xerces.internal.util.SymbolTable; +import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager; import com.sun.org.apache.xerces.internal.xni.XMLLocator; import com.sun.org.apache.xerces.internal.xni.XNIException; import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool; @@ -184,6 +185,10 @@ protected static final String LOCALE = Constants.XERCES_PROPERTY_PREFIX + Constants.LOCALE_PROPERTY; + /** Property identifier: Security property manager. */ + protected static final String XML_SECURITY_PROPERTY_MANAGER = + Constants.XML_SECURITY_PROPERTY_MANAGER; + // debugging /** Set to true and recompile to print exception stack trace. */ @@ -328,7 +333,8 @@ VALIDATION_MANAGER, JAXP_SCHEMA_SOURCE, JAXP_SCHEMA_LANGUAGE, - LOCALE + LOCALE, + XML_SECURITY_PROPERTY_MANAGER }; addRecognizedProperties(recognizedProperties); @@ -406,6 +412,7 @@ // REVISIT: What is the right thing to do? -Ac } + setProperty(XML_SECURITY_PROPERTY_MANAGER, new XMLSecurityPropertyManager()); } // (SymbolTable,XMLGrammarPool) // diff -r 23ba797b9e78 -r 90b1dbd6baf6 src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java --- a/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java Tue Jul 16 11:03:40 2013 -0700 +++ b/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java Wed Aug 21 14:21:20 2013 +0100 @@ -36,6 +36,7 @@ import com.sun.org.apache.xerces.internal.util.PropertyState; import com.sun.org.apache.xerces.internal.util.Status; import com.sun.org.apache.xerces.internal.util.SymbolTable; +import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager; import com.sun.org.apache.xerces.internal.xni.XMLLocator; import com.sun.org.apache.xerces.internal.xni.XNIException; import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool; @@ -157,6 +158,10 @@ protected static final String LOCALE = Constants.XERCES_PROPERTY_PREFIX + Constants.LOCALE_PROPERTY; + /** Property identifier: Security property manager. */ + protected static final String XML_SECURITY_PROPERTY_MANAGER = + Constants.XML_SECURITY_PROPERTY_MANAGER; + // debugging /** Set to true and recompile to print exception stack trace. */ @@ -310,7 +315,8 @@ XMLGRAMMAR_POOL, DATATYPE_VALIDATOR_FACTORY, VALIDATION_MANAGER, - LOCALE + LOCALE, + XML_SECURITY_PROPERTY_MANAGER }; addRecognizedProperties(recognizedProperties); @@ -367,6 +373,7 @@ // REVISIT: What is the right thing to do? -Ac } + setProperty(XML_SECURITY_PROPERTY_MANAGER, new XMLSecurityPropertyManager()); } // (SymbolTable,XMLGrammarPool) // diff -r 23ba797b9e78 -r 90b1dbd6baf6 src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java --- a/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java Tue Jul 16 11:03:40 2013 -0700 +++ b/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java Wed Aug 21 14:21:20 2013 +0100 @@ -76,6 +76,7 @@ XMLGRAMMAR_POOL, }; + XMLSecurityPropertyManager securityPropertyManager; // // Constructors // @@ -129,16 +130,19 @@ */ public void setProperty(String name, Object value) throws SAXNotRecognizedException, SAXNotSupportedException { - XMLSecurityPropertyManager spm = new XMLSecurityPropertyManager(); - int index = spm.getIndex(name); + if (securityPropertyManager == null) { + securityPropertyManager = new XMLSecurityPropertyManager(); + } + int index = securityPropertyManager.getIndex(name); + if (index > -1) { /** * this is a direct call to this parser, not a subclass since * internally the support of this property is done through * XMLSecurityPropertyManager */ - spm.setValue(index, XMLSecurityPropertyManager.State.APIPROPERTY, (String)value); - super.setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER, spm); + securityPropertyManager.setValue(index, XMLSecurityPropertyManager.State.APIPROPERTY, (String)value); + super.setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER, securityPropertyManager); } else { super.setProperty(name, value); } From andrew at icedtea.classpath.org Wed Aug 21 06:26:19 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 21 Aug 2013 13:26:19 +0000 Subject: /hg/release/icedtea7-forest-2.4/jaxws: 21 new changesets Message-ID: changeset 9f74e1f33e6c in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=9f74e1f33e6c author: katleman date: Wed Jul 17 11:09:23 2013 -0700 Added tag jdk7u40-b34 for changeset 1ef33d25dd8c changeset f08f5edeab71 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=f08f5edeab71 author: katleman date: Wed Jul 24 14:45:04 2013 -0700 Added tag jdk7u40-b35 for changeset 9f74e1f33e6c changeset 4e2481dc6ee6 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=4e2481dc6ee6 author: asaha date: Thu Apr 11 10:35:50 2013 -0700 Merge changeset 702dbf6f072b in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=702dbf6f072b author: katleman date: Wed May 01 14:52:31 2013 -0700 Added tag jdk7u21-b31 for changeset 4e2481dc6ee6 changeset a1480d0b2c9a in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=a1480d0b2c9a author: asaha date: Thu Jun 06 13:20:34 2013 -0700 Merge changeset 951cbd5789a3 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=951cbd5789a3 author: katleman date: Tue May 28 10:36:31 2013 -0700 Added tag jdk7u21-b50 for changeset d4eba65d0f77 changeset 854a93cd1f89 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=854a93cd1f89 author: asaha date: Thu Jun 06 22:23:36 2013 -0700 Merge changeset 5d090a0d278f in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=5d090a0d278f author: katleman date: Tue Jun 11 17:49:06 2013 -0700 Added tag jdk7u25-b31 for changeset 854a93cd1f89 changeset 168023db844d in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=168023db844d author: katleman date: Tue Jun 18 11:15:07 2013 -0700 Added tag jdk7u25-b33 for changeset 5d090a0d278f changeset d0f86ccbabcb in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=d0f86ccbabcb author: asaha date: Tue Jul 16 15:31:42 2013 -0700 Merge changeset 358cf0f56f2b in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=358cf0f56f2b author: katleman date: Thu Jul 18 20:46:47 2013 -0700 Added tag jdk7u25-b34 for changeset 168023db844d changeset 2084756a5571 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=2084756a5571 author: asaha date: Fri Jul 19 22:19:21 2013 -0700 Merge changeset e2ad78fed9aa in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=e2ad78fed9aa author: asaha date: Tue Jul 23 20:41:43 2013 -0700 Merge changeset 43b53f86705f in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=43b53f86705f author: asaha date: Wed Jul 24 18:59:56 2013 -0700 Merge changeset 9efad07b0a1e in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=9efad07b0a1e author: jeff date: Thu Jul 25 12:30:38 2013 -0700 8014850: Third Party License Readme updates for 7u40 Reviewed-by: lana, tbell changeset b75c19a170c7 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=b75c19a170c7 author: lana date: Thu Jul 25 14:13:03 2013 -0700 Merge changeset 918e6c87b006 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=918e6c87b006 author: cl date: Wed Jul 31 21:27:20 2013 -0700 Added tag jdk7u40-b36 for changeset b75c19a170c7 changeset 7ae2e9ed2c44 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=7ae2e9ed2c44 author: asaha date: Fri Aug 02 13:10:48 2013 -0700 Added tag jdk7u40-b37 for changeset 918e6c87b006 changeset 4af46770372d in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=4af46770372d author: asaha date: Wed Aug 07 12:09:36 2013 -0700 Added tag jdk7u40-b38 for changeset 7ae2e9ed2c44 changeset cd6971747e7a in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=cd6971747e7a author: katleman date: Mon Aug 12 12:07:42 2013 -0700 Added tag jdk7u40-b39 for changeset 4af46770372d changeset 34cc85216b4f in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=34cc85216b4f author: andrew date: Wed Aug 21 14:18:15 2013 +0100 Merge jdk7u40-b40 diffstat: .hgtags | 21 ++++++ .jcheck/conf | 2 - THIRD_PARTY_README | 33 +++++++++- src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java | 8 ++ 4 files changed, 60 insertions(+), 4 deletions(-) diffs (187 lines): diff -r 1ef33d25dd8c -r 34cc85216b4f .hgtags --- a/.hgtags Wed Jul 10 13:48:57 2013 -0700 +++ b/.hgtags Wed Aug 21 14:18:15 2013 +0100 @@ -50,6 +50,7 @@ 558985e26fe16f5a6ebb2edb9180a42e1c8e8202 jdk7-b73 f4466e1b608088c90e11beaa4b600f102608c6a1 jdk7-b74 fcf2b8b5d606641659419f247fcee4b284c45e6e jdk7-b75 +0dc08d528c998ca993e759b311e7b54c98e0ef28 icedtea7-1.12 765d2077d1e652e234d27fe85ba58a986b488503 jdk7-b76 5b4968c110476085225d3a71c4210fad2c1116c1 jdk7-b77 fc1c72d1dfbb17db7d46bba8db9afc39cbbb9299 jdk7-b78 @@ -63,6 +64,7 @@ 512b0e924a5ae0c0b7ad326182cae0dc0e4d1aa8 jdk7-b86 3febd6fab2ac8ffddbaf7bed00d11290262af153 jdk7-b87 8c666f8f3565974e301ccb58b7538912551a6e26 jdk7-b88 +1661166c82dc2102f3f0364e28d1e4211f25a4cf icedtea7-1.13 bf3675aa7f20fc6f241ce95760005aef2a30ff41 jdk7-b89 ead7c4566a0017bcb44b468b3ac03b60dc5333ce jdk7-b90 cf4686bf35abd1e573f09fa43cbec66403160ae9 jdk7-b91 @@ -111,6 +113,7 @@ 545de8303fec939db3892f7c324dd7df197e8f09 jdk7-b134 d5fc61f18043765705ef22b57a68c924ab2f1a5b jdk7-b135 c81d289c9a532d6e94af3c09d856a2a20529040f jdk7-b136 +339c2d381d80dbf9b74604e6ba43ead276b8024e icedtea-1.14 ccea3282991ce8b678e188cf32a8239f76ff3bfa jdk7-b137 cc956c8a8255583535597e9a63db23c510e9a063 jdk7-b138 c025078c8362076503bb83b8e4da14ba7b347940 jdk7-b139 @@ -123,6 +126,7 @@ 05469dd4c3662c454f8a019e492543add60795cc jdk7-b146 c01bfd68d0528bc88348813c4d75d7f5c62bc4e2 jdk7u1-b01 d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147 +e6cd09c7ef22bbabe31c9f2a32c7e13cfa713fd3 icedtea-2.0-branchpoint 4c24f7019ce939a452154a83151294ad7da66a9d jdk7u1-b02 272778f529d11081f548f37fcd6a7aec0b11a8dd jdk7u1-b03 48b06a6e6f46e5bcd610f4bed57cd5067cf31f8c jdk7u1-b04 @@ -141,6 +145,7 @@ 21131044a61353ac20e360bce52d8f480e08d7a2 jdk7u2-b12 9728fd833e01faa5e51484aeaf3c51d32d1175fb jdk7u2-b13 d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u2-b21 +d26ff33070cb75a0a7349d965ec4f0930ded418d icedtea-2.1-branchpoint d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u3-b02 44e824502fa24440f907205ccdc3959d01bd8109 jdk7u3-b03 6e1cc321aacea944691aa06558f2bbad89baf5b3 jdk7u3-b04 @@ -157,6 +162,7 @@ 3891fe529057431278394c6341cfabaacd5061f5 jdk7u4-b10 2df5cd83fab91f050c4bac54aa06e174ecee38f4 jdk7u4-b11 4d3a9fe44f7531642bc739ec3c8efb2e6d9e08c7 jdk7u4-b12 +1854d8e2547cb18ebcf84db13c22d0987c49c274 icedtea-2.2-branchpoint c3b6659aa169b3f249246497a8d5a87baa1e798a jdk7u4-b13 0f8963feaefda21e72f84b8ea49834a289d537f3 jdk7u4-b14 61516652b59ec411678b38a232a84413652a4172 jdk7u5-b01 @@ -191,6 +197,7 @@ f1dba7ebe6a50c22ffcaf85b14b31462ce008556 jdk7u6-b15 e1d2afbb63d27600dd8c8a021eadff84a901a73c jdk7u6-b16 401bdbbf89c9187b51dc8906c0e2700ef0ffc8a3 jdk7u6-b17 +8888d2790217c31edbf13ea81d9ac06210092ad2 icedtea-2.3-branchpoint a1daf7097c61181216233e4850ef6ec56b0fe6b6 jdk7u6-b18 58c1c6ecf8f1e59db9b575ae57b2894d0152d319 jdk7u6-b19 6d17242f12edc643ecab4263e656003a1ca44c03 jdk7u6-b20 @@ -258,6 +265,7 @@ 42ba62cdc1f3c357b6d192612dd1c4b209df2662 jdk7u12-b07 66f36438f54812e44327d38129d9488e5ea59e73 jdk7u12-b08 c130f21b16a2b2e2b961362bc4baf40fde2be458 jdk7u12-b09 +a653d06d5b50cacf58aebbab8b55e7e00587cd4c icedtea-2.4-branchpoint 9207c72345c9e82d4445764df57706f7b33a7981 jdk7u14-b10 444aa84f38df2607140e9ce35a21fef0965d27a6 jdk7u14-b11 40afea757379cfaaadca13eeb7dcbc0fe195f73d jdk7u14-b12 @@ -288,7 +296,9 @@ 29c03ced9215a0bb63a4527dc5858b486cc4099d jdk7u21-b10 fe6f5b57b9e67a7c6f52a5f926ac17e5c337d4a4 jdk7u21-b11 12183763c6205c5cfe27924ccc4ca5480106c3b4 jdk7u21-b30 +d4eba65d0f776b77ef137022cd7bf49dc3b88a3e jdk7u21-b50 d4eba65d0f776b77ef137022cd7bf49dc3b88a3e jdk7u21-b12 +4e2481dc6ee6cadb0e7e883a2d8a6f692a2a32cc jdk7u21-b31 238b59ffddce3b1d7d19114006ae3be0e72b5eed jdk7u25-b01 8797b25cbeb3005336483063cef2377849bc2088 jdk7u25-b02 4635a58db6b028f78a30c972ac47f9c5577bedfd jdk7u25-b03 @@ -304,6 +314,9 @@ 6b4a165221304d809f678a18f51c7a8cb042d60b jdk7u25-b13 03073e4e6d3f600102d31e862154f56730838b11 jdk7u25-b14 4a925430bf712d36abb78decda16e04da1b1f6bc jdk7u25-b15 +854a93cd1f89fad2abcbdb6d7935438da0f4afbf jdk7u25-b31 +5d090a0d278f2384cdaaa2d6e8cea4fe30aa6886 jdk7u25-b33 +168023db844d735fa516ec21bb58c30789079c99 jdk7u25-b34 3ecf7ddefa035bc2c99b03b7a58a0dd0e97089c1 jdk7u25-b30 1826480d02a3b08eccea90ae56bb4f48e3c6cb29 jdk7u25-b16 23392fb9b31a6f6892864975601df8f14bdb5e05 jdk7u25-b32 @@ -314,6 +327,7 @@ 82be38857de3b2f6d8def98034f3e7b0827fd9f0 jdk7u14-b19 d63b21e6c3d29305400dbfc1500090cab89f25d1 jdk7u14-b19 dd695ad6c5ec797fe61db31600a3fd2dbc62247b jdk7u14-b20 +426b7a73ab43aca754c19dc21497ae90c147f91a icedtea-2.4.0 97bbac299eb801709a924fe777b3ee9c96829d8b jdk7u14-b21 6e74b3e1773cfbac99998431a5a54c70baaf1dc5 jdk7u14-b22 e9bbdf789d2b512550e0ca80629980e96f02146d jdk7u40-b23 @@ -324,6 +338,13 @@ 016957700ac905ebf3432ae8ba17d3576a51e585 jdk7u40-b28 15a82c84d9f7f6c99310380d4766fc68a3882671 jdk7u40-b29 2f8f617ecc4f0772b090a3be742780d8375c68f6 jdk7u40-b30 +c0e48fdfb6959d4024f49e99321d368810d2d7ef icedtea-2.4.1 f500fd46c18b783f7b4ab22314f64f131f50c5d5 jdk7u40-b31 83a688927f16b69690f707a6b579edbe55b01e25 jdk7u40-b32 3ceef25a8cdd9a27a7a2dea0efd8721100cfa30f jdk7u40-b33 +1ef33d25dd8c776a0b76a8c5c7095f4083ad6993 jdk7u40-b34 +9f74e1f33e6cc89256eb2c61964558460d9d7efe jdk7u40-b35 +b75c19a170c7a1a7b846e4e793e62546b2c54646 jdk7u40-b36 +918e6c87b006e32c80a937c7b0f2f9c65edbecdb jdk7u40-b37 +7ae2e9ed2c448a683f2df8673df145d20f13d585 jdk7u40-b38 +4af46770372d3c433811934e6759f5118e5c7648 jdk7u40-b39 diff -r 1ef33d25dd8c -r 34cc85216b4f .jcheck/conf --- a/.jcheck/conf Wed Jul 10 13:48:57 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 1ef33d25dd8c -r 34cc85216b4f THIRD_PARTY_README --- a/THIRD_PARTY_README Wed Jul 10 13:48:57 2013 -0700 +++ b/THIRD_PARTY_README Wed Aug 21 14:18:15 2013 +0100 @@ -1912,6 +1912,35 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to Sparkle v.1.5, +which is included with JRE 7 on Mac OS X. + +--- begin of LICENSE --- + +Copyright (c) 2012 Sparkle.org and Andy Matuschak + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- + %% Portions licensed from Taligent, Inc. ------------------------------------------------------------------------------- @@ -3169,12 +3198,12 @@ %% This notice is provided with respect to the following which is included with JRE 7, JDK 7, and OpenJDK 7, except where noted: - Apache Derby 10.8.1.2 [included with JDK 7 only] + Apache Derby 10.8.3.0 [included with JDK 7 only] Apache Jakarta BCEL 5.2 Apache Jakarta Regexp 1.4 Apache Santuario XMLSec-Java 1.4.2 Apache Xalan-Java 2.7.1 - Apache Xerces2 Java 2.10.0 + Apache Xerces2 Java 2.11.0 Apache XML Resolver 1.1 diff -r 1ef33d25dd8c -r 34cc85216b4f src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Wed Jul 10 13:48:57 2013 -0700 +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Wed Aug 21 14:18:15 2013 +0100 @@ -67,6 +67,14 @@ SchemaFactory sf = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI); sf.setErrorHandler(errorFilter); + try { + // By default the SchemaFactory imposes a limit of 5000 on + // xsd:sequence maxOccurs if a SecurityManager is + // installed. This breaks the specification of xjc, + // causing TCK failures. + sf.setProperty("http://apache.org/xml/properties/security-manager", null); + } catch (SAXException e) { + } if( entityResolver != null ) { sf.setResourceResolver(new LSResourceResolver() { public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI) { From andrew at icedtea.classpath.org Wed Aug 21 06:26:26 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 21 Aug 2013 13:26:26 +0000 Subject: /hg/release/icedtea7-forest-2.4/langtools: 21 new changesets Message-ID: changeset 524b9f7e6cab in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=524b9f7e6cab author: katleman date: Wed Jul 17 11:09:33 2013 -0700 Added tag jdk7u40-b34 for changeset 08c5065870ef changeset 07911cc63ee5 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=07911cc63ee5 author: katleman date: Wed Jul 24 14:45:14 2013 -0700 Added tag jdk7u40-b35 for changeset 524b9f7e6cab changeset 55c56025da9d in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=55c56025da9d author: asaha date: Thu Apr 11 10:41:13 2013 -0700 Merge changeset 91e397e65601 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=91e397e65601 author: katleman date: Wed May 01 14:53:30 2013 -0700 Added tag jdk7u21-b31 for changeset 55c56025da9d changeset 582f4660bb6b in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=582f4660bb6b author: asaha date: Thu Jun 06 13:24:01 2013 -0700 Merge changeset 0a86c8b57a92 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=0a86c8b57a92 author: katleman date: Tue May 28 10:36:40 2013 -0700 Added tag jdk7u21-b50 for changeset a87ad97e80ae changeset 642f469e5217 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=642f469e5217 author: asaha date: Thu Jun 06 22:28:03 2013 -0700 Merge changeset a825dd3a95fd in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=a825dd3a95fd author: katleman date: Tue Jun 11 17:49:19 2013 -0700 Added tag jdk7u25-b31 for changeset 642f469e5217 changeset 9ef1ee50dfa7 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=9ef1ee50dfa7 author: katleman date: Tue Jun 18 11:15:23 2013 -0700 Added tag jdk7u25-b33 for changeset a825dd3a95fd changeset c6f5f06b37d0 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=c6f5f06b37d0 author: asaha date: Tue Jul 16 15:30:11 2013 -0700 Merge changeset 472dd6892586 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=472dd6892586 author: katleman date: Thu Jul 18 20:47:27 2013 -0700 Added tag jdk7u25-b34 for changeset 9ef1ee50dfa7 changeset f987267efec3 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=f987267efec3 author: asaha date: Fri Jul 19 22:22:40 2013 -0700 Merge changeset 4b6ee58316a2 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=4b6ee58316a2 author: asaha date: Tue Jul 23 20:44:31 2013 -0700 Merge changeset ff2be65e7fc3 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=ff2be65e7fc3 author: asaha date: Wed Jul 24 19:01:52 2013 -0700 Merge changeset 2e2cdadf9515 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=2e2cdadf9515 author: jeff date: Thu Jul 25 12:31:24 2013 -0700 8014850: Third Party License Readme updates for 7u40 Reviewed-by: lana, tbell changeset 6837776bcdfa in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=6837776bcdfa author: lana date: Thu Jul 25 14:14:50 2013 -0700 Merge changeset 31908290e4c2 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=31908290e4c2 author: cl date: Wed Jul 31 21:27:44 2013 -0700 Added tag jdk7u40-b36 for changeset 6837776bcdfa changeset 21672c0e6691 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=21672c0e6691 author: asaha date: Fri Aug 02 13:11:34 2013 -0700 Added tag jdk7u40-b37 for changeset 31908290e4c2 changeset 81925e555c94 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=81925e555c94 author: asaha date: Wed Aug 07 12:10:16 2013 -0700 Added tag jdk7u40-b38 for changeset 21672c0e6691 changeset 0e83f513af68 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=0e83f513af68 author: katleman date: Mon Aug 12 12:07:51 2013 -0700 Added tag jdk7u40-b39 for changeset 81925e555c94 changeset d86802acd681 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=d86802acd681 author: andrew date: Wed Aug 21 14:21:20 2013 +0100 Merge jdk7u40-b40 diffstat: .hgtags | 21 +++++++++++++++++++++ .jcheck/conf | 2 -- THIRD_PARTY_README | 33 +++++++++++++++++++++++++++++++-- make/Makefile | 4 ++++ make/build.properties | 3 ++- make/build.xml | 2 +- 6 files changed, 59 insertions(+), 6 deletions(-) diffs (207 lines): diff -r 08c5065870ef -r d86802acd681 .hgtags --- a/.hgtags Wed Jul 10 13:49:08 2013 -0700 +++ b/.hgtags Wed Aug 21 14:21:20 2013 +0100 @@ -50,6 +50,7 @@ 9596dff460935f09684c11d156ce591f92584f0d jdk7-b73 1a66b08deed0459054b5b1bea3dfbead30d258fa jdk7-b74 2485f5641ed0829205aaaeb31ad711c2c2ef0de3 jdk7-b75 +83367f01297bf255f511f5291bbbbaa24a9c8459 icedtea7-1.12 8fb9b4be3cb1574302acde90549a4d333ef51e93 jdk7-b76 0398ae15b90ac76d87ee21844453e95ff8613e43 jdk7-b77 acc1e40a5874ebf32bebcb6ada565b3b40b7461c jdk7-b78 @@ -63,6 +64,7 @@ ef07347428f2198ae6b8144ac0b9086bbe39fd16 jdk7-b86 409db93d19c002333980df5b797c6b965150c7a0 jdk7-b87 f9b5d4867a26f8c4b90ad37fe2c345b721e93d6b jdk7-b88 +681f1f51926faf4c73d8905a429ff4ead6e9d622 icedtea7-1.13 6cea9a143208bc1185ced046942c0f4e45dbeba5 jdk7-b89 71c2c23a7c35b2896c87004023b9743b6d1b7758 jdk7-b90 97b6fa97b8ddb3a49394011c2a0ec5d6535e594c jdk7-b91 @@ -111,6 +113,7 @@ 3d7acdbb72cab55deedfd35f60d4732abc9d6ac4 jdk7-b134 9d0a61ac567b983da7cc8f4a7030f2245bb6dbab jdk7-b135 ed0f7f1f9511db4f9615b1426d22f8b961629275 jdk7-b136 +8e26c4aee63c04ee129bf9068f5eea47cc385177 icedtea-1.14 a15c9b058ae007d4ccb7e35ce44e4dfa977f090b jdk7-b137 53f212bed4f4304dce7f0bf0fa01c998c65bacd6 jdk7-b138 853b6bb99f9b58eb7cf8211c67d3b6e4f1228a3e jdk7-b139 @@ -123,6 +126,7 @@ 9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146 d34578643d1c6c752d4a6b5e79c6ab1b60850b4a jdk7u1-b01 58bc532d63418ac3c9b42460d89cdaf595c6f3e1 jdk7-b147 +fb7fb3071b642334520e5b9f4a87ce28717af61c icedtea-2.0-branchpoint cd2cc8b5edb045b950aed46d159b4fb8fc2fd1df jdk7u1-b02 82820a30201dbf4b80f1916f3d0f4a92ad21b61a jdk7u1-b03 baa2c13c70fea3d6e259a34f0903197fdceb64b5 jdk7u1-b04 @@ -141,6 +145,7 @@ f0802d8a0909f66ce19d3d44b33ddf4943aee076 jdk7u2-b12 f474527e77e4797d78bd6c3b31923fddcfd9d5c6 jdk7u2-b13 fc0769df8cd03fffc38c7a1ab6b2e2e7cc2506a8 jdk7u2-b21 +58f6a950cd726220e81eddb126ca5c57e3b368f2 icedtea-2.1-branchpoint fc0769df8cd03fffc38c7a1ab6b2e2e7cc2506a8 jdk7u3-b02 0ffc4995457773085f61c39f6d33edc242b41bcf jdk7u3-b03 f6de36b195cd315646213c7affd2cc15702edbfb jdk7u3-b04 @@ -157,6 +162,7 @@ 8919b2b02fcba65f833c68374f3bfdd9bc3ba814 jdk7u4-b10 4672e092f0968d503dc37f860b15ae7e2653f8d7 jdk7u4-b11 a4bf6a1aff54a98e9ff2b3fb53c719f658bec677 jdk7u4-b12 +e3537a4f75c7fcca16c349c3175bb0cdc2fbc29c icedtea-2.2-branchpoint 56eb9150d9ffdb71c47d72871e8ecc98b5f402de jdk7u4-b13 0e55881c2ee2984048c179d1e031cefb56a36bec jdk7u4-b14 0bea057f7ce1577e1b0306f2027c057e35394398 jdk7u5-b01 @@ -191,6 +197,7 @@ 47ae28da508861d77ee6dd408d822acf507b28ec jdk7u6-b15 5c7763489f4d2727c6d9de11f4114fb8ed839042 jdk7u6-b16 66c671f28cb2840ceec5b44c44bac073fc0b4256 jdk7u6-b17 +cee31ee38a190f77b1e21c0515bb28802dcd9678 icedtea-2.3-branchpoint 6aa859ef42876c51bb1b1d7fb4db32a916a7dcaa jdk7u6-b18 474a52eeeafb1feccffda68b96f651e65415c01d jdk7u6-b19 32acb67a79531daf678577c7ef1bde1867da807d jdk7u6-b20 @@ -258,6 +265,7 @@ 382bab6d9682eefa2185a1643dfa32d65b6c20e5 jdk7u12-b07 7c0c3aeb2c603baba2cabba9adc5a0a49afb4f47 jdk7u12-b08 96c4f3ec63552a87a825baabd7f0dfafec299483 jdk7u12-b09 +85fb9d7ce4af53f0a47d2b73d983c96239f9ff33 icedtea-2.4-branchpoint e5b1403fa68abe3ac7174c031f19e6ecf77624a0 jdk7u14-b10 db94066df63468172e074d59e71d82dc874ed7cb jdk7u14-b11 f9a326e92fafc4724f0af550c2cba82fea202a31 jdk7u14-b12 @@ -289,6 +297,7 @@ e120818fc321b5d9d8573a58bf5f6a6eb7471229 jdk7u21-b11 ff6f8ab2635c6e0b0f6bb1a68dca48b4fc31b107 jdk7u21-b30 a87ad97e80ae1861143b477d8a8990dc6ecc9173 jdk7u21-b12 +55c56025da9d9833aa8fff50cb897f7aa99f4a13 jdk7u21-b31 884621bb9042cd4a06e230307f1e26f1c518346d jdk7u25-b01 1311e3618232058b09fe7ea25eda4af8d3fe6807 jdk7u25-b02 8dc40e209a12638ea18bb7ee436051768afa5d39 jdk7u25-b03 @@ -304,6 +313,10 @@ 5ed8c453480063838b632c74f528924f529361a2 jdk7u25-b13 c6342ec6a12f7283e2a73a80a44dcdd3683e2e8b jdk7u25-b14 3b8323e24a636ac0638604d19fc116eb0eef6cdb jdk7u25-b15 +a87ad97e80ae1861143b477d8a8990dc6ecc9173 jdk7u21-b50 +642f469e52174d47ddb745f7fcc44f80340986f5 jdk7u25-b31 +a825dd3a95fd77b891255e88e1a78f6a476a45b3 jdk7u25-b33 +9ef1ee50dfa7c5a43b61d47435e3bdb53ccf5404 jdk7u25-b34 5d95c1e7c0913ad4bc0b5f0b559510d32557def2 jdk7u25-b30 7294a7be7dbde9c3789f9fa881baa6b8fcd51674 jdk7u25-b16 aaf5e30d5549ec5200b991806e62db3e866181a7 jdk7u25-b32 @@ -314,6 +327,7 @@ 5168a2c7af619364ddb342674ff880874c3b7897 jdk7u14-b19 e8c876a77def120b5eeb26535d0777c9b9f842f8 jdk7u14-b19 86ae75a68cc375cfc0559699b5270951aab09eb0 jdk7u14-b20 +cbb9be4fb46d8dfd3a8c32dc693f9501a64b9a47 icedtea-2.4.0 c31648d7a6ac692371f1e9abe95bc2856a7dc51c jdk7u14-b21 eb1c9eacea1f07c07e7e700db624649d3573dae4 jdk7u14-b22 e84535d2c292032669ac75a6a0afc5f23c708064 jdk7u40-b23 @@ -324,6 +338,13 @@ 9f2eea2fae59c5242d1bb4cbca967bb6fbb99865 jdk7u40-b28 bfe3575143fddbf71c2e570b580afef007d171e4 jdk7u40-b29 0586afeb2caa0b4595bf5b306657a5dd1f0d121c jdk7u40-b30 +91c95fd8eea822b47bcebd7eed22fdf3c404dd62 icedtea-2.4.1 9c343668b0a95e5510f715014884e5d45df9dfb0 jdk7u40-b31 056f998e75f87a299808671ecc0d96e270f62dca jdk7u40-b32 e36d8f754801c9d17585a9469f9b33f9799167f8 jdk7u40-b33 +08c5065870ef40008711a3d3ee3230323e5f5910 jdk7u40-b34 +524b9f7e6cabc8f7bad1824090e9b0dbf14ece74 jdk7u40-b35 +6837776bcdfafd0f963667156633142d433860f3 jdk7u40-b36 +31908290e4c2241ae9a8000c2a80e0f5fbad2a2c jdk7u40-b37 +21672c0e6691cfa1a477e7f0065afecb4148ddff jdk7u40-b38 +81925e555c94bb19c44bc21ff3e513ea19efbd10 jdk7u40-b39 diff -r 08c5065870ef -r d86802acd681 .jcheck/conf --- a/.jcheck/conf Wed Jul 10 13:49:08 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 08c5065870ef -r d86802acd681 THIRD_PARTY_README --- a/THIRD_PARTY_README Wed Jul 10 13:49:08 2013 -0700 +++ b/THIRD_PARTY_README Wed Aug 21 14:21:20 2013 +0100 @@ -1912,6 +1912,35 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to Sparkle v.1.5, +which is included with JRE 7 on Mac OS X. + +--- begin of LICENSE --- + +Copyright (c) 2012 Sparkle.org and Andy Matuschak + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- + %% Portions licensed from Taligent, Inc. ------------------------------------------------------------------------------- @@ -3169,12 +3198,12 @@ %% This notice is provided with respect to the following which is included with JRE 7, JDK 7, and OpenJDK 7, except where noted: - Apache Derby 10.8.1.2 [included with JDK 7 only] + Apache Derby 10.8.3.0 [included with JDK 7 only] Apache Jakarta BCEL 5.2 Apache Jakarta Regexp 1.4 Apache Santuario XMLSec-Java 1.4.2 Apache Xalan-Java 2.7.1 - Apache Xerces2 Java 2.10.0 + Apache Xerces2 Java 2.11.0 Apache XML Resolver 1.1 diff -r 08c5065870ef -r d86802acd681 make/Makefile --- a/make/Makefile Wed Jul 10 13:49:08 2013 -0700 +++ b/make/Makefile Wed Aug 21 14:21:20 2013 +0100 @@ -111,6 +111,10 @@ ANT_OPTIONS += -Ddebug.classfiles=true endif +ifeq ($(JAVAC_WARNINGS_FATAL), false) + ANT_OPTIONS += -Djavac.warnings.fatal= +endif + # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN) # and the somewhat misnamed CLASS_VERSION (-target NN) ifdef TARGET_CLASS_VERSION diff -r 08c5065870ef -r d86802acd681 make/build.properties --- a/make/build.properties Wed Jul 10 13:49:08 2013 -0700 +++ b/make/build.properties Wed Aug 21 14:21:20 2013 +0100 @@ -68,7 +68,8 @@ # set the following to -version to verify the versions of javac being used javac.version.opt = # in time, there should be no exceptions to -Xlint:all -javac.lint.opts = -Xlint:all,-deprecation -Werror +javac.warnings.fatal = -Werror +javac.lint.opts = -Xlint:all,-deprecation ${javac.warnings.fatal} # options for the task for javac #javadoc.jls3.url=http://java.sun.com/docs/books/jls/ diff -r 08c5065870ef -r d86802acd681 make/build.xml --- a/make/build.xml Wed Jul 10 13:49:08 2013 -0700 +++ b/make/build.xml Wed Aug 21 14:21:20 2013 +0100 @@ -877,7 +877,7 @@ + classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar"/> From andrew at icedtea.classpath.org Wed Aug 21 06:26:38 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 21 Aug 2013 13:26:38 +0000 Subject: /hg/release/icedtea7-forest-2.4/hotspot: 87 new changesets Message-ID: changeset c6efe89c3b38 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c6efe89c3b38 author: katleman date: Wed Jul 17 11:09:17 2013 -0700 Added tag jdk7u40-b34 for changeset 1274c4750118 changeset df77331d0dcb in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=df77331d0dcb author: amurillo date: Thu Jul 11 06:32:48 2013 -0700 8020381: new hotspot build - hs24-b54 Reviewed-by: jcoomes changeset 79c6a69a317e in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=79c6a69a317e author: zgu date: Fri Jul 12 16:51:50 2013 -0400 8012241: NMT huge memory footprint, it usually leads to OOME Summary: Enforce memory limitation on NMT to prevent JVM OOM Reviewed-by: acorn, dcubed, minqi changeset 9cc209978fc0 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=9cc209978fc0 author: brutisso date: Thu Jul 11 11:33:27 2013 +0200 8020155: PSR:PERF G1 not collecting old regions when humongous allocations interfer Summary: Take _last_young_gc into account when deciding on starting a concurrent mark. Also reviewed-by: per.liden at oracle.com. Reviewed-by: tschatzl, johnc changeset f82d5b2e8342 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f82d5b2e8342 author: kvn date: Fri Jul 12 14:01:37 2013 -0700 8020215: Different execution plan when using JIT vs interpreter Summary: fix bytecode analyzer Reviewed-by: twisti changeset 389886a6de6d in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=389886a6de6d author: kvn date: Fri Jul 12 14:03:10 2013 -0700 8007898: Incorrect optimization of Memory Barriers in Matcher::post_store_load_barrier() Summary: generate one "fat" membar instead of set of barriers for volitile store Reviewed-by: roland changeset 02b3bea9d79c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=02b3bea9d79c author: kvn date: Mon Jul 15 10:28:32 2013 -0700 8020433: Crash when using -XX:+RestoreMXCSROnJNICalls Summary: remove StubRoutines::x86::_mxcsr_std and use StubRoutines::_mxcsr_std Reviewed-by: jrose changeset 097c49f39521 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=097c49f39521 author: kvn date: Mon Jul 15 15:30:13 2013 -0700 8020425: Product options incorrectly removed in minor version Summary: give warning and ignore product flags which were removed in hs24 Reviewed-by: twisti changeset 370cbb35dbca in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=370cbb35dbca author: allwin date: Wed Jul 17 10:52:31 2013 +0200 7162400: Intermittent java.io.IOException: Bad file number during HotSpotVirtualMachine.executeCommand Reviewed-by: dcubed, dholmes, sspitsyn, mgerdin, ctornqvi, dsamersoff changeset fc4660f7922c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=fc4660f7922c author: rbackman date: Wed Jun 12 11:17:39 2013 +0200 8016131: nsk/sysdict/vm/stress/chain tests crash the VM in 'entry_frame_is_first()' Reviewed-by: jrose, kvn, mgronlun changeset a189e8cd4811 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a189e8cd4811 author: rbackman date: Wed Jul 17 12:54:00 2013 +0200 Merge changeset f9b44439e294 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f9b44439e294 author: jprovino date: Wed Jul 17 11:12:43 2013 -0400 8011569: ARM -- avoid native stack walking Summary: ARM compilers do not emit FramePointer on each native frame by default Reviewed-by: dholmes, kvn changeset 4cc0a758a4dc in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=4cc0a758a4dc author: jprovino date: Wed Jul 17 11:16:35 2013 -0400 Merge changeset a9e7513d1e09 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a9e7513d1e09 author: vladidan date: Wed Jul 17 12:07:45 2013 -0400 Merge changeset aeca24b2a9e5 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=aeca24b2a9e5 author: mgronlun date: Wed Jul 17 23:43:11 2013 +0200 8020547: Event based tracing needs a UNICODE string type Reviewed-by: egahlin, rbackman, dcubed, brutisso, acorn changeset c233f56b2e00 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c233f56b2e00 author: rbackman date: Wed Jul 17 13:48:15 2013 +0200 8020701: Avoid crashes in WatcherThread Reviewed-by: acorn, dcubed, dsimms changeset 2afa14dcd667 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2afa14dcd667 author: vkempik date: Thu Jul 18 19:26:27 2013 +0400 8015576: CMS: svc agent throws java.lang.RuntimeException: No type named "FreeList" in database Summary: Need to rename some variables in svc code after fix JDK-7131629. Reviewed-by: poonam, dholmes changeset 7abbb274df31 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7abbb274df31 author: amurillo date: Thu Jul 18 14:14:30 2013 -0400 Merge changeset f969880098fd in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f969880098fd author: amurillo date: Fri Jul 19 05:14:15 2013 -0700 Merge changeset 0af6bc95c1cb in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0af6bc95c1cb author: amurillo date: Fri Jul 19 05:14:16 2013 -0700 Added tag hs24-b54 for changeset f969880098fd changeset 28bc4fc3ae68 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=28bc4fc3ae68 author: katleman date: Wed Jul 24 14:44:55 2013 -0700 Added tag jdk7u40-b35 for changeset 0af6bc95c1cb changeset 3168f3e14339 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3168f3e14339 author: poonam date: Wed Mar 06 16:30:38 2013 -0800 8006309: More reliable control panel operation Summary: Added a comment in the dead Kernel code Reviewed-by: ahgross, sla, coleenp changeset bf2d84c5103d in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=bf2d84c5103d author: hseigel date: Tue Mar 12 16:23:30 2013 -0400 7158805: Better rewriting of nested subroutine calls Reviewed-by: mschoene, coleenp changeset 238f85fd3c98 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=238f85fd3c98 author: katleman date: Tue Mar 12 14:45:11 2013 -0700 Added tag jdk7u25-b01 for changeset bf2d84c5103d changeset 07119340f80f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=07119340f80f author: kvn date: Fri Mar 15 09:33:37 2013 -0700 8009699: Methodhandle lookup Reviewed-by: ahgross, jrose, jdn changeset cd733fbd5ca8 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=cd733fbd5ca8 author: katleman date: Tue Mar 19 14:31:25 2013 -0700 Added tag jdk7u25-b02 for changeset 07119340f80f changeset 655bea6843fb in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=655bea6843fb author: coffeys date: Thu Mar 21 22:29:35 2013 +0000 Merge changeset 96a4e612195c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=96a4e612195c author: katleman date: Tue Mar 26 14:17:39 2013 -0700 Added tag jdk7u25-b03 for changeset 655bea6843fb changeset 1bc51c62d162 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1bc51c62d162 author: katleman date: Tue Apr 02 12:12:05 2013 -0700 Added tag jdk7u25-b04 for changeset 96a4e612195c changeset fd81c9aeb9f5 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=fd81c9aeb9f5 author: mullan date: Fri Apr 05 08:36:12 2013 -0400 8001330: Improve on checking order Reviewed-by: acorn, hawtin changeset 1d448101a555 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1d448101a555 author: mullan date: Fri Apr 05 08:49:50 2013 -0400 Merge changeset e565780c14d2 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e565780c14d2 author: coffeys date: Fri Apr 05 21:33:44 2013 +0100 Merge changeset e37b316096a6 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e37b316096a6 author: katleman date: Mon Mar 04 14:17:15 2013 -0800 Added tag jdk7u17-b32 for changeset 8e04b403f580 changeset e22194a44dc9 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e22194a44dc9 author: asaha date: Mon Apr 08 15:53:00 2013 -0700 Merge changeset 47a9f44dd262 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=47a9f44dd262 author: asaha date: Mon Apr 08 16:27:31 2013 -0700 Merge changeset efec74090462 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=efec74090462 author: asaha date: Tue Apr 09 12:28:21 2013 -0700 8011806: 7u25-b05 hotspot fastdebug build failure Summary: Backed out changeset fd81c9aeb9f5 Reviewed-by: mullan changeset 7151c26b8388 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7151c26b8388 author: asaha date: Tue Apr 09 12:28:50 2013 -0700 Merge changeset fbb5f6083dd0 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=fbb5f6083dd0 author: katleman date: Wed Apr 10 12:42:48 2013 -0700 Added tag jdk7u25-b05 for changeset 7151c26b8388 changeset 83abf4b2fc8a in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=83abf4b2fc8a author: katleman date: Tue Apr 16 11:27:56 2013 -0700 Added tag jdk7u25-b06 for changeset fbb5f6083dd0 changeset 631f703ba794 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=631f703ba794 author: katleman date: Thu Apr 18 11:44:19 2013 -0700 Added tag jdk7u25-b07 for changeset 83abf4b2fc8a changeset 1410ff0b4ba2 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1410ff0b4ba2 author: mullan date: Thu Apr 18 17:52:39 2013 -0400 8001330: Improve on checking order 8011896: Add check for invalid offset for new AccessControlContext isAuthorized field Reviewed-by: acorn, hawtin changeset 525252cd9fca in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=525252cd9fca author: mullan date: Thu Apr 18 17:58:40 2013 -0400 Merge changeset 706a255a8404 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=706a255a8404 author: katleman date: Tue Apr 23 16:20:47 2013 -0700 Added tag jdk7u25-b08 for changeset 525252cd9fca changeset 402184622f60 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=402184622f60 author: katleman date: Tue Apr 30 12:25:07 2013 -0700 Added tag jdk7u25-b09 for changeset 706a255a8404 changeset a2e45b168404 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a2e45b168404 author: katleman date: Tue May 07 12:56:15 2013 -0700 Added tag jdk7u25-b10 for changeset 402184622f60 changeset cca49a35bf83 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=cca49a35bf83 author: asaha date: Fri May 10 10:32:15 2013 -0700 8014312: Fork hs23.25 hsx from hs23.21 for jdk7u25 and reinitialize build number Reviewed-by: jcoomes changeset 7ca68c0674df in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7ca68c0674df author: katleman date: Wed May 15 13:30:41 2013 -0700 Added tag jdk7u25-b11 for changeset cca49a35bf83 changeset 3e145a686fed in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3e145a686fed author: katleman date: Wed May 22 15:44:50 2013 -0700 Added tag jdk7u25-b12 for changeset 7ca68c0674df changeset 4fafaf293aa5 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=4fafaf293aa5 author: katleman date: Fri May 24 16:20:26 2013 -0700 Added tag jdk7u25-b13 for changeset 3e145a686fed changeset 40acb370626f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=40acb370626f author: katleman date: Tue Jun 04 10:47:35 2013 -0700 Added tag jdk7u25-b14 for changeset 4fafaf293aa5 changeset 97a3ebd62052 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=97a3ebd62052 author: katleman date: Thu Jun 06 11:41:33 2013 -0700 Added tag jdk7u25-b15 for changeset 40acb370626f changeset c4e434f6b4f3 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c4e434f6b4f3 author: asaha date: Thu Apr 11 10:31:19 2013 -0700 Merge changeset 39628b02a383 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=39628b02a383 author: tonyp date: Fri Mar 23 10:53:19 2012 -0400 7146246: G1: expose some of the -XX flags that drive which old regions to collect during mixed GCs Summary: Make two G1 cmd line flags available in product builds: G1HeapWastePercent (previously called: G1OldReclaimableThresholdPercent) and G1MixedGCCountTarget (previous called: G1MaxMixedGCNum). Also changed the default of the former from 1% to 5% and the default for G1OldCSetRegionLiveThresholdPercent to 90%. Reviewed-by: azeemj, jwilhelm, johnc changeset ae08248e0ed0 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ae08248e0ed0 author: dlong date: Thu Apr 26 16:24:15 2012 -0400 7162955: Attach api on Solaris, too many open files Summary: Release server-side socket after client receives it. Reviewed-by: sla, dsamersoff, dcubed, acorn Contributed-by: dean.long at oracle.com changeset 202b7ee59b9d in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=202b7ee59b9d author: brutisso date: Thu Aug 23 05:25:59 2012 +0200 7193157: G1: Make some develpflags available in product builds Summary: Also reviewed by: vitalyd at gmail.com. Make G1DefaultMinNewGenPercent, G1DefaultMaxNewGenPercent, G1OldCSetRegionLiveThresholdPercent and G1OldCSetRegionThresholdPercent experimental flags Reviewed-by: ysr, johnc, jmasa changeset 27ae6b2b524f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=27ae6b2b524f author: johnc date: Fri Apr 26 16:21:16 2013 -0700 8001424: G1: Rename certain G1-specific flags Summary: Rename G1DefaultMinNewGenPercent, G1DefaultMaxNewGenPercent, and G1OldCSetRegionLiveThresholdPercent to G1NewSizePercent, G1MaxNewSizePercent, and G1Mixed GCLiveThresholdPercent respectively. The previous names are no longer accepted. Reviewed-by: brutisso, ysr changeset 5b9431420b1d in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=5b9431420b1d author: johnc date: Tue Jan 15 12:32:26 2013 -0800 8001425: G1: Change the default values for certain G1 specific flags Summary: Changes to default and ergonomic flag values recommended by performance team. Changes were also reviewed by Monica Beckwith . Reviewed-by: brutisso, huntch changeset 00dbf9fa12ec in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=00dbf9fa12ec author: asaha date: Tue Apr 30 20:38:18 2013 -0700 8013719: Increment build # of hs23.21 to b02 Reviewed-by: jcoomes changeset 0940a9c6db12 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0940a9c6db12 author: katleman date: Wed May 01 14:51:53 2013 -0700 Added tag jdk7u21-b31 for changeset 00dbf9fa12ec changeset 3f4d8e9235d7 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3f4d8e9235d7 author: asaha date: Thu Jun 06 13:16:10 2013 -0700 Merge changeset d097540731cf in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d097540731cf author: asaha date: Thu Jun 06 13:24:02 2013 -0700 8016102: Increment build # of hs23.25 to b02 for 7u25-b31 psu Reviewed-by: jcoomes changeset 25ff58ae2858 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=25ff58ae2858 author: asaha date: Fri May 24 14:57:24 2013 -0700 8015411: Bump the hsx build number for 7u21-b50 for customer Reviewed-by: jcoomes changeset 8386245b59c3 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=8386245b59c3 author: iklam date: Thu Mar 28 19:59:36 2013 -0700 7107135: Stack guard pages are no more protected after loading a shared library with executable stack Summary: Detect the execstack attribute of the loaded library and attempt to fix the stack guard using Safepoint op. Reviewed-by: dholmes, zgu changeset 9da661161a5d in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=9da661161a5d author: katleman date: Tue May 28 10:36:25 2013 -0700 Added tag jdk7u21-b50 for changeset 8386245b59c3 changeset 7a89d807b23e in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7a89d807b23e author: asaha date: Thu Jun 06 20:19:58 2013 -0700 Merge changeset 8d0aee729774 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=8d0aee729774 author: jcoomes date: Fri May 31 08:00:19 2013 -0700 6725714: par compact - add a table to speed up bitmap searches Reviewed-by: jmasa, tschatzl changeset 73863f836e34 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=73863f836e34 author: jcoomes date: Thu May 23 03:08:19 2013 -0700 8014611: reserve_and_align() assumptions are invalid on windows Summary: also reviewed by ron.durbin at oracle.com, thomas.schatzl at oracle.com Reviewed-by: dcubed, brutisso changeset dd9090ad5521 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=dd9090ad5521 author: katleman date: Tue Jun 11 17:48:59 2013 -0700 Added tag jdk7u25-b31 for changeset 73863f836e34 changeset 3e6901d0021b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3e6901d0021b author: katleman date: Tue Jun 18 11:14:56 2013 -0700 Added tag jdk7u25-b33 for changeset dd9090ad5521 changeset 58c63a4e7746 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=58c63a4e7746 author: asaha date: Mon Jul 15 08:36:02 2013 -0700 8020525: Increment build # of hs23.25 to b03 for 7u25-b34 psu Reviewed-by: jcoomes changeset 9af6a8fa6a55 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=9af6a8fa6a55 author: rasbold date: Wed Apr 03 15:00:55 2013 -0700 8010437: guarantee(this->is8bit(imm8)) failed: Short forward jump exceeds 8-bit offset Summary: Fix shorten_branches() to accurately count an initial nop that may be inserted in a block that starts with a safepoint. Reviewed-by: kvn changeset 3265def2e0a2 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3265def2e0a2 author: katleman date: Thu Jul 18 20:46:24 2013 -0700 Added tag jdk7u25-b34 for changeset 9af6a8fa6a55 changeset 63085fd28f10 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=63085fd28f10 author: jcoomes date: Fri Jul 19 17:18:49 2013 -0700 Merge changeset 97c998b91726 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=97c998b91726 author: asaha date: Tue Jul 23 20:39:54 2013 -0700 Merge changeset cf4d5e8cadf6 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=cf4d5e8cadf6 author: asaha date: Wed Jul 24 18:58:03 2013 -0700 Merge changeset b5c3f432e953 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b5c3f432e953 author: jeff date: Thu Jul 25 12:30:09 2013 -0700 8014850: Third Party License Readme updates for 7u40 Reviewed-by: lana, tbell changeset 6ff570d6cca7 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=6ff570d6cca7 author: lana date: Thu Jul 25 14:12:16 2013 -0700 Merge changeset 3743512d8d4c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3743512d8d4c author: amurillo date: Fri Jul 19 05:54:39 2013 -0700 8020796: new hotspot build - hs24-b55 Reviewed-by: jcoomes changeset bf3070e2ed2c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=bf3070e2ed2c author: egahlin date: Fri Jul 26 16:19:59 2013 +0200 8021353: Event based tracing is missing thread exit Reviewed-by: allwin, dcubed, acorn changeset 675a89fd4548 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=675a89fd4548 author: amurillo date: Fri Jul 26 12:05:47 2013 -0700 Merge changeset 350bd7589660 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=350bd7589660 author: amurillo date: Fri Jul 26 12:05:48 2013 -0700 Added tag hs24-b55 for changeset 675a89fd4548 changeset 13edc330a937 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=13edc330a937 author: amurillo date: Mon Jul 29 15:11:57 2013 -0700 Merge changeset 295528bfcdd1 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=295528bfcdd1 author: cl date: Wed Jul 31 21:27:03 2013 -0700 Added tag jdk7u40-b36 for changeset 13edc330a937 changeset 1f3b0ff9649c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1f3b0ff9649c author: asaha date: Fri Aug 02 13:10:25 2013 -0700 Added tag jdk7u40-b37 for changeset 295528bfcdd1 changeset 74de360e3415 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=74de360e3415 author: asaha date: Wed Aug 07 12:09:13 2013 -0700 Added tag jdk7u40-b38 for changeset 1f3b0ff9649c changeset 86673506aeb6 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=86673506aeb6 author: katleman date: Mon Aug 12 12:07:33 2013 -0700 Added tag jdk7u40-b39 for changeset 74de360e3415 changeset 51a208c0e000 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=51a208c0e000 author: andrew date: Wed Aug 21 14:21:24 2013 +0100 Merge jdk7u40-b40 diffstat: .hgtags | 39 ++ .jcheck/conf | 2 - THIRD_PARTY_README | 33 +- agent/src/os/linux/Makefile | 11 +- agent/src/os/linux/libproc.h | 29 +- agent/src/share/classes/sun/jvm/hotspot/memory/BinaryTreeDictionary.java | 4 +- agent/src/share/classes/sun/jvm/hotspot/memory/FreeList.java | 2 +- make/hotspot_version | 2 +- make/linux/makefiles/adlc.make | 2 + make/linux/makefiles/buildtree.make | 2 + make/linux/makefiles/defs.make | 52 +- make/linux/makefiles/gcc.make | 30 +- make/linux/makefiles/jsig.make | 6 +- make/linux/makefiles/rules.make | 10 - make/linux/makefiles/saproc.make | 6 +- make/linux/makefiles/vm.make | 65 ++- make/linux/makefiles/zero.make | 4 + make/linux/platform_zero.in | 2 +- make/solaris/makefiles/adlc.make | 6 +- make/solaris/makefiles/dtrace.make | 16 + make/solaris/makefiles/gcc.make | 4 +- make/solaris/makefiles/jsig.make | 4 + make/solaris/makefiles/rules.make | 10 - make/solaris/makefiles/saproc.make | 4 + make/solaris/makefiles/vm.make | 12 + make/windows/makefiles/vm.make | 8 + src/cpu/sparc/vm/frame_sparc.inline.hpp | 4 +- src/cpu/x86/vm/c2_globals_x86.hpp | 2 +- src/cpu/x86/vm/frame_x86.inline.hpp | 5 +- src/cpu/x86/vm/stubGenerator_x86_64.cpp | 34 +- src/cpu/x86/vm/stubRoutines_x86_64.cpp | 1 - src/cpu/x86/vm/stubRoutines_x86_64.hpp | 6 - src/cpu/zero/vm/sharedRuntime_zero.cpp | 4 +- src/os/bsd/vm/attachListener_bsd.cpp | 26 +- src/os/linux/vm/attachListener_linux.cpp | 26 +- src/os/linux/vm/os_linux.cpp | 47 ++- src/os/posix/vm/os_posix.cpp | 49 +++ src/os/posix/vm/os_posix.hpp | 19 + src/os/solaris/vm/attachListener_solaris.cpp | 26 +- src/os/windows/vm/attachListener_windows.cpp | 6 +- src/os/windows/vm/os_windows.cpp | 28 + src/os/windows/vm/os_windows.hpp | 14 + src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp | 4 + src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp | 11 +- src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp | 4 + src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 4 + src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp | 4 + src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp | 4 + src/share/vm/asm/codeBuffer.hpp | 2 +- src/share/vm/ci/bcEscapeAnalyzer.cpp | 15 + src/share/vm/ci/bcEscapeAnalyzer.hpp | 1 + src/share/vm/ci/ciTypeFlow.cpp | 2 +- src/share/vm/classfile/systemDictionary.cpp | 1 - src/share/vm/compiler/methodLiveness.cpp | 12 +- src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp | 6 +- src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp | 4 +- src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp | 4 +- src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp | 2 +- src/share/vm/memory/collectorPolicy.cpp | 2 +- src/share/vm/memory/threadLocalAllocBuffer.cpp | 2 +- src/share/vm/opto/matcher.cpp | 71 ++-- src/share/vm/opto/parse3.cpp | 20 +- src/share/vm/prims/forte.cpp | 9 +- src/share/vm/prims/jni.cpp | 2 +- src/share/vm/prims/jvmtiEnv.cpp | 3 + src/share/vm/runtime/arguments.cpp | 30 +- src/share/vm/runtime/frame.cpp | 13 +- src/share/vm/runtime/frame.hpp | 4 +- src/share/vm/runtime/globals.hpp | 2 +- src/share/vm/runtime/javaCalls.hpp | 2 + src/share/vm/runtime/mutex.cpp | 4 + src/share/vm/runtime/os.cpp | 19 + src/share/vm/runtime/os.hpp | 8 + src/share/vm/runtime/thread.cpp | 13 +- src/share/vm/runtime/thread.hpp | 13 + src/share/vm/services/attachListener.hpp | 1 + src/share/vm/services/memTracker.cpp | 13 +- src/share/vm/shark/sharkCompiler.cpp | 4 +- src/share/vm/trace/trace.dtd | 3 - src/share/vm/trace/traceDataTypes.hpp | 4 +- src/share/vm/trace/traceEventClasses.xsl | 2 +- src/share/vm/trace/traceEventIds.xsl | 2 +- src/share/vm/trace/traceMacros.hpp | 1 + src/share/vm/trace/traceTypes.xsl | 2 +- src/share/vm/trace/tracetypes.xml | 22 +- src/share/vm/trace/xinclude.mod | 24 - src/share/vm/utilities/bitMap.hpp | 2 +- src/share/vm/utilities/globalDefinitions.hpp | 8 +- src/share/vm/utilities/ostream.cpp | 2 +- src/share/vm/utilities/vmError.cpp | 10 +- test/compiler/EscapeAnalysis/Test8020215.java | 82 +++++ test/compiler/cpuflags/RestoreMXCSR.java | 42 ++ test/compiler/membars/DekkerTest.java | 163 ++++++++++ test/runtime/7020373/GenOOMCrashClass.java | 157 +++++++++ test/runtime/7020373/Test7020373.sh | 4 + test/runtime/7020373/testcase.jar | Bin test/serviceability/attach/AttachWithStalePidFile.java | 139 ++++++++ test/serviceability/attach/AttachWithStalePidFileTarget.java | 27 + test/testlibrary/com/oracle/java/testlibrary/Platform.java | 62 +++ 99 files changed, 1462 insertions(+), 273 deletions(-) diffs (truncated from 3359 to 500 lines): diff -r 1274c4750118 -r 51a208c0e000 .hgtags --- a/.hgtags Thu Jul 11 06:25:25 2013 -0700 +++ b/.hgtags Wed Aug 21 14:21:24 2013 +0100 @@ -50,6 +50,7 @@ faf94d94786b621f8e13cbcc941ca69c6d967c3f jdk7-b73 f4b900403d6e4b0af51447bd13bbe23fe3a1dac7 jdk7-b74 d8dd291a362acb656026a9c0a9da48501505a1e7 jdk7-b75 +b4ab978ce52c41bb7e8ee86285e6c9f28122bbe1 icedtea7-1.12 9174bb32e934965288121f75394874eeb1fcb649 jdk7-b76 455105fc81d941482f8f8056afaa7aa0949c9300 jdk7-b77 e703499b4b51e3af756ae77c3d5e8b3058a14e4e jdk7-b78 @@ -87,6 +88,7 @@ 07226e9eab8f74b37346b32715f829a2ef2c3188 hs18-b01 e7e7e36ccdb5d56edd47e5744351202d38f3b7ad jdk7-b87 4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b jdk7-b88 +a393ff93e7e54dd94cc4211892605a32f9c77dad icedtea7-1.13 15836273ac2494f36ef62088bc1cb6f3f011f565 jdk7-b89 4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b hs18-b02 605c9707a766ff518cd841fc04f9bb4b36a3a30b jdk7-b90 @@ -160,6 +162,7 @@ b898f0fc3cedc972d884d31a751afd75969531cf hs21-b05 bd586e392d93b7ed7a1636dcc8da2b6a4203a102 jdk7-b136 bd586e392d93b7ed7a1636dcc8da2b6a4203a102 hs21-b06 +591c7dc0b2ee879f87a7b5519a5388e0d81520be icedtea-1.14 2dbcb4a4d8dace5fe78ceb563b134f1fb296cd8f jdk7-b137 2dbcb4a4d8dace5fe78ceb563b134f1fb296cd8f hs21-b07 0930dc920c185afbf40fed9a655290b8e5b16783 jdk7-b138 @@ -182,6 +185,7 @@ 38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16 81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147 81d815b05abb564aa1f4100ae13491c949b9a07e hs21-b17 +7693eb0fce1f6b484cce96c233ea20bdad8a09e0 icedtea-2.0-branchpoint 9b0ca45cd756d538c4c30afab280a91868eee1a5 jdk7u2-b01 0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01 31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02 @@ -210,6 +214,7 @@ 3ba0bb2e7c8ddac172f5b995aae57329cdd2dafa hs22-b10 f17fe2f4b6aacc19cbb8ee39476f2f13a1c4d3cd jdk7u2-b13 0744602f85c6fe62255326df595785eb2b32166d jdk7u2-b21 +f8f4d3f9b16567b91bcef4caaa8417c8de8015f0 icedtea-2.1-branchpoint a40d238623e5b1ab1224ea6b36dc5b23d0a53880 jdk7u3-b02 6986bfb4c82e00b938c140f2202133350e6e73f8 jdk7u3-b03 8e6375b46717d74d4885f839b4e72d03f357a45f jdk7u3-b04 @@ -264,6 +269,7 @@ f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16 f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16 931e5f39e365a0d550d79148ff87a7f9e864d2e1 hs23-b16 +a2c5354863dcb3d147b7b6f55ef514b1bfecf920 icedtea-2.2-branchpoint efb5f2662c96c472caa3327090268c75a86dd9c0 jdk7u4-b13 82e719a2e6416838b4421637646cbfd7104c7716 jdk7u4-b14 e5f7f95411fb9e837800b4152741c962118e5d7a jdk7u5-b01 @@ -311,6 +317,7 @@ cefe884c708aa6dfd63aff45f6c698a6bc346791 jdk7u6-b16 270a40a57b3d05ca64070208dcbb895b5b509d8e hs23.2-b08 7a37cec9d0d44ae6ea3d26a95407e42d99af6843 jdk7u6-b17 +354cfde7db2f1fd46312d883a63c8a76d5381bab icedtea-2.3-branchpoint df0df4ae5af2f40b7f630c53a86e8c3d68ef5b66 jdk7u6-b18 1257f4373a06f788bd656ae1c7a953a026a285b9 jdk7u6-b19 a0c2fa4baeb6aad6f33dc87b676b21345794d61e hs23.2-b09 @@ -440,6 +447,7 @@ 4f7ad6299356bfd2cfb448ea4c11e8ce0fbf69f4 jdk7u12-b07 3bb803664f3d9c831d094cbe22b4ee5757e780c8 jdk7u12-b08 92e382c3cccc0afbc7f72fccea4f996e05b66b3e jdk7u12-b09 +6e4feb17117d21e0e4360f2d0fbc68397ed3ba80 icedtea-2.4-branchpoint 7554f9b2bcc72204ac10ba8b08b8e648459504df hs24-b29 181528fd1e74863a902f171a2ad46270a2fb15e0 jdk7u14-b10 4008cf63c30133f2fac148a39903552fe7a33cea hs24-b30 @@ -460,6 +468,7 @@ 0d82bf449a610602b6e9ddcc9e076839d5351449 jdk7u17-b02 7b357c079370e2fd324c229f2e24c982915c80a0 jdk7u17-b30 22b6fd616cfe61774525a944f162bf5e7c418f03 jdk7u17-b31 +8e04b403f5803f79db949b61b6c086758b611678 jdk7u17-b32 be57a8d7a1a75971c3b1e7777dcacd20f3d33264 jdk7u21-b01 5119d89c7cc844190c0799dca85710e7592d42e7 jdk7u21-b02 ad14169fb640ca532193cca0fd6e14910f226075 jdk7u21-b03 @@ -472,7 +481,9 @@ d4a4c2bd389abcd80c25d20e0ffb7d5cee356715 jdk7u21-b10 d07dafb51e1d75f110a3c506c250d995235acca6 jdk7u21-b11 a977dedec81c346247631ead6f3364c76949d67a jdk7u21-b30 +8386245b59c3e82b7c728b7d3832ea342c62615d jdk7u21-b50 c5e4585a045fe165d067ec0e98af42eace20c5f8 jdk7u21-b12 +00dbf9fa12ec6b1ba15d9a9a12495f50e10837bf jdk7u21-b31 e3d2c238e29c421c3b5c001e400acbfb30790cfc jdk7u14-b14 860ae068f4dff62a77c8315f0335b7e935087e86 hs24-b34 12619005c5e29be6e65f0dc9891ca19d9ffb1aaa jdk7u14-b15 @@ -489,6 +500,7 @@ c23596bfe3b8a21076f8454a3cd6606ee7e928a5 jdk7u14-b20 d6cf0e0eee29e173b8446455991e22249da0e860 hs24-b39 3295faa5b5cc4f165c0e6798fd40ab4f5c17dd6d hs24-b40 +ed247f9fb4fee475dd6334d20e91779807522bb3 icedtea-2.4.0 3e88170d8be276660cd4f347bd514c446bb65d58 jdk7u14-b21 d90c913b810356d43c8e64f08c0f5e60f9c2ca08 hs24-b41 aa9a5e33e823df5f51e9b5d4e85ae91919424179 jdk7u14-b22 @@ -509,9 +521,36 @@ 88e43f47a8da8093743a1b6ca1ae4b79d994472a hs24-b49 24f785f94d2f5be0f5c48e80f2a6cc7f8815dd8b jdk7u40-b30 41118cf72ace4f0cee56a9ff437226e98e46e9d7 hs24-b50 +5f53e771711627b23e8c9ac53121e1e8ea9f00b4 icedtea-2.4.1 645b68762a367d82c2b55f76cae431b767bee3ac jdk7u40-b31 2417fa1acf2ba8521f480f2baef9af279ec2bf15 hs24-b51 9658c969b7cf0de256691a80f44dcfe73d72a02f jdk7u40-b32 15706a73a506943059a6bbf59e2ec8866a026114 hs24-b52 0b9149d22ee08fe13b4f198ff258a1348e27b8b2 jdk7u40-b33 1118c5d38ac0693d98f913485ceb3c57366cfbab hs24-b53 +1274c4750118bbdb3f3aa6dbf79af4568a2cca93 jdk7u40-b34 +f969880098fda55589cae8efaea5eff2c044e81e hs24-b54 +0af6bc95c1cb03ef08b3ef38c2fe0ea4309594d1 jdk7u40-b35 +bf2d84c5103d98db1697b50071a649ea23c4e33d jdk7u25-b01 +07119340f80f77dfcb03fa568641e80b43d4be74 jdk7u25-b02 +655bea6843fb7beabd8d9eeda59572c0c7055b85 jdk7u25-b03 +96a4e612195c0d753be24cf38fea0ee8ce30edcf jdk7u25-b04 +7151c26b838828a20cb28595ef1f70403d1868cf jdk7u25-b05 +fbb5f6083dd00ca7417e4a45311f33918bb2a5f0 jdk7u25-b06 +83abf4b2fc8a5bb7226177c5e4334bd0bfd7a8df jdk7u25-b07 +525252cd9fca4869c3fd81bc61299a85e73ff9c7 jdk7u25-b08 +706a255a8404b7e41579cea278df6bb87c314567 jdk7u25-b09 +402184622f60a2ba35479bdf124a8d4694835406 jdk7u25-b10 +cca49a35bf83664456af112482ffb3a7465d21fa jdk7u25-b11 +7ca68c0674df72fdd784de337c049404d2b5b0c3 jdk7u25-b12 +3e145a686fedd9eefdcb6b714241200ed236b41d jdk7u25-b13 +4fafaf293aa5666e8c9f5ca1d96c3f752305f586 jdk7u25-b14 +40acb370626fbc439e4cfed8854960a83a376fba jdk7u25-b15 +73863f836e343b4b8e3f018e5e8f7f1618529096 jdk7u25-b31 +dd9090ad552134cbb20d5dfc89f682f55e2570e9 jdk7u25-b33 +9af6a8fa6a557311bdf2fc124ae6adad59c9b78d jdk7u25-b34 +675a89fd4548389e3d54a29c6fe271d913e7eee6 hs24-b55 +13edc330a937d4323f38b6a59cc255b6d61c51dc jdk7u40-b36 +295528bfcdd10051f72572a26bfad2317b7de464 jdk7u40-b37 +1f3b0ff9649c4be3b08cc829d37eee98d9c6e605 jdk7u40-b38 +74de360e341530494c05af1ea1358abea0be93e0 jdk7u40-b39 diff -r 1274c4750118 -r 51a208c0e000 .jcheck/conf --- a/.jcheck/conf Thu Jul 11 06:25:25 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 1274c4750118 -r 51a208c0e000 THIRD_PARTY_README --- a/THIRD_PARTY_README Thu Jul 11 06:25:25 2013 -0700 +++ b/THIRD_PARTY_README Wed Aug 21 14:21:24 2013 +0100 @@ -1912,6 +1912,35 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to Sparkle v.1.5, +which is included with JRE 7 on Mac OS X. + +--- begin of LICENSE --- + +Copyright (c) 2012 Sparkle.org and Andy Matuschak + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- + %% Portions licensed from Taligent, Inc. ------------------------------------------------------------------------------- @@ -3169,12 +3198,12 @@ %% This notice is provided with respect to the following which is included with JRE 7, JDK 7, and OpenJDK 7, except where noted: - Apache Derby 10.8.1.2 [included with JDK 7 only] + Apache Derby 10.8.3.0 [included with JDK 7 only] Apache Jakarta BCEL 5.2 Apache Jakarta Regexp 1.4 Apache Santuario XMLSec-Java 1.4.2 Apache Xalan-Java 2.7.1 - Apache Xerces2 Java 2.10.0 + Apache Xerces2 Java 2.11.0 Apache XML Resolver 1.1 diff -r 1274c4750118 -r 51a208c0e000 agent/src/os/linux/Makefile --- a/agent/src/os/linux/Makefile Thu Jul 11 06:25:25 2013 -0700 +++ b/agent/src/os/linux/Makefile Wed Aug 21 14:21:24 2013 +0100 @@ -23,7 +23,12 @@ # ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi ) -GCC = gcc + +ifndef BUILD_GCC +BUILD_GCC = gcc +endif + +GCC = $(BUILD_GCC) JAVAH = ${JAVA_HOME}/bin/javah @@ -40,7 +45,7 @@ LIBS = -lthread_db -CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) -D_FILE_OFFSET_BITS=64 +CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES) -D_FILE_OFFSET_BITS=64 LIBSA = $(ARCH)/libsaproc.so @@ -73,7 +78,7 @@ $(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(OBJS) $(LIBS) test.o: test.c - $(GCC) -c -o test.o -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) test.c + $(GCC) -c -o test.o -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES) test.c test: test.o $(GCC) -o test test.o -L$(ARCH) -lsaproc $(LIBS) diff -r 1274c4750118 -r 51a208c0e000 agent/src/os/linux/libproc.h --- a/agent/src/os/linux/libproc.h Thu Jul 11 06:25:25 2013 -0700 +++ b/agent/src/os/linux/libproc.h Wed Aug 21 14:21:24 2013 +0100 @@ -41,9 +41,34 @@ These two files define pt_regs structure differently */ #ifdef _LP64 -#include "asm-sparc64/ptrace.h" +struct pt_regs { + unsigned long u_regs[16]; /* globals and ins */ + unsigned long tstate; + unsigned long tpc; + unsigned long tnpc; + unsigned int y; + + /* We encode a magic number, PT_REGS_MAGIC, along + * with the %tt (trap type) register value at trap + * entry time. The magic number allows us to identify + * accurately a trap stack frame in the stack + * unwinder, and the %tt value allows us to test + * things like "in a system call" etc. for an arbitray + * process. + * + * The PT_REGS_MAGIC is chosen such that it can be + * loaded completely using just a sethi instruction. + */ + unsigned int magic; +}; #else -#include "asm-sparc/ptrace.h" +struct pt_regs { + unsigned long psr; + unsigned long pc; + unsigned long npc; + unsigned long y; + unsigned long u_regs[16]; /* globals and ins */ +}; #endif #endif //sparc or sparcv9 diff -r 1274c4750118 -r 51a208c0e000 agent/src/share/classes/sun/jvm/hotspot/memory/BinaryTreeDictionary.java --- a/agent/src/share/classes/sun/jvm/hotspot/memory/BinaryTreeDictionary.java Thu Jul 11 06:25:25 2013 -0700 +++ b/agent/src/share/classes/sun/jvm/hotspot/memory/BinaryTreeDictionary.java Wed Aug 21 14:21:24 2013 +0100 @@ -40,8 +40,8 @@ } private static synchronized void initialize(TypeDataBase db) { - Type type = db.lookupType("BinaryTreeDictionary"); - totalSizeField = type.getCIntegerField("_totalSize"); + Type type = db.lookupType("BinaryTreeDictionary"); + totalSizeField = type.getCIntegerField("_total_size"); } // Fields diff -r 1274c4750118 -r 51a208c0e000 agent/src/share/classes/sun/jvm/hotspot/memory/FreeList.java --- a/agent/src/share/classes/sun/jvm/hotspot/memory/FreeList.java Thu Jul 11 06:25:25 2013 -0700 +++ b/agent/src/share/classes/sun/jvm/hotspot/memory/FreeList.java Wed Aug 21 14:21:24 2013 +0100 @@ -41,7 +41,7 @@ } private static synchronized void initialize(TypeDataBase db) { - Type type = db.lookupType("FreeList"); + Type type = db.lookupType("FreeList"); sizeField = type.getCIntegerField("_size"); countField = type.getCIntegerField("_count"); headerSize = type.getSize(); diff -r 1274c4750118 -r 51a208c0e000 make/hotspot_version --- a/make/hotspot_version Thu Jul 11 06:25:25 2013 -0700 +++ b/make/hotspot_version Wed Aug 21 14:21:24 2013 +0100 @@ -35,7 +35,7 @@ HS_MAJOR_VER=24 HS_MINOR_VER=0 -HS_BUILD_NUMBER=53 +HS_BUILD_NUMBER=55 JDK_MAJOR_VER=1 JDK_MINOR_VER=7 diff -r 1274c4750118 -r 51a208c0e000 make/linux/makefiles/adlc.make --- a/make/linux/makefiles/adlc.make Thu Jul 11 06:25:25 2013 -0700 +++ b/make/linux/makefiles/adlc.make Wed Aug 21 14:21:24 2013 +0100 @@ -68,7 +68,9 @@ # CFLAGS_WARN holds compiler options to suppress/enable warnings. # Compiler warnings are treated as errors +ifneq ($(COMPILER_WARNINGS_FATAL),false) CFLAGS_WARN = -Werror +endif CFLAGS += $(CFLAGS_WARN) OBJECTNAMES = \ diff -r 1274c4750118 -r 51a208c0e000 make/linux/makefiles/buildtree.make --- a/make/linux/makefiles/buildtree.make Thu Jul 11 06:25:25 2013 -0700 +++ b/make/linux/makefiles/buildtree.make Wed Aug 21 14:21:24 2013 +0100 @@ -57,6 +57,7 @@ # having to read the dependency files for the vm. -include $(SPEC) +include $(GAMMADIR)/make/defs.make include $(GAMMADIR)/make/scm.make include $(GAMMADIR)/make/altsrc.make @@ -194,6 +195,7 @@ $(BUILDTREE_COMMENT); \ echo; \ echo "Platform_file = $(PLATFORM_FILE)" | sed 's|$(GAMMADIR)|$$(GAMMADIR)|'; \ + echo "JVM_VARIANTS = $(JVM_VARIANTS)"; \ sed -n '/=/s/^ */Platform_/p' < $(PLATFORM_FILE); \ echo; \ echo "GAMMADIR = $(GAMMADIR)"; \ diff -r 1274c4750118 -r 51a208c0e000 make/linux/makefiles/defs.make --- a/make/linux/makefiles/defs.make Thu Jul 11 06:25:25 2013 -0700 +++ b/make/linux/makefiles/defs.make Wed Aug 21 14:21:24 2013 +0100 @@ -242,10 +242,14 @@ # client and server subdirectories have symbolic links to ../libjsig.so EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX) ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz - else - EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo + ifneq ($(ZERO_BUILD), true) + ifneq ($(STRIP_POLICY),no_strip) + ifeq ($(ZIP_DEBUGINFO_FILES),1) + EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz + else + EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo + endif + endif endif endif EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server @@ -254,11 +258,13 @@ ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz - else - EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo + ifneq ($(STRIP_POLICY),no_strip) + ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) + ifeq ($(ZIP_DEBUGINFO_FILES),1) + EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz + else + EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo + endif endif endif endif @@ -266,11 +272,13 @@ ifeq ($(JVM_VARIANT_CLIENT),true) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz - else - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo + ifneq ($(STRIP_POLICY),no_strip) + ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) + ifeq ($(ZIP_DEBUGINFO_FILES),1) + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz + else + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo + endif endif endif endif @@ -282,12 +290,16 @@ ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ $(EXPORT_LIB_DIR)/sa-jdi.jar ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) - ifeq ($(ZIP_DEBUGINFO_FILES),1) - ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz - ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz - else - ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo - ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo + ifneq ($(ZERO_BUILD), true) + ifneq ($(STRIP_POLICY),no_strip) + ifeq ($(ZIP_DEBUGINFO_FILES),1) + ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz + ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz + else + ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo + ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo + endif + endif endif endif ADD_SA_BINARIES/ppc = diff -r 1274c4750118 -r 51a208c0e000 make/linux/makefiles/gcc.make --- a/make/linux/makefiles/gcc.make Thu Jul 11 06:25:25 2013 -0700 +++ b/make/linux/makefiles/gcc.make Wed Aug 21 14:21:24 2013 +0100 @@ -30,22 +30,21 @@ # When cross-compiling the ALT_COMPILER_PATH points # to the cross-compilation toolset ifdef CROSS_COMPILE_ARCH - CXX = $(ALT_COMPILER_PATH)/g++ - CC = $(ALT_COMPILER_PATH)/gcc - HOSTCXX = g++ - HOSTCC = gcc - STRIP = $(ALT_COMPILER_PATH)/strip + CXX ?= $(ALT_COMPILER_PATH)/g++ + CC ?= $(ALT_COMPILER_PATH)/gcc + HOSTCXX ?= g++ + HOSTCC ?= gcc + STRIP ?= $(ALT_COMPILER_PATH)/strip else - CXX = g++ - CC = gcc - HOSTCXX = $(CXX) - HOSTCC = $(CC) - STRIP = strip + CXX ?= g++ + CC ?= gcc + HOSTCXX ?= $(CXX) + HOSTCC ?= $(CC) + STRIP ?= strip endif AS = $(CC) -c endif - # -dumpversion in gcc-2.91 shows "egcs-2.91.66". In later version, it only # prints the numbers (e.g. "2.95", "3.2.1") CC_VER_MAJOR := $(shell $(CC) -dumpversion | sed 's/egcs-//' | cut -d'.' -f1) @@ -66,15 +65,16 @@ # Compiler flags # position-independent code +ifneq ($(filter parisc ppc ppc64 s390 s390x sparc sparc64 sparcv9,$(ZERO_LIBARCH)),) PICFLAG = -fPIC +else +PICFLAG = -fpic +endif VM_PICFLAG/LIBJVM = $(PICFLAG) VM_PICFLAG/AOUT = VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO)) -ifeq ($(JVM_VARIANT_ZERO), true) -CFLAGS += $(LIBFFI_CFLAGS) -endif ifeq ($(JVM_VARIANT_ZEROSHARK), true) CFLAGS += $(LIBFFI_CFLAGS) CFLAGS += $(LLVM_CFLAGS) @@ -129,7 +129,9 @@ endif # Compiler warnings are treated as errors +ifneq ($(COMPILER_WARNINGS_FATAL),false) WARNINGS_ARE_ERRORS = -Werror +endif # Except for a few acceptable ones # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit diff -r 1274c4750118 -r 51a208c0e000 make/linux/makefiles/jsig.make --- a/make/linux/makefiles/jsig.make Thu Jul 11 06:25:25 2013 -0700 +++ b/make/linux/makefiles/jsig.make Wed Aug 21 14:21:24 2013 +0100 @@ -62,8 +62,10 @@ $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl $(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); } ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) + ifneq ($(STRIP_POLICY),no_strip) $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO) $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@ + endif ifeq ($(STRIP_POLICY),all_strip) $(QUIETLY) $(STRIP) $@ else @@ -73,10 +75,12 @@ endif From andrew at icedtea.classpath.org Wed Aug 21 06:26:58 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 21 Aug 2013 13:26:58 +0000 Subject: /hg/release/icedtea7-forest-2.4/jdk: 46 new changesets Message-ID: changeset 3730baa74076 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3730baa74076 author: katleman date: Wed Jul 17 11:09:26 2013 -0700 Added tag jdk7u40-b34 for changeset 7c1d6fc3b6da changeset 4b43dd02fca4 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4b43dd02fca4 author: jbachorik date: Thu Jul 11 09:21:09 2013 +0200 8019826: Test com/sun/management/HotSpotDiagnosticMXBean/SetVMOption.java fails with NPE Reviewed-by: sjiang, dholmes, mchung changeset 66a28466b569 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=66a28466b569 author: zhangshj date: Fri Jul 05 10:51:54 2013 +0800 8019381: HashMap.isEmpty is non-final, potential issues for get/remove Reviewed-by: chegar, mduigou changeset 5585357e2de0 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5585357e2de0 author: zhangshj date: Thu Jul 18 11:05:31 2013 +0100 8020625: [TESTBUG] java/util/HashMap/OverrideIsEmpty.java doesn't compile for jdk7u Reviewed-by: chegar, mduigou changeset 672f73d4c62a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=672f73d4c62a author: igerasim date: Fri Jul 12 10:56:49 2013 +0400 8020054: (tz) Support tzdata2013d Reviewed-by: coffeys, peytoia changeset 0931b4a280b1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0931b4a280b1 author: lana date: Thu Jul 18 11:19:22 2013 -0700 Merge changeset 8c8e85dae7ec in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8c8e85dae7ec author: katleman date: Wed Jul 24 14:45:07 2013 -0700 Added tag jdk7u40-b35 for changeset 0931b4a280b1 changeset 887a994b8ad1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=887a994b8ad1 author: asaha date: Thu Apr 11 10:36:47 2013 -0700 Merge changeset 7b0b6375576a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=7b0b6375576a author: mcherkas date: Fri Jan 18 18:50:00 2013 +0400 8005019: JTable passes row index instead of length when inserts selection interval Reviewed-by: serb, denis changeset e87b0b64e8b2 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e87b0b64e8b2 author: alitvinov date: Wed Mar 20 20:49:52 2013 +0400 6550588: java.awt.Desktop cannot open file with Windows UNC filename Reviewed-by: art, uta changeset 3ce1c37b104a in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3ce1c37b104a author: katleman date: Wed May 01 14:52:51 2013 -0700 Added tag jdk7u21-b31 for changeset e87b0b64e8b2 changeset a57652a92e85 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a57652a92e85 author: asaha date: Thu Jun 06 13:21:27 2013 -0700 Merge changeset 04398ea747be in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=04398ea747be author: katleman date: Tue May 28 10:36:34 2013 -0700 Added tag jdk7u21-b50 for changeset f3cf02a53684 changeset 40034a7b7dec in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=40034a7b7dec author: asaha date: Thu Jun 06 22:24:37 2013 -0700 Merge changeset 4ed1ef559d7c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4ed1ef559d7c author: katleman date: Tue Jun 11 17:49:10 2013 -0700 Added tag jdk7u25-b31 for changeset 40034a7b7dec changeset 82eb0ebe4ef3 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=82eb0ebe4ef3 author: katleman date: Tue Jun 18 11:15:12 2013 -0700 Added tag jdk7u25-b33 for changeset 4ed1ef559d7c changeset d8fb6c66e4d4 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d8fb6c66e4d4 author: asaha date: Tue Jul 16 15:35:07 2013 -0700 Merge changeset 6467da16eb63 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6467da16eb63 author: katleman date: Thu Jul 18 20:47:02 2013 -0700 Added tag jdk7u25-b34 for changeset 82eb0ebe4ef3 changeset 1a00898343c4 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1a00898343c4 author: asaha date: Fri Jul 19 22:20:09 2013 -0700 Merge changeset ac48bf943728 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ac48bf943728 author: asaha date: Tue Jul 23 20:42:16 2013 -0700 Merge changeset 4139a0986ba2 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4139a0986ba2 author: asaha date: Wed Jul 24 19:00:29 2013 -0700 Merge changeset 2d74fcc2b07e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2d74fcc2b07e author: mfang date: Wed Jul 24 16:21:45 2013 -0700 8020319: Update Japanese man pages for 7u40 Reviewed-by: ksrini, yhuang changeset 17d6bb15472f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=17d6bb15472f author: mfang date: Thu Jul 25 08:23:40 2013 -0700 Merge changeset fe948b47f3c0 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=fe948b47f3c0 author: khazra date: Mon Jul 22 21:51:29 2013 +0100 8020498: Crash when both libnet.so and libmawt.so are loaded Reviewed-by: chegar, dsamersoff changeset 6cd79e876c2c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6cd79e876c2c author: vinnie date: Tue Jul 23 00:46:10 2013 +0100 8020940: Valid OCSP responses are rejected for backdated enquiries Reviewed-by: mullan, valeriep changeset 51cd5710d96e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=51cd5710d96e author: vinnie date: Tue Jul 23 00:47:37 2013 +0100 Merge changeset d41a1959df12 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d41a1959df12 author: bpatel date: Mon Jul 22 17:02:01 2013 -0700 8016767: Provide man pages generated from DARB for OpenJDK Reviewed-by: darcy, robilad changeset c7aa16d3a823 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c7aa16d3a823 author: alexsch date: Tue Jul 23 16:33:35 2013 +0400 8020811: [macosx] Merge fault 7u25-7u40: Missed focus fix JDK-8012330 Reviewed-by: serb, art changeset 961894dbe220 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=961894dbe220 author: serb date: Wed Jul 24 20:39:22 2013 +0400 8017189: [macosx] AWT program menu disabled on Mac Reviewed-by: leonidr, anthony changeset 86d282f57326 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=86d282f57326 author: bpatel date: Wed Jul 24 15:05:04 2013 -0700 8021008: Provide java and jcmd man pages for Mac (OpenJDK) Reviewed-by: smarks, robilad changeset 19ffa204aae1 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=19ffa204aae1 author: pchelko date: Thu Jul 25 11:24:25 2013 +0400 8020371: [macosx] applets with Drag and Drop fail with IllegalArgumentException Reviewed-by: anthony, art changeset c103e0918d60 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c103e0918d60 author: bae date: Thu Jul 25 17:38:36 2013 +0400 8019201: Regression: java.awt.image.ConvolveOp throws java.awt.image.ImagingOpException Reviewed-by: prr changeset 3136030959da in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3136030959da author: lana date: Thu Jul 25 14:13:50 2013 -0700 Merge changeset cd7a4d0b218f in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=cd7a4d0b218f author: joehw date: Thu Jul 25 18:13:14 2013 -0700 8021148: Regression in SAXParserImpl in 7u40 b34 (NPE) Reviewed-by: chegar, lancea, dfuchs changeset 0721089b469e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0721089b469e author: cl date: Wed Jul 31 21:27:30 2013 -0700 Added tag jdk7u40-b36 for changeset cd7a4d0b218f changeset 46b203b37e06 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=46b203b37e06 author: bae date: Thu Aug 01 00:00:38 2013 +0400 8020983: OutOfMemoryError caused by non garbage collected JPEGImageWriter Instances Reviewed-by: prr, flar changeset 244dbaeab45e in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=244dbaeab45e author: alanb date: Thu Aug 01 17:25:29 2013 +0100 8021946: Disabling sun.reflect.Reflection.getCallerCaller(int) by default breaks several frameworks and libraries Reviewed-by: chegar, dholmes, dfuchs changeset 04036faa7fc4 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=04036faa7fc4 author: lana date: Thu Aug 01 10:45:49 2013 -0700 Merge changeset cf8cdc0fa8b8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=cf8cdc0fa8b8 author: asaha date: Fri Aug 02 13:11:02 2013 -0700 Added tag jdk7u40-b37 for changeset 04036faa7fc4 changeset 9f6cbd5a5c62 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9f6cbd5a5c62 author: leonidr date: Tue Aug 06 16:54:35 2013 +0400 8021381: JavaFX scene included in Swing JDialog not starting from Web Start Reviewed-by: art, dcherepanov changeset 070b277e1b43 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=070b277e1b43 author: lana date: Tue Aug 06 15:39:36 2013 -0700 Merge changeset 67e30ddcc6b3 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=67e30ddcc6b3 author: asaha date: Wed Aug 07 12:09:48 2013 -0700 Added tag jdk7u40-b38 for changeset 070b277e1b43 changeset 5e2ce096b9e5 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5e2ce096b9e5 author: joehw date: Fri Aug 09 14:00:24 2013 -0700 8022548: SPECJVM2008 has errors introduced in 7u40-b34 Reviewed-by: chegar, lancea changeset 33921df593ed in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=33921df593ed author: lana date: Fri Aug 09 14:40:01 2013 -0700 Merge changeset 42b57fb81c39 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=42b57fb81c39 author: katleman date: Mon Aug 12 12:07:45 2013 -0700 Added tag jdk7u40-b39 for changeset 33921df593ed changeset add1f94ecbe0 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=add1f94ecbe0 author: andrew date: Wed Aug 21 14:21:28 2013 +0100 Merge jdk7u40-b40 diffstat: .hgtags | 21 + .jcheck/conf | 2 - make/com/sun/java/pack/Makefile | 7 +- make/com/sun/nio/sctp/Makefile | 2 + make/common/Defs-linux.gmk | 23 +- make/common/Library.gmk | 40 +- make/common/Program.gmk | 80 +- make/common/Release.gmk | 20 +- make/common/shared/Compiler-gcc.gmk | 76 +- make/common/shared/Defs-java.gmk | 9 +- 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/net/FILES_c.gmk | 7 + make/java/net/Makefile | 26 +- make/java/nio/Makefile | 226 +- make/java/security/Makefile | 12 +- make/java/sun_nio/Makefile | 2 +- make/java/version/Makefile | 5 + make/javax/sound/SoundDefs.gmk | 48 + make/jdk_generic_profile.sh | 73 +- make/sun/awt/FILES_c_unix.gmk | 10 + make/sun/awt/Makefile | 2 +- make/sun/awt/mawt.gmk | 39 +- make/sun/cmm/lcms/FILES_c_unix.gmk | 7 +- make/sun/cmm/lcms/Makefile | 8 +- make/sun/font/Makefile | 6 +- make/sun/javazic/tzdata/VERSION | 2 +- make/sun/javazic/tzdata/africa | 16 +- make/sun/javazic/tzdata/asia | 40 +- make/sun/javazic/tzdata/australasia | 20 +- make/sun/javazic/tzdata/europe | 8 +- make/sun/javazic/tzdata/iso3166.tab | 17 +- make/sun/javazic/tzdata/southamerica | 4 +- make/sun/javazic/tzdata/zone.tab | 12 +- 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/pkcs11/mapfile-vers | 4 +- make/sun/splashscreen/FILES_c.gmk | 78 +- make/sun/splashscreen/Makefile | 35 +- make/sun/xawt/FILES_c_unix.gmk | 20 + make/sun/xawt/Makefile | 62 +- 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/bsd/doc/man/java.1 | 577 +- src/bsd/doc/man/jcmd.1 | 113 + src/linux/doc/man/ja/java.1 | 1334 ++++--- src/linux/doc/man/ja/jcmd.1 | 172 +- src/linux/doc/man/java.1 | 467 +- src/linux/doc/man/jcmd.1 | 79 +- src/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java | 9 +- src/macosx/classes/sun/lwawt/macosx/CDropTarget.java | 2 + src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java | 20 +- src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java | 7 +- src/macosx/native/sun/awt/AWTWindow.h | 3 + src/macosx/native/sun/awt/AWTWindow.m | 31 +- src/macosx/native/sun/awt/CMenuBar.m | 7 +- src/share/bin/java.c | 8 +- src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java | 6 +- src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java | 2 +- src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java | 2 +- 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/com/sun/java/swing/plaf/gtk/GTKStyle.java | 5 +- src/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java | 2 + src/share/classes/com/sun/jndi/dns/DnsContextFactory.java | 2 +- src/share/classes/com/sun/naming/internal/ResourceManager.java | 42 +- src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java | 2 +- src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java | 8 +- src/share/classes/com/sun/script/javascript/RhinoTopLevel.java | 3 +- src/share/classes/java/awt/color/ICC_Profile.java | 4 +- src/share/classes/java/io/InputStream.java | 2 +- src/share/classes/java/net/SocksSocketImpl.java | 4 +- src/share/classes/java/security/Policy.java | 1 - src/share/classes/java/util/HashMap.java | 8 +- src/share/classes/javax/crypto/Cipher.java | 172 +- 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/MenuSelectionManager.java | 5 +- src/share/classes/javax/swing/PopupFactory.java | 14 +- src/share/classes/javax/swing/SwingUtilities.java | 6 +- src/share/classes/javax/swing/SwingWorker.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 | 8 +- src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java | 3 +- 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/JTextComponent.java | 6 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java | 2 - src/share/classes/sun/applet/AppletPanel.java | 10 +- src/share/classes/sun/applet/AppletViewerPanel.java | 18 +- src/share/classes/sun/awt/AppContext.java | 6 +- src/share/classes/sun/awt/image/JPEGImageDecoder.java | 2 +- src/share/classes/sun/java2d/cmm/lcms/LCMS.java | 2 +- src/share/classes/sun/misc/SharedSecrets.java | 7 +- src/share/classes/sun/misc/VM.java | 20 +- src/share/classes/sun/misc/Version.java.template | 58 +- src/share/classes/sun/reflect/Reflection.java | 12 +- src/share/classes/sun/rmi/registry/RegistryImpl.java | 14 + src/share/classes/sun/rmi/server/LoaderHandler.java | 2 +- src/share/classes/sun/rmi/server/UnicastServerRef.java | 2 +- src/share/classes/sun/security/pkcs11/Config.java | 3 + src/share/classes/sun/security/pkcs11/P11Digest.java | 185 +- 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/pkcs11/SunPKCS11.java | 23 +- src/share/classes/sun/security/pkcs11/wrapper/PKCS11.java | 377 +- src/share/classes/sun/security/provider/certpath/OCSP.java | 18 +- src/share/classes/sun/security/provider/certpath/OCSPResponse.java | 3 +- src/share/classes/sun/security/ssl/SSLEngineImpl.java | 11 + src/share/classes/sun/security/util/KeyUtil.java | 21 +- src/share/classes/sun/security/util/ObjectIdentifier.java | 2 +- 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/native2ascii/Main.java | 9 +- src/share/classes/sun/util/calendar/ZoneInfoFile.java | 41 +- 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-linux | 4 + src/share/lib/security/java.security-macosx | 4 + src/share/lib/security/java.security-solaris | 4 + src/share/lib/security/java.security-windows | 4 + src/share/lib/security/nss.cfg.in | 5 + src/share/lib/security/sunpkcs11-solaris.cfg | 14 +- src/share/native/com/sun/java/util/jar/pack/unpack.cpp | 1 - src/share/native/com/sun/media/sound/SoundDefs.h | 8 + src/share/native/java/net/net_util.c | 17 +- src/share/native/java/util/zip/Deflater.c | 46 +- src/share/native/java/util/zip/Inflater.c | 6 +- src/share/native/sun/awt/image/awt_ImageRep.c | 2 +- src/share/native/sun/awt/image/jpeg/README | 385 -- src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 61 +- 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 | 111 +- src/share/native/sun/awt/splashscreen/splashscreen_gif.c | 11 +- src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c | 7 +- src/share/native/sun/awt/splashscreen/splashscreen_png.c | 2 +- src/share/native/sun/font/freetypeScaler.c | 7 +- src/share/native/sun/java2d/loops/TransformHelper.c | 11 +- src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h | 6 +- src/solaris/classes/sun/awt/X11/XWM.java | 10 +- src/solaris/classes/sun/awt/X11/XWindowPeer.java | 2 + src/solaris/doc/sun/man/man1/ja/java.1 | 1334 ++++--- src/solaris/doc/sun/man/man1/ja/jcmd.1 | 172 +- src/solaris/doc/sun/man/man1/java.1 | 467 +- src/solaris/doc/sun/man/man1/jcmd.1 | 79 +- 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 | 161 + 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 | 122 + src/solaris/native/common/deps/syscalls_fp.h | 79 + src/solaris/native/java/lang/java_props_md.c | 7 +- src/solaris/native/sun/awt/CUPSfuncs.c | 137 +- src/solaris/native/sun/awt/awt_GraphicsEnv.c | 2 +- src/solaris/native/sun/awt/awt_UNIXToolkit.c | 20 +- src/solaris/native/sun/awt/fontconfig.h | 941 ----- src/solaris/native/sun/awt/fontpath.c | 400 +- src/solaris/native/sun/awt/gtk2_interface.c | 988 +---- src/solaris/native/sun/awt/gtk2_interface.h | 580 +--- 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/net/spi/DefaultProxySelector.c | 465 +- src/solaris/native/sun/nio/ch/EPollArrayWrapper.c | 1 - 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/awt_Desktop.c | 103 +- test/Makefile | 6 + 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/UTIL/TestUtil.java | 13 +- test/com/sun/crypto/provider/TLS/TestLeadingZeroes.java | 420 ++ test/com/sun/management/HotSpotDiagnosticMXBean/SetVMOption.java | 15 +- test/java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java | 9 + test/java/net/URL/TestHttps.java | 34 + test/java/nio/MappedByteBuffer/Basic.java | 91 +- 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/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java | 9 +- test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java | 9 +- test/java/util/HashMap/OverrideIsEmpty.java | 70 + test/java/util/Locale/data/deflocale.sol10 | 1725 ---------- test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java | 1 + test/javax/imageio/plugins/jpeg/JpegWriterLeakTest.java | 125 + test/javax/xml/jaxp/parsers/8021148/JAXPSAXParserTest.java | 100 + test/javax/xml/jaxp/parsers/8021148/TestBase.java | 95 + test/javax/xml/jaxp/parsers/8022548/JDK8022548.xml | 14 + test/javax/xml/jaxp/parsers/8022548/JDK8022548.xsl | 618 +++ test/javax/xml/jaxp/parsers/8022548/TestBase.java | 73 + test/javax/xml/jaxp/parsers/8022548/XOMParserTest.java | 127 + test/sun/awt/image/ImagingLib/SamePackingTypeTest.java | 101 + 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/net/InetAddress/nameservice/dns/cname.sh | 2 +- test/sun/net/www/protocol/file/DirPermissionDenied.sh | 1 + test/sun/reflect/GetCallerClass.java | 8 +- test/sun/security/pkcs11/MessageDigest/TestCloning.java | 141 + test/sun/security/pkcs11/tls/TestLeadingZeroesP11.java | 410 ++ test/sun/tools/native2ascii/NativeErrors.java | 4 +- test/tools/launcher/RunpathTest.java | 84 + test/tools/pack200/MemoryAllocatorTest.java | 369 ++ 390 files changed, 35670 insertions(+), 33103 deletions(-) diffs (truncated from 78650 to 500 lines): diff -r 7c1d6fc3b6da -r add1f94ecbe0 .hgtags --- a/.hgtags Tue Jul 16 11:26:34 2013 -0700 +++ b/.hgtags Wed Aug 21 14:21:28 2013 +0100 @@ -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 @@ -258,6 +265,7 @@ cb81ee79a72d84f99b8e7d73b5ae73124b661fe7 jdk7u12-b07 b5e180ef18a0c823675bcd32edfbf2f5122d9722 jdk7u12-b08 2e7fe0208e9c928f2f539fecb6dc8a1401ecba9e jdk7u12-b09 +b171007921c3d01066848c88cbcb6a376df3f01c icedtea-2.4-branchpoint e012aace90500a88f51ce83fcd27791f5dbf493f jdk7u14-b10 9eb82fb221f3b34a5df97e7db3c949fdb0b6fee0 jdk7u14-b11 ee3ab2ed2371dd72ad5a75ebb6b6b69071e29390 jdk7u14-b12 @@ -284,7 +292,9 @@ f447c3bbf074439ece0ce9fea82c857f93817801 jdk7u21-b10 f9323b9d020ce8d313af2d2e2682e2b6cabcc40d jdk7u21-b11 08ed0bfc9668f04ce4e3803f16aad92f6e50f885 jdk7u21-b30 +f3cf02a53684b9fbefabb212c80dfbea0c27f113 jdk7u21-b50 f3cf02a53684b9fbefabb212c80dfbea0c27f113 jdk7u21-b12 +e87b0b64e8b248b51bc65a8131ce29874f9d6a0b jdk7u21-b31 a5e712ea6944b1c81bcd5343a50645964f12b107 jdk7u21-b02 9d87f5f84afef6ba4c92523a76e3c81fd9acfa00 jdk7u21-b03 139d3e3b62d49374112ce1add84cd3d1e5ed5335 jdk7u21-b04 @@ -303,6 +313,9 @@ ba6c3d64b94d17d90b86e36b7a282480a1c6808a jdk7u25-b13 a71103b8cbb155a4af136baaee4f4bdd30ee817c jdk7u25-b14 e1768e2070c938ec97325ad48b0d281e3031a29c jdk7u25-b15 +40034a7b7dec4d984139e154008e82e35d0ed212 jdk7u25-b31 +4ed1ef559d7c0058991eaf7e069b851940be432c jdk7u25-b33 +82eb0ebe4ef33f85054faf38a17f9ab4e14c2d60 jdk7u25-b34 0d68732acbd4b6669512b1d2be496a9e391795a9 jdk7u25-b30 173b399abd8aa2e4fdc0066c977719670d180125 jdk7u25-b16 55f01444cf58c8004df9a9634c1bd7ff87caa370 jdk7u25-b32 @@ -313,6 +326,7 @@ eb4807b899c84c92959b66f888f8cc8b028c7665 jdk7u14-b19 a249c45148c51dc53250c5d0c3d506ec5f9b88ab jdk7u14-b19 bb8764ec11c2c4ca318bcf6aabdabd29c70b2cd1 jdk7u14-b20 +d1563025e086a464f05414267b84a6408f7b377d icedtea-2.4.0 0a00f10abb2df203f13a723be158fb759e54b19b jdk7u14-b21 d4bf5c15837c47d179c71f6df8716ad9bef53ef9 jdk7u14-b22 a76a886dc057582bf332e60a023d8f8a35526217 jdk7u40-b23 @@ -323,6 +337,13 @@ 2043900095890e676f5ed0f959f470e2138c2a9a jdk7u40-b28 d3186a0676dbc7ab80e00fa67f952b67933d5a35 jdk7u40-b29 60d52db33828bf0355a94be2a82df90c901592f3 jdk7u40-b30 +65d95818d79e340d042457ee1a8155d7658e86b6 icedtea-2.4.1 c2522d149ff6663ed1d3602c88c286cff25a43a7 jdk7u40-b31 b9f86896cd0aa9b83e472a90b20ae7c253fba633 jdk7u40-b32 419939ecee8311c8a38ff624ae67e473f8c60e51 jdk7u40-b33 +7c1d6fc3b6da19c7b7c0aad0716a2d810dbb974b jdk7u40-b34 +0931b4a280b1e9b3b12936222d1bc6d427310f79 jdk7u40-b35 +cd7a4d0b218f98511068d8336aa3f4cbaf10b128 jdk7u40-b36 +04036faa7fc4ec11a268c190cf1712d19c77b4ba jdk7u40-b37 +070b277e1b43cc4b6a4e1ae419d1273970f718ed jdk7u40-b38 +33921df593eda3d241d0d1322effc21486a6bb94 jdk7u40-b39 diff -r 7c1d6fc3b6da -r add1f94ecbe0 .jcheck/conf --- a/.jcheck/conf Tue Jul 16 11:26:34 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 7c1d6fc3b6da -r add1f94ecbe0 make/com/sun/java/pack/Makefile --- a/make/com/sun/java/pack/Makefile Tue Jul 16 11:26:34 2013 -0700 +++ b/make/com/sun/java/pack/Makefile Wed Aug 21 14:21:28 2013 +0100 @@ -75,7 +75,7 @@ OTHER_CXXFLAGS += $(ZINCLUDE) LDDFLAGS += $(ZIPOBJS) else - LDDFLAGS += $(ZLIB_LIBS) + OTHER_LDLIBS += $(ZLIB_LIBS) OTHER_CXXFLAGS += $(ZLIB_CFLAGS) -DSYSTEM_ZLIB endif else @@ -99,8 +99,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 +156,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 7c1d6fc3b6da -r add1f94ecbe0 make/com/sun/nio/sctp/Makefile --- a/make/com/sun/nio/sctp/Makefile Tue Jul 16 11:26:34 2013 -0700 +++ b/make/com/sun/nio/sctp/Makefile Wed Aug 21 14:21:28 2013 +0100 @@ -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 7c1d6fc3b6da -r add1f94ecbe0 make/common/Defs-linux.gmk --- a/make/common/Defs-linux.gmk Tue Jul 16 11:26:34 2013 -0700 +++ b/make/common/Defs-linux.gmk Wed Aug 21 14:21:28 2013 +0100 @@ -188,15 +188,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) @@ -286,11 +297,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 7c1d6fc3b6da -r add1f94ecbe0 make/common/Library.gmk --- a/make/common/Library.gmk Tue Jul 16 11:26:34 2013 -0700 +++ b/make/common/Library.gmk Wed Aug 21 14:21:28 2013 +0100 @@ -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 7c1d6fc3b6da -r add1f94ecbe0 make/common/Program.gmk --- a/make/common/Program.gmk Tue Jul 16 11:26:34 2013 -0700 +++ b/make/common/Program.gmk Wed Aug 21 14:21:28 2013 +0100 @@ -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 @@ -126,6 +128,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) @@ -250,7 +272,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. @@ -260,19 +283,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 @@ -286,17 +310,19 @@ # implied else here is no stripping at all endif endif - ifeq ($(ZIP_DEBUGINFO_FILES),1) - (set -e ; \ - $(CD) $(@D) ; \ - $(ZIPEXE) -q $(@F).diz $(@F).debuginfo ; \ - $(RM) $(@F).debuginfo ; \ - ) - # save ZIP'ed debug info with rest of the program's build artifacts - $(MV) $@.diz $(OBJDIR) - else - # save debug info with rest of the program's build artifacts - $(MV) $@.debuginfo $(OBJDIR) + ifneq ($(STRIP_POLICY),no_strip) + ifeq ($(ZIP_DEBUGINFO_FILES),1) + (set -e ; \ + $(CD) $(@D) ; \ + $(ZIPEXE) -q $(@F).diz $(@F).debuginfo ; \ + $(RM) $(@F).debuginfo ; \ + ) + # save ZIP'ed debug info with rest of the program's build artifacts + $(MV) $@.diz $(OBJDIR) + else + # save debug info with rest of the program's build artifacts + $(MV) $@.debuginfo $(OBJDIR) + endif endif endif # PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS endif # ENABLE_FULL_DEBUG_SYMBOLS @@ -363,7 +389,9 @@ OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3 endif # SYSTEM_ZLIB else # PLATFORM !MACOSX - OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3 + ifneq ($(SYSTEM_ZLIB), true) + OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3 + endif endif OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"' diff -r 7c1d6fc3b6da -r add1f94ecbe0 make/common/Release.gmk --- a/make/common/Release.gmk Tue Jul 16 11:26:34 2013 -0700 +++ b/make/common/Release.gmk Wed Aug 21 14:21:28 2013 +0100 @@ -1116,13 +1116,9 @@ for d in $(SOURCE_DIRS); do \ $(RM) $(ABS_TEMPDIR)/src-files.list; \ ($(CD) $$d && \ - for sd in $(SOURCES) ; do \ - if [ -d $$sd ] ; then \ - $(FIND) $$sd $(SOURCE_FILES_filter) \ - -name '*.java' -print \ - >> $(ABS_TEMPDIR)/src-files.list ; \ - fi; \ - done ; \ + $(FIND) . $(SOURCE_FILES_filter) \ + -name '*.java' -print \ + >> $(ABS_TEMPDIR)/src-files.list ; \ ) ; \ if [ -f $(ABS_TEMPDIR)/src-files.list ] ; then \ ($(CD) $$d && $(TAR) cf - -T $(ABS_TEMPDIR)/src-files.list ) \ @@ -1133,13 +1129,9 @@ for d in $(SOURCE_DIRS); do \ $(RM) $(ABS_TEMPDIR)/src-files.list; \ ($(CD) $$d && \ - for sd in $(SOURCES) ; do \ - if [ -d $$sd ] ; then \ - $(FIND) $$sd $(SOURCE_FILES_filter) \ - -name '*.java' -print \ - >> $(ABS_TEMPDIR)/src-files.list ; \ - fi; \ - done ; \ + $(FIND) . $(SOURCE_FILES_filter) \ + -name '*.java' -print \ + >> $(ABS_TEMPDIR)/src-files.list ; \ ) ; \ if [ -f $(ABS_TEMPDIR)/src-files.list ] ; then \ ($(CD) $$d && $(TAR) cf - `$(CAT) $(ABS_TEMPDIR)/src-files.list`) \ diff -r 7c1d6fc3b6da -r add1f94ecbe0 make/common/shared/Compiler-gcc.gmk --- a/make/common/shared/Compiler-gcc.gmk Tue Jul 16 11:26:34 2013 -0700 +++ b/make/common/shared/Compiler-gcc.gmk Wed Aug 21 14:21:28 2013 +0100 @@ -53,18 +53,84 @@ ifeq ($(PLATFORM), linux) + ifndef BUILD_GCC + BUILD_GCC=$(COMPILER_PATH)gcc + endif + + ifndef BUILD_CPP + BUILD_CPP=$(COMPILER_PATH)g++ + endif + # Settings specific to Linux - CC = $(COMPILER_PATH)gcc - CPP = $(COMPILER_PATH)gcc -E + CC = $(BUILD_GCC) + CPP = $(BUILD_GCC) -E # statically link libstdc++ before C++ ABI is stablized on Linux - STATIC_CXX = true + ifneq ($(STATIC_CXX),false) + STATIC_CXX = true + endif ifeq ($(STATIC_CXX),true) # g++ always dynamically links libstdc++, even we use "-Wl,-Bstatic -lstdc++" # We need to use gcc to statically link the C++ runtime. gcc and g++ use # the same subprocess to compile C++ files, so it is OK to build using gcc. - CXX = $(COMPILER_PATH)gcc + CXX = $(BUILD_GCC) else - CXX = $(COMPILER_PATH)g++ + CXX = $(BUILD_CPP) + endif + ifeq ($(ARCH), alpha) + # alpha + REQUIRED_CC_VER = 3.2 + REQUIRED_GCC_VER = 3.2.* + endif + ifeq ($(ARCH), amd64) + # amd64 + REQUIRED_CC_VER = 3.2 + REQUIRED_GCC_VER = 3.2.* + endif + ifeq ($(ARCH), arm) + # arm + REQUIRED_CC_VER = 3.2 + REQUIRED_GCC_VER = 3.2.* + endif + ifeq ($(ARCH), i586) + # i586 + REQUIRED_CC_VER = 3.2 + REQUIRED_GCC_VER = 3.2.1* + REQUIRED_GCC_VER_INT = 3.2.1-7a + endif + ifeq ($(ARCH), ia64) + # ia64 From andrew at icedtea.classpath.org Wed Aug 21 06:36:00 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 21 Aug 2013 13:36:00 +0000 Subject: /hg/release/icedtea7-forest-2.3/jdk: 2 new changesets Message-ID: changeset 1dad45fa401d in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=1dad45fa401d 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 dbf9b854ae55 in /hg/release/icedtea7-forest-2.3/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=dbf9b854ae55 author: igerasim date: Fri Jul 12 10:56:49 2013 +0400 8020054: (tz) Support tzdata2013d Reviewed-by: coffeys, peytoia diffstat: make/sun/javazic/tzdata/VERSION | 2 +- make/sun/javazic/tzdata/africa | 16 ++- make/sun/javazic/tzdata/antarctica | 42 +---------- make/sun/javazic/tzdata/asia | 102 +++++++++++--------------- make/sun/javazic/tzdata/australasia | 41 ++++++++-- make/sun/javazic/tzdata/europe | 8 +- make/sun/javazic/tzdata/iso3166.tab | 17 ++-- make/sun/javazic/tzdata/southamerica | 14 +- make/sun/javazic/tzdata/zone.tab | 14 ++- make/tools/src/build/tools/javazic/Rule.java | 2 +- 10 files changed, 120 insertions(+), 138 deletions(-) diffs (truncated from 538 to 500 lines): diff -r a1ec65ac926d -r dbf9b854ae55 make/sun/javazic/tzdata/VERSION --- a/make/sun/javazic/tzdata/VERSION Thu Aug 01 17:25:29 2013 +0100 +++ b/make/sun/javazic/tzdata/VERSION Fri Jul 12 10:56:49 2013 +0400 @@ -21,4 +21,4 @@ # or visit www.oracle.com if you need additional information or have any # questions. # -tzdata2013b +tzdata2013d diff -r a1ec65ac926d -r dbf9b854ae55 make/sun/javazic/tzdata/africa --- a/make/sun/javazic/tzdata/africa Thu Aug 01 17:25:29 2013 +0100 +++ b/make/sun/javazic/tzdata/africa Fri Jul 12 10:56:49 2013 +0400 @@ -875,12 +875,18 @@ # announced that year's Ramadan daylight-saving transitions would be # 2012-07-20 and 2012-08-20; see # . -# + +# From Andrew Paprocki (2013-07-02): +# Morocco announced that the year's Ramadan daylight-savings +# transitions would be 2013-07-07 and 2013-08-10; see: +# http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10 + +# From Paul Eggert (2013-07-03): # To estimate what the Moroccan government will do in future years, -# transition dates for 2013 through 2021 were determined by running +# transition dates for 2014 through 2021 were determined by running # the following program under GNU Emacs 24.3: # -# (let ((islamic-year 1434)) +# (let ((islamic-year 1435)) # (while (< islamic-year 1444) # (let ((a # (calendar-gregorian-from-absolute @@ -933,8 +939,8 @@ 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 2013 only - Jul 7 3:00 0 - +Rule Morocco 2013 only - Aug 10 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 - diff -r a1ec65ac926d -r dbf9b854ae55 make/sun/javazic/tzdata/antarctica --- a/make/sun/javazic/tzdata/antarctica Thu Aug 01 17:25:29 2013 +0100 +++ b/make/sun/javazic/tzdata/antarctica Fri Jul 12 10:56:49 2013 +0400 @@ -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 a1ec65ac926d -r dbf9b854ae55 make/sun/javazic/tzdata/asia --- a/make/sun/javazic/tzdata/asia Thu Aug 01 17:25:29 2013 +0100 +++ b/make/sun/javazic/tzdata/asia Fri Jul 12 10:56:49 2013 +0400 @@ -1235,39 +1235,21 @@ Rule Zion 2012 only - Mar Fri>=26 2:00 1:00 D Rule Zion 2012 only - Sep 23 2:00 0 S -# From Ephraim Silverberg (2012-10-18): -# Yesterday, the Interior Ministry Committee, after more than a year -# past, approved sending the proposed June 2011 changes to the Time -# Decree Law back to the Knesset for second and third (final) votes -# before the upcoming elections on Jan. 22, 2013. Hence, although the -# changes are not yet law, they are expected to be so before February 2013. +# From Ephraim Silverberg (2013-06-27): +# On June 23, 2013, the Israeli government approved changes to the +# Time Decree Law. The next day, the changes passed the First Reading +# in the Knesset. The law is expected to pass the Second and Third +# (final) Readings by the beginning of September 2013. # -# As of 2013, DST starts at 02:00 on the Friday before the last Sunday in March. -# DST ends at 02:00 on the first Sunday after October 1, unless it occurs on the -# second day of the Jewish Rosh Hashana holiday, in which case DST ends a day -# later (i.e. at 02:00 the first Monday after October 2). -# [Rosh Hashana holidays are factored in until 2100.] - -# From Ephraim Silverberg (2012-11-05): -# The Knesset passed today (in second and final readings) the amendment to the -# Time Decree Law making the changes ... law. +# As of 2013, DST starts at 02:00 on the Friday before the last Sunday +# in March. DST ends at 02:00 on the last Sunday of October. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Zion 2013 max - Mar Fri>=23 2:00 1:00 D -Rule Zion 2013 2026 - Oct Sun>=2 2:00 0 S -Rule Zion 2027 only - Oct Mon>=3 2:00 0 S -Rule Zion 2028 max - Oct Sun>=2 2:00 0 S -# The following rules are commented out for now, as they break older -# versions of zic that support only signed 32-bit timestamps, i.e., -# through 2038-01-19 03:14:07 UTC. -#Rule Zion 2028 2053 - Oct Sun>=2 2:00 0 S -#Rule Zion 2054 only - Oct Mon>=3 2:00 0 S -#Rule Zion 2055 2080 - Oct Sun>=2 2:00 0 S -#Rule Zion 2081 only - Oct Mon>=3 2:00 0 S -#Rule Zion 2082 max - Oct Sun>=2 2:00 0 S +Rule Zion 2013 max - Oct lastSun 2:00 0 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Jerusalem 2:20:56 - LMT 1880 +Zone Asia/Jerusalem 2:20:54 - LMT 1880 2:20:40 - JMT 1918 # Jerusalem Mean Time? 2:00 Zion I%sT @@ -2314,11 +2296,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 +2323,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 +2344,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 @@ -2566,8 +2552,8 @@ Rule Syria 2007 only - Mar lastFri 0:00 1:00 S # From Jesper Norgard (2007-10-27): # The sister center ICARDA of my work CIMMYT is confirming that Syria DST will -# not take place 1.st November at 0:00 o'clock but 1.st November at 24:00 or -# rather Midnight between Thursday and Friday. This does make more sence than +# not take place 1st November at 0:00 o'clock but 1st November at 24:00 or +# rather Midnight between Thursday and Friday. This does make more sense than # having it between Wednesday and Thursday (two workdays in Syria) since the # weekend in Syria is not Saturday and Sunday, but Friday and Saturday. So now # it is implemented at midnight of the last workday before weekend... diff -r a1ec65ac926d -r dbf9b854ae55 make/sun/javazic/tzdata/australasia --- a/make/sun/javazic/tzdata/australasia Thu Aug 01 17:25:29 2013 +0100 +++ b/make/sun/javazic/tzdata/australasia Fri Jul 12 10:56:49 2013 +0400 @@ -241,9 +241,32 @@ # 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. +# +# From Arthur David Olson (2013-05-23): +# The 1919 transition is overspecified below so pre-2013 zics +# will produce a binary file with an EST-type as the first 32-bit type; +# this is required for correct handling of times before 1916 by +# pre-2013 versions of localtime. +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 1 0:00s + 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] @@ -1481,12 +1504,12 @@ # From Paul Eggert (2000-01-08): # IATA SSIM (1999-09) says DST ends 0100 local time. Go with McDow. -# From the BBC World Service (1998-10-31 11:32 UTC): +# From the BBC World Service in +# http://news.bbc.co.uk/2/hi/asia-pacific/205226.stm (1998-10-31 16:03 UTC): # The Fijiian government says the main reasons for the time change is to -# improve productivity and reduce road accidents. But correspondents say it -# also hopes the move will boost Fiji's ability to compete with other pacific -# islands in the effort to attract tourists to witness the dawning of the new -# millenium. +# improve productivity and reduce road accidents.... [T]he move is also +# intended to boost Fiji's ability to attract tourists to witness the dawning +# of the new millennium. # http://www.fiji.gov.fj/press/2000_09/2000_09_13-05.shtml (2000-09-13) # reports that Fiji has discontinued DST. @@ -1631,7 +1654,7 @@ # Shanks & Pottenger say the transition was on 1968-10-01; go with Mundell. # From Eric Ulevik (1999-05-03): -# Tonga's director of tourism, who is also secretary of the National Millenium +# Tonga's director of tourism, who is also secretary of the National Millennium # Committee, has a plan to get Tonga back in front. # He has proposed a one-off move to tropical daylight saving for Tonga from # October to March, which has won approval in principle from the Tongan diff -r a1ec65ac926d -r dbf9b854ae55 make/sun/javazic/tzdata/europe --- a/make/sun/javazic/tzdata/europe Thu Aug 01 17:25:29 2013 +0100 +++ b/make/sun/javazic/tzdata/europe Fri Jul 12 10:56:49 2013 +0400 @@ -546,7 +546,7 @@ # It seems that Paris, Monaco, Rule France, Rule Belgium all agree on # 2:00 standard time, e.g. 3:00 local time. However there are no # countries that use C-Eur rules in September 1945, so the only items -# affected are apparently these ficticious zones that translates acronyms +# affected are apparently these fictitious zones that translate acronyms # CET and MET: # # Zone CET 1:00 C-Eur CE%sT @@ -2802,9 +2802,9 @@ # Ukraine # -# From Igor Karpov, who works for the Ukranian Ministry of Justice, +# From Igor Karpov, who works for the Ukrainian Ministry of Justice, # via Garrett Wollman (2003-01-27): -# BTW, I've found the official document on this matter. It's goverment +# BTW, I've found the official document on this matter. It's government # regulations number 509, May 13, 1996. In my poor translation it says: # "Time in Ukraine is set to second timezone (Kiev time). Each last Sunday # of March at 3am the time is changing to 4am and each last Sunday of @@ -2838,7 +2838,7 @@ # time this year after all. # # From Udo Schwedt (2011-10-18): -# As far as I understand, the recent change to the Ukranian time zone +# As far as I understand, the recent change to the Ukrainian time zone # (Europe/Kiev) to introduce permanent daylight saving time (similar # to Russia) was reverted today: # diff -r a1ec65ac926d -r dbf9b854ae55 make/sun/javazic/tzdata/iso3166.tab --- a/make/sun/javazic/tzdata/iso3166.tab Thu Aug 01 17:25:29 2013 +0100 +++ b/make/sun/javazic/tzdata/iso3166.tab Fri Jul 12 10:56:49 2013 +0400 @@ -26,14 +26,12 @@ # 2009-05-17 by Arthur David Olson. # ISO 3166 alpha-2 country codes # -# From Paul Eggert (2006-09-27): +# From Paul Eggert (2013-05-27): # # This file contains a table with the following columns: # 1. ISO 3166-1 alpha-2 country code, current as of -# ISO 3166-1 Newsletter VI-1 (2007-09-21). See: -# -# ISO 3166 Maintenance agency (ISO 3166/MA) -# . +# ISO 3166-1 Newsletter VI-15 (2013-05-10). See: Updates on ISO 3166 +# http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm # 2. The usual English name for the country, # chosen so that alphabetic sorting of subsets produces helpful lists. # This is not the same as the English name in the ISO 3166 tables. @@ -43,8 +41,9 @@ # # Lines beginning with `#' are comments. # -# From Arthur David Olson (2011-08-17): -# Resynchronized today with the ISO 3166 site (adding SS for South Sudan). +# This table is intended as an aid for users, to help them select time +# zone data appropriate for their practical needs. It is not intended +# to take or endorse any position on legal or territorial claims. # #country- #code country name @@ -77,7 +76,7 @@ BM Bermuda BN Brunei BO Bolivia -BQ Bonaire Sint Eustatius & Saba +BQ Bonaire, St Eustatius & Saba BR Brazil BS Bahamas BT Bhutan @@ -258,7 +257,7 @@ SS South Sudan ST Sao Tome & Principe SV El Salvador -SX Sint Maarten +SX St Maarten (Dutch part) SY Syria SZ Swaziland TC Turks & Caicos Is diff -r a1ec65ac926d -r dbf9b854ae55 make/sun/javazic/tzdata/southamerica --- a/make/sun/javazic/tzdata/southamerica Thu Aug 01 17:25:29 2013 +0100 +++ b/make/sun/javazic/tzdata/southamerica Fri Jul 12 10:56:49 2013 +0400 @@ -994,7 +994,7 @@ # adopted by the same states as before. Rule Brazil 2007 only - Oct Sun>=8 0:00 1:00 S # From Frederico A. C. Neves (2008-09-10): -# Acording to this decree +# According to this decree # # http://www.planalto.gov.br/ccivil_03/_Ato2007-2010/2008/Decreto/D6558.htm # @@ -1226,7 +1226,7 @@ # http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651 # # -# This is not yet reflected in the offical "cambio de hora" site, but +# This is not yet reflected in the official "cambio de hora" site, but # probably will be soon: # # http://www.horaoficial.cl/cambio.htm @@ -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 a1ec65ac926d -r dbf9b854ae55 make/sun/javazic/tzdata/zone.tab --- a/make/sun/javazic/tzdata/zone.tab Thu Aug 01 17:25:29 2013 +0100 +++ b/make/sun/javazic/tzdata/zone.tab Fri Jul 12 10:56:49 2013 +0400 @@ -27,15 +27,19 @@ # # TZ zone descriptions # -# From Paul Eggert (1996-08-05): +# From Paul Eggert (2013-05-27): # # This file contains a table with the following columns: # 1. ISO 3166 2-character country code. See the file `iso3166.tab'. +# This identifies a country that overlaps the zone. The country may +# overlap other zones and the zone may overlap other countries. # 2. Latitude and longitude of the zone's principal location # in ISO 6709 sign-degrees-minutes-seconds format, # either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS, # first latitude (+ is north), then longitude (+ is east). +# This location need not lie within the column-1 country. # 3. Zone name used in value of TZ environment variable. +# Please see the 'Theory' file for how zone names are chosen. # 4. Comments; present if and only if the country has multiple rows. # # Columns are separated by a single tab. @@ -45,6 +49,10 @@ # # Lines beginning with `#' are comments. # +# This table is intended as an aid for users, to help them select time +# zone data appropriate for their practical needs. It is not intended +# to take or endorse any position on legal or territorial claims. +# #country- #code coordinates TZ comments From adomurad at redhat.com Wed Aug 21 07:36:38 2013 From: adomurad at redhat.com (Adam Domurad) Date: Wed, 21 Aug 2013 10:36:38 -0400 Subject: New year In-Reply-To: References: Message-ID: <5214D076.5060408@redhat.com> On 08/20/2013 04:57 AM, helpcrypto helpcrypto wrote: > Hello all. > > > As I'm starting a new course next september (kind of new year), I'll > like to thank you the HUGE effort you are placing on this project. > > That's all folks! > ;) Cheers, thanks to you too for your help! -Adam From bugzilla-daemon at icedtea.classpath.org Wed Aug 21 13:27:40 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 21 Aug 2013 20:27:40 +0000 Subject: [Bug 1528] New: Chrome and Firefox freeze loading .jar (due permissions fail?) Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1528 Bug ID: 1528 Summary: Chrome and Firefox freeze loading .jar (due permissions fail?) Classification: Unclassified Product: IcedTea-Web Version: 1.3.2 Hardware: x86 OS: Linux Status: NEW Severity: major Priority: P3 Component: Plugin Assignee: dbhole at redhat.com Reporter: massimo-pinamonti at cheapnet.it CC: unassigned at icedtea.classpath.org Created attachment 923 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=923&action=edit running firefox and chrome on a console In a webpage trying to load a .jar program for a webphone, the plugin doesn't show the permission popup to run the .jar file (as under M$Windows) and the page remain freezed in loading. -- 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/20130821/705f424e/attachment.html From ptisnovs at icedtea.classpath.org Thu Aug 22 04:08:12 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 22 Aug 2013 11:08:12 +0000 Subject: /hg/gfx-test: Ten new tests added into BitBltUsingBgColor test s... Message-ID: changeset e1e29ae7737b in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=e1e29ae7737b author: Pavel Tisnovsky date: Thu Aug 22 13:11:55 2013 +0200 Ten new tests added into BitBltUsingBgColor test suite, fixed typos in JavaDoc etc. diffstat: ChangeLog | 6 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 150 +++++++++++++++++++++ 2 files changed, 156 insertions(+), 0 deletions(-) diffs (173 lines): diff -r 928f2af52488 -r e1e29ae7737b ChangeLog --- a/ChangeLog Wed Aug 21 10:30:47 2013 +0200 +++ b/ChangeLog Thu Aug 22 13:11:55 2013 +0200 @@ -1,3 +1,9 @@ +2013-08-22 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Ten new tests added into BitBltUsingBgColor test suite, fixed typos in + JavaDoc etc. + 2013-08-21 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBasicTests.java: diff -r 928f2af52488 -r e1e29ae7737b src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Wed Aug 21 10:30:47 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Thu Aug 22 13:11:55 2013 +0200 @@ -3152,6 +3152,156 @@ } /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_BGR. + * Background color is set to Color.cyan. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntBGRbackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntBGR(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_BGR. + * Background color is set to Color.red. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntBGRbackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntBGR(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_BGR. + * Background color is set to Color.magenta. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntBGRbackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntBGR(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_BGR. + * Background color is set to Color.yellow. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntBGRbackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntBGR(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_BGR. + * Background color is set to Color.white. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntBGRbackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntBGR(image, graphics2d, Color.white); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_RGB. + * Background color is set to Color.black. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntRGBbackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntRGB(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_RGB. + * Background color is set to Color.blue. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntRGBbackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntRGB(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_RGB. + * Background color is set to Color.green. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntRGBbackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntRGB(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_RGB. + * Background color is set to Color.cyan. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntRGBbackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntRGB(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_RGB. + * Background color is set to Color.red. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntRGBbackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntRGB(image, graphics2d, Color.red); + } + + /** * Entry point to the test suite. * * @param args not used in this case From ptisnovs at icedtea.classpath.org Thu Aug 22 07:02:15 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 22 Aug 2013 14:02:15 +0000 Subject: /hg/rhino-tests: Added new test testAsSubclass into the test sui... Message-ID: changeset 0f16f7c5be85 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=0f16f7c5be85 author: Pavel Tisnovsky date: Thu Aug 22 16:05:57 2013 +0200 Added new test testAsSubclass into the test suite AbstractScriptEngineClassTest. diffstat: ChangeLog | 5 + src/org/RhinoTests/AbstractScriptEngineClassTest.java | 166 ++++++++++++++++++ 2 files changed, 171 insertions(+), 0 deletions(-) diffs (188 lines): diff -r 5674e01de2f4 -r 0f16f7c5be85 ChangeLog --- a/ChangeLog Tue Aug 20 11:19:35 2013 +0200 +++ b/ChangeLog Thu Aug 22 16:05:57 2013 +0200 @@ -1,3 +1,8 @@ +2013-08-21 Pavel Tisnovsky + + * src/org/RhinoTests/AbstractScriptEngineClassTest.java: + Added new test testAsSubclass into the test suite AbstractScriptEngineClassTest. + 2013-08-20 Pavel Tisnovsky * src/org/RhinoTests/CompiledScriptTest.java: diff -r 5674e01de2f4 -r 0f16f7c5be85 src/org/RhinoTests/AbstractScriptEngineClassTest.java --- a/src/org/RhinoTests/AbstractScriptEngineClassTest.java Tue Aug 20 11:19:35 2013 +0200 +++ b/src/org/RhinoTests/AbstractScriptEngineClassTest.java Thu Aug 22 16:05:57 2013 +0200 @@ -1321,6 +1321,172 @@ } /** + * Test for method javax.script.AbstractScriptEngine.getClass().asSubclass() + */ + protected void testAsSubclass() { + try { + this.abstractScriptEngineClass.asSubclass(abstractScriptEngineClass); + } + catch (Exception e) { + e.printStackTrace(); + throw new AssertionError(e.getMessage()); + } + + try { + this.abstractScriptEngineClass.asSubclass(Object.class); + } + catch (Exception e) { + e.printStackTrace(); + throw new AssertionError(e.getMessage()); + } + + try { + this.abstractScriptEngineClass.asSubclass(java.lang.Void.class); + throw new AssertionError("Class.asSubclass(java.lang.Void.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.asSubclass(java.lang.Number.class); + throw new AssertionError("Class.asSubclass(java.lang.Number.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.asSubclass(java.lang.Byte.class); + throw new AssertionError("Class.asSubclass(java.lang.Byte.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.asSubclass(java.lang.Double.class); + throw new AssertionError("Class.asSubclass(java.lang.Double.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.asSubclass(java.lang.Float.class); + throw new AssertionError("Class.asSubclass(java.lang.Float.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.asSubclass(java.lang.Integer.class); + throw new AssertionError("Class.asSubclass(java.lang.Integer.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.asSubclass(java.lang.Long.class); + throw new AssertionError("Class.asSubclass(java.lang.Long.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.asSubclass(java.lang.Short.class); + throw new AssertionError("Class.asSubclass(java.lang.Short.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.asSubclass(java.lang.String.class); + throw new AssertionError("Class.asSubclass(java.lang.String.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.asSubclass(java.lang.StringBuffer.class); + throw new AssertionError("Class.asSubclass(java.lang.StringBuffer.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.asSubclass(java.lang.StringBuilder.class); + throw new AssertionError("Class.asSubclass(java.lang.StringBuilder.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.asSubclass(java.awt.Color.class); + throw new AssertionError("Class.asSubclass(java.awt.Color.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.asSubclass(java.awt.Font.class); + throw new AssertionError("Class.asSubclass(java.awt.Font.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.asSubclass(java.awt.Image.class); + throw new AssertionError("Class.asSubclass(java.awt.Image.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.asSubclass(javax.swing.JPanel.class); + throw new AssertionError("Class.asSubclass(javax.swing.JPanel.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.asSubclass(javax.swing.JColorChooser.class); + throw new AssertionError("Class.asSubclass(javax.swing.JColorChooser.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.asSubclass(javax.swing.JScrollBar.class); + throw new AssertionError("Class.asSubclass(javax.swing.JScrollBar.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.asSubclass(javax.swing.JSlider.class); + throw new AssertionError("Class.asSubclass(javax.swing.JSlider.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + } + + /** * Test for instanceof operator applied to a class javax.script.AbstractScriptEngine */ @SuppressWarnings("cast") From andrew at icedtea.classpath.org Thu Aug 22 08:11:25 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 22 Aug 2013 15:11:25 +0000 Subject: /hg/icedtea7: 3 new changesets Message-ID: changeset af97d515ebd8 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=af97d515ebd8 author: Andrew John Hughes date: Thu Aug 22 16:08:29 2013 +0100 Close cacao branch. changeset 666ae0671bfc in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=666ae0671bfc author: Andrew John Hughes date: Thu Aug 22 16:08:37 2013 +0100 Close cacao-b19 branch. changeset 6fcb6a133b00 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=6fcb6a133b00 author: Andrew John Hughes date: Thu Aug 22 16:09:38 2013 +0100 Close cacao branch. diffstat: .hgignore | 8 +- .hgtags | 1 - ChangeLog | 4180 +- INSTALL | 7 +- IcedTeaPlugin.cc | 3950 + Makefile.am | 401 +- Makefile.in | 423 +- README | 21 +- acinclude.m4 | 87 +- configure | 2403 +- configure.ac | 183 +- extra/net/sourceforge/jnlp/about/HTMLPanel.java | 59 - extra/net/sourceforge/jnlp/about/Main.java | 135 - extra/net/sourceforge/jnlp/about/resources/about.html | 28 - extra/net/sourceforge/jnlp/about/resources/applications.html | 36 - extra/net/sourceforge/jnlp/about/resources/jamIcon.jpg | Bin extra/net/sourceforge/jnlp/about/resources/notes.html | 82 - gcjwebplugin.cc | 6 +- generated/com/sun/java/swing/plaf/gtk/resources/gtk.java | 2 + generated/com/sun/java/swing/plaf/gtk/resources/gtk_de.java | 2 + generated/com/sun/java/swing/plaf/gtk/resources/gtk_es.java | 2 + generated/com/sun/java/swing/plaf/gtk/resources/gtk_fr.java | 2 + generated/com/sun/java/swing/plaf/gtk/resources/gtk_it.java | 2 + generated/com/sun/java/swing/plaf/gtk/resources/gtk_ja.java | 2 + generated/com/sun/java/swing/plaf/gtk/resources/gtk_ko.java | 2 + generated/com/sun/java/swing/plaf/gtk/resources/gtk_sv.java | 2 + generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.java | 2 + generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_HK.java | 2 + generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.java | 2 + generated/com/sun/swing/internal/plaf/basic/resources/basic.java | 3 + generated/com/sun/swing/internal/plaf/basic/resources/basic_de.java | 3 + generated/com/sun/swing/internal/plaf/basic/resources/basic_es.java | 3 + generated/com/sun/swing/internal/plaf/basic/resources/basic_fr.java | 3 + generated/com/sun/swing/internal/plaf/basic/resources/basic_it.java | 3 + generated/com/sun/swing/internal/plaf/basic/resources/basic_ja.java | 3 + generated/com/sun/swing/internal/plaf/basic/resources/basic_ko.java | 3 + generated/com/sun/swing/internal/plaf/basic/resources/basic_sv.java | 3 + generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.java | 3 + generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_HK.java | 3 + generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.java | 3 + generated/java/nio/ByteBuffer.java | 6 +- generated/java/nio/CharBuffer.java | 4 +- generated/java/nio/DoubleBuffer.java | 4 +- generated/java/nio/FloatBuffer.java | 4 +- generated/java/nio/IntBuffer.java | 4 +- generated/java/nio/LongBuffer.java | 4 +- generated/java/nio/ShortBuffer.java | 4 +- generated/sun/awt/X11/generator/sizer.32 | Bin generated/sun/awt/X11/generator/sizer.32.c | 26 +- generated/sun/misc/Version.java | 14 +- generated/sun/tools/jconsole/Version.java | 2 +- generated/sun/util/resources/CalendarData_ro.java | 2 - generated/sun/util/resources/CurrencyNames_en_CA.java | 1 - generated/sun/util/resources/LocaleNames_fi.java | 4 +- patches/icedtea-always-zero.patch | 148 + patches/icedtea-ant.patch | 6 +- patches/icedtea-bytebuffer-compact.patch | 12 +- patches/icedtea-certbundle.patch | 2 +- patches/icedtea-copy-plugs.patch | 92 +- patches/icedtea-core-build.patch | 226 +- patches/icedtea-ecj.patch | 164 +- patches/icedtea-freetype.patch | 39 + patches/icedtea-gcc-4.3.patch | 8 +- patches/icedtea-gcc-suffix.patch | 24 - patches/icedtea-graphics.patch | 131 + patches/icedtea-headers.patch | 52 +- patches/icedtea-hotspot-6b06-7b24.patch | 201186 ---------- patches/icedtea-hotspot7-build-fixes.patch | 64 - patches/icedtea-lesstif-64.patch | 29 - patches/icedtea-lib64.patch | 2 +- patches/icedtea-libraries.patch | 202 +- patches/icedtea-liveconnect.patch | 2894 + patches/icedtea-memory-limits.patch | 18 +- patches/icedtea-paths.patch | 646 + patches/icedtea-ports.patch | 241 +- patches/icedtea-print-lsb-release.patch | 48 - patches/icedtea-signature-iterator.patch | 6 +- patches/icedtea-ssl.patch | 2 +- patches/icedtea-static-libstdc++.patch | 33 - patches/icedtea-sunsrc.patch | 8 +- patches/icedtea-test-atomic-operations.patch | 2 +- patches/icedtea-text-relocations.patch | 2 +- patches/icedtea-tools.patch | 14 +- patches/icedtea-use-system-tzdata.patch | 2 +- patches/icedtea-version.patch | 11 - patches/icedtea-zero-build.patch | 132 - patches/icedtea-zero.patch | 69 +- platform_zero.in | 17 - ports/hotspot/build/linux/makefiles/arm.make | 37 + ports/hotspot/build/linux/makefiles/ia64.make | 40 + ports/hotspot/build/linux/makefiles/ppc.make | 31 + ports/hotspot/build/linux/makefiles/ppc64.make | 34 + ports/hotspot/build/linux/makefiles/s390.make | 34 + ports/hotspot/build/linux/makefiles/s390x.make | 37 + ports/hotspot/build/linux/makefiles/zero.make | 41 - ports/hotspot/build/linux/platform_arm | 17 + ports/hotspot/build/linux/platform_ia64 | 17 + ports/hotspot/build/linux/platform_ppc | 17 + ports/hotspot/build/linux/platform_ppc64 | 17 + ports/hotspot/build/linux/platform_s390 | 17 + ports/hotspot/build/linux/platform_s390x | 17 + ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp | 1472 + ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp | 467 + ports/hotspot/src/cpu/ppc/vm/bytecodeInterpreter_ppc.hpp | 98 + ports/hotspot/src/cpu/ppc/vm/bytecodeInterpreter_ppc.inline.hpp | 278 + ports/hotspot/src/cpu/ppc/vm/bytecodes_ppc.cpp | 32 + ports/hotspot/src/cpu/ppc/vm/bytecodes_ppc.hpp | 25 + ports/hotspot/src/cpu/ppc/vm/bytes_ppc.hpp | 210 + ports/hotspot/src/cpu/ppc/vm/c1_CodeStubs_ppc.cpp | 109 + ports/hotspot/src/cpu/ppc/vm/c1_Defs_ppc.hpp | 72 + ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.cpp | 107 + ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.hpp | 44 + ports/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.cpp | 368 + ports/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.hpp | 35 + ports/hotspot/src/cpu/ppc/vm/c1_LIRGenerator_ppc.cpp | 490 + ports/hotspot/src/cpu/ppc/vm/c1_LinearScan_ppc.cpp | 81 + ports/hotspot/src/cpu/ppc/vm/c1_MacroAssembler_ppc.cpp | 42 + ports/hotspot/src/cpu/ppc/vm/c1_MacroAssembler_ppc.hpp | 29 + ports/hotspot/src/cpu/ppc/vm/c1_Runtime1_ppc.cpp | 232 + ports/hotspot/src/cpu/ppc/vm/c1_globals_ppc.hpp | 74 + ports/hotspot/src/cpu/ppc/vm/codeBuffer_ppc.hpp | 27 + ports/hotspot/src/cpu/ppc/vm/copy_ppc.hpp | 166 + ports/hotspot/src/cpu/ppc/vm/cppInterpreterGenerator_ppc.hpp | 30 + ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp | 1395 + ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.hpp | 32 + ports/hotspot/src/cpu/ppc/vm/debug_ppc.cpp | 32 + ports/hotspot/src/cpu/ppc/vm/disassembler_ppc.cpp | 686 + ports/hotspot/src/cpu/ppc/vm/disassembler_ppc.hpp | 38 + ports/hotspot/src/cpu/ppc/vm/dump_ppc.cpp | 37 + ports/hotspot/src/cpu/ppc/vm/frame_ppc.cpp | 122 + ports/hotspot/src/cpu/ppc/vm/frame_ppc.hpp | 66 + ports/hotspot/src/cpu/ppc/vm/frame_ppc.inline.hpp | 175 + ports/hotspot/src/cpu/ppc/vm/globalDefinitions_ppc.hpp | 26 + ports/hotspot/src/cpu/ppc/vm/globals_ppc.hpp | 54 + ports/hotspot/src/cpu/ppc/vm/icBuffer_ppc.cpp | 52 + ports/hotspot/src/cpu/ppc/vm/icache_ppc.cpp | 99 + ports/hotspot/src/cpu/ppc/vm/icache_ppc.hpp | 43 + ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp | 189 + ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp | 56 + ports/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp | 37 + ports/hotspot/src/cpu/ppc/vm/interpreterRT_ppc.cpp | 354 + ports/hotspot/src/cpu/ppc/vm/interpreterRT_ppc.hpp | 151 + ports/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp | 182 + ports/hotspot/src/cpu/ppc/vm/interpreter_ppc.hpp | 56 + ports/hotspot/src/cpu/ppc/vm/javaFrameAnchor_ppc.hpp | 72 + ports/hotspot/src/cpu/ppc/vm/jniFastGetField_ppc.cpp | 67 + ports/hotspot/src/cpu/ppc/vm/jniTypes_ppc.hpp | 108 + ports/hotspot/src/cpu/ppc/vm/jni_ppc.h | 32 + ports/hotspot/src/cpu/ppc/vm/nativeInst_ppc.hpp | 222 + ports/hotspot/src/cpu/ppc/vm/registerMap_ppc.hpp | 39 + ports/hotspot/src/cpu/ppc/vm/register_definitions_ppc.cpp | 113 + ports/hotspot/src/cpu/ppc/vm/register_ppc.cpp | 51 + ports/hotspot/src/cpu/ppc/vm/register_ppc.hpp | 252 + ports/hotspot/src/cpu/ppc/vm/relocInfo_ppc.cpp | 68 + ports/hotspot/src/cpu/ppc/vm/relocInfo_ppc.hpp | 34 + ports/hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp | 259 + ports/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp | 511 + ports/hotspot/src/cpu/ppc/vm/stubRoutines_ppc.hpp | 56 + ports/hotspot/src/cpu/ppc/vm/vmStructs_ppc.hpp | 52 + ports/hotspot/src/cpu/ppc/vm/vm_version_ppc.hpp | 32 + ports/hotspot/src/cpu/ppc/vm/vmreg_ppc.cpp | 67 + ports/hotspot/src/cpu/ppc/vm/vmreg_ppc.hpp | 29 + ports/hotspot/src/cpu/ppc/vm/vmreg_ppc.inline.hpp | 32 + ports/hotspot/src/cpu/ppc/vm/vtableStubs_ppc.cpp | 47 + ports/hotspot/src/os_cpu/linux_ppc/vm/assembler_linux_ppc.cpp | 32 + ports/hotspot/src/os_cpu/linux_ppc/vm/atomic_linux_ppc.inline.hpp | 160 + ports/hotspot/src/os_cpu/linux_ppc/vm/bytes_linux_ppc.inline.hpp | 43 + ports/hotspot/src/os_cpu/linux_ppc/vm/globals_linux_ppc.hpp | 43 + ports/hotspot/src/os_cpu/linux_ppc/vm/linux_ppc.s | 76 + ports/hotspot/src/os_cpu/linux_ppc/vm/linux_ppc64.s | 96 + ports/hotspot/src/os_cpu/linux_ppc/vm/orderAccess_linux_ppc.inline.hpp | 101 + ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp | 334 + ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.hpp | 33 + ports/hotspot/src/os_cpu/linux_ppc/vm/prefetch_linux_ppc.inline.hpp | 34 + ports/hotspot/src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.cpp | 42 + ports/hotspot/src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.hpp | 32 + ports/hotspot/src/os_cpu/linux_ppc/vm/thread_linux_ppc.hpp | 63 + ports/hotspot/src/os_cpu/linux_ppc/vm/vmStructs_linux_ppc.hpp | 45 + ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 133 +- rt/com/sun/image/codec/jpeg/ImageFormatException.java | 51 + rt/com/sun/image/codec/jpeg/JPEGCodec.java | 146 + rt/com/sun/image/codec/jpeg/JPEGDecodeParam.java | 44 + rt/com/sun/image/codec/jpeg/JPEGEncodeParam.java | 49 + rt/com/sun/image/codec/jpeg/JPEGImageDecoder.java | 60 + rt/com/sun/image/codec/jpeg/JPEGImageEncoder.java | 56 + rt/com/sun/script/javascript/ClassShutter.java | 43 + rt/com/sun/script/javascript/Context.java | 170 + rt/com/sun/script/javascript/ContextFactory.java | 60 + rt/com/sun/script/javascript/Function.java | 48 + rt/com/sun/script/javascript/ImporterTopLevel.java | 131 + rt/com/sun/script/javascript/JavaScriptException.java | 54 + rt/com/sun/script/javascript/LazilyLoadedCtor.java | 47 + rt/com/sun/script/javascript/NativeArray.java | 54 + rt/com/sun/script/javascript/NativeJavaClass.java | 44 + rt/com/sun/script/javascript/NativeJavaObject.java | 127 + rt/com/sun/script/javascript/RhinoException.java | 59 + rt/com/sun/script/javascript/Script.java | 48 + rt/com/sun/script/javascript/ScriptRuntime.java | 54 + rt/com/sun/script/javascript/Scriptable.java | 70 + rt/com/sun/script/javascript/ScriptableObject.java | 107 + rt/com/sun/script/javascript/Undefined.java | 42 + rt/com/sun/script/javascript/WrapFactory.java | 48 + rt/gnu/java/awt/BitMaskExtent.java | 79 + rt/gnu/java/awt/Buffers.java | 225 + rt/gnu/java/awt/CubicSegment.java | 184 + rt/gnu/java/awt/LineSegment.java | 118 + rt/gnu/java/awt/QuadSegment.java | 264 + rt/gnu/java/awt/Segment.java | 158 + rt/gnu/java/awt/color/CieXyzConverter.java | 73 + rt/gnu/java/awt/color/ClutProfileConverter.java | 152 + rt/gnu/java/awt/color/ColorLookUpTable.java | 429 + rt/gnu/java/awt/color/ColorSpaceConverter.java | 69 + rt/gnu/java/awt/color/GrayProfileConverter.java | 137 + rt/gnu/java/awt/color/GrayScaleConverter.java | 110 + rt/gnu/java/awt/color/LinearRGBConverter.java | 152 + rt/gnu/java/awt/color/ProfileHeader.java | 398 + rt/gnu/java/awt/color/PyccConverter.java | 72 + rt/gnu/java/awt/color/RgbProfileConverter.java | 244 + rt/gnu/java/awt/color/SrgbConverter.java | 152 + rt/gnu/java/awt/color/TagEntry.java | 125 + rt/gnu/java/awt/color/ToneReproductionCurve.java | 177 + rt/java/awt/color/CMMException.java | 63 + rt/java/awt/color/ColorSpace.java | 190 + rt/java/awt/color/ICC_ColorSpace.java | 314 + rt/java/awt/color/ICC_Profile.java | 1282 + rt/java/awt/color/ICC_ProfileGray.java | 133 + rt/java/awt/color/ICC_ProfileRGB.java | 227 + rt/java/awt/image/BandedSampleModel.java | 758 + rt/java/awt/image/ColorConvertOp.java | 537 + rt/java/awt/image/ComponentSampleModel.java | 762 + rt/java/awt/image/DataBuffer.java | 473 + rt/java/awt/image/DataBufferByte.java | 245 + rt/java/awt/image/DataBufferInt.java | 244 + rt/java/awt/image/DataBufferShort.java | 245 + rt/java/awt/image/DataBufferUShort.java | 246 + rt/java/awt/image/MultiPixelPackedSampleModel.java | 602 + rt/java/awt/image/Raster.java | 1156 + rt/java/awt/image/RenderedImage.java | 70 + rt/java/awt/image/SampleModel.java | 981 + rt/java/awt/image/SinglePixelPackedSampleModel.java | 597 + rt/java/awt/image/WritableRaster.java | 436 + rt/java/awt/image/WritableRenderedImage.java | 56 + rt/java/awt/image/renderable/ContextualRenderedImageFactory.java | 56 + rt/java/awt/image/renderable/RenderContext.java | 141 + rt/java/awt/image/renderable/RenderableImage.java | 62 + rt/java/awt/image/renderable/RenderableImageOp.java | 157 + rt/java/awt/image/renderable/RenderableImageProducer.java | 166 + rt/java/awt/image/renderable/RenderedImageFactory.java | 47 + rt/java/io/PushbackReader.java | 62 + rt/javax/script/Synchronizer.java | 49 + rt/net/sourceforge/jnlp/resources/Manifest.mf | 2 +- rt/net/sourceforge/jnlp/resources/Messages.properties | 6 +- rt/net/sourceforge/jnlp/resources/about.jnlp | 20 - rt/net/sourceforge/jnlp/runtime/Boot.java | 114 +- rt/net/sourceforge/jnlp/security/CertsInfoPane.java | 106 +- rt/net/sourceforge/jnlp/security/SecurityUtil.java | 200 - rt/net/sourceforge/jnlp/security/SecurityWarningDialog.java | 40 - rt/net/sourceforge/jnlp/security/SingleCertInfoPane.java | 77 - rt/net/sourceforge/jnlp/security/viewer/CertificatePane.java | 358 - rt/net/sourceforge/jnlp/security/viewer/CertificateViewer.java | 148 - rt/net/sourceforge/jnlp/tools/KeyTool.java | 180 +- rt/sun/dc/path/FastPathProducer.java | 56 + rt/sun/dc/path/PathConsumer.java | 60 + rt/sun/dc/path/PathException.java | 42 + rt/sun/dc/pr/PRException.java | 42 + rt/sun/dc/pr/PathDasher.java | 115 + rt/sun/dc/pr/PathStroker.java | 139 + rt/sun/dc/pr/Rasterizer.java | 212 + rt/sun/org/mozilla/javascript/internal/NativeJavaArray.java | 47 + rt/sun/org/mozilla/javascript/internal/Wrapper.java | 48 + 270 files changed, 38188 insertions(+), 209923 deletions(-) diffs (truncated from 251868 to 500 lines): diff -r 2b413b0a984f -r 6fcb6a133b00 .hgignore --- a/.hgignore Mon Mar 17 16:00:18 2008 +0100 +++ b/.hgignore Thu Aug 22 16:09:38 2013 +0100 @@ -5,9 +5,7 @@ autom4te.cache openjdk bootstrap -debian lib -tools stamps Makefile config.log @@ -15,11 +13,9 @@ javac javap gcjwebplugin.so -extra-source-files.txt +IcedTeaPlugin.so rt-source-files.txt hotspot-tools-source-files.txt -tools-source-files.txt -platform_zero rt/com/sun/jdi/AbsentInformationException.java rt/com/sun/jdi/Accessible.java rt/com/sun/jdi/ArrayReference.java @@ -421,6 +417,4 @@ rt/javax/net/ssl/X509ExtendedKeyManager.java rt/javax/net/ssl/X509KeyManager.java rt/javax/net/ssl/X509TrustManager.java -rt/java/io/ -rt/sun/awt generated/sun/awt/X11/generator/sizer.32.orig diff -r 2b413b0a984f -r 6fcb6a133b00 .hgtags --- a/.hgtags Mon Mar 17 16:00:18 2008 +0100 +++ b/.hgtags Thu Aug 22 16:09:38 2013 +0100 @@ -5,4 +5,3 @@ cb78e0fccf14ed4a80b0ada2c98e4621479acbf5 icedtea-1.4 5ca86e9ca40533c48ca3445a10fd3b058ef94885 icedtea-1.5 bb3929528d3e9de0529da995c4b71975fd77fb5a icedtea-1.6 -38e6eb354632588f5ac8dbcd69229ebd031f57cb icedtea6-1.0 diff -r 2b413b0a984f -r 6fcb6a133b00 ChangeLog --- a/ChangeLog Mon Mar 17 16:00:18 2008 +0100 +++ b/ChangeLog Thu Aug 22 16:09:38 2013 +0100 @@ -1,398 +1,88 @@ -2008-03-17 Gary Benson - - * patches/icedtea-static-libstdc++.patch: New file. - -2008-03-17 Gary Benson - - * platform_zero.in: New file. - * ports/hotspot/build/linux/makefiles/zero.make: Likewise. - - * acinclude.m4 - (SET_ARCH_DIRS): Added special case for arm. - (ENABLE_ZERO_BUILD): Added new substitutions (ZERO_LIBARCH, - ZERO_BITSPERWORD, ZERO_ENDIANNESS, ZERO_ARCHDEF and ZERO_ARCHFLAG) - and new generated file (platform_zero). - (SET_CORE_BUILD): Enable whenever zero is used. - * Makefile.am - (ZERO_PATCHES): New variable listing all zero patches. - (EXTRA_DIST): Added ZERO_PATCHES. - (ZERO_PATCHES_COND): New variable listing zero patches when used. - (ICEDTEA_PATCHES): Grouped all zero patches into ZERO_PATCHES_COND, - added icedtea-zero-build.patch and icedtea-static-libstdc++.patch, - and removed icedtea-always-zero.patch. - (stamps/ports.stamp, stamps/ports-ecj.stamp): Use platform_zero. - (ICEDTEA_ENV, ICEDTEA_ENV_ECJ): Pass ZERO_* variables through. - * Makefile.in, configure: Regenerated. - - * patches/icedtea-zero.patch: Split build system bits into... - * patches/icedtea-zero-build.patch: New file. - * patches/icedtea-hotspot7-ports.patch: Merged into icedtea-zero.patch. - * patches/icedtea-ports.patch: Moved hotspot-specific bits into - icedtea-zero.patch. - * patches/icedtea-signature-iterator.patch: Rebased. - * patches/icedtea-test-atomic-operations.patch: Likewise. - * patches/icedtea-signed-types.patch: Likewise, and missing - hunk reinstated. - * patches/icedtea-text-relocations.patch: Base conditional - on ZERO_LIBARCH rather than BUILDARCH. - * patches/icedtea-always-zero.patch: Removed. - - * ports/hotspot/build/linux/makefiles/arm.make: Removed. - * ports/hotspot/build/linux/makefiles/ia64.make: Likewise. - * ports/hotspot/build/linux/makefiles/ppc.make: Likewise. - * ports/hotspot/build/linux/makefiles/ppc64.make: Likewise. - * ports/hotspot/build/linux/makefiles/s390.make: Likewise. - * ports/hotspot/build/linux/makefiles/s390x.make: Likewise. - * ports/hotspot/build/linux/platform_arm: Likewise. - * ports/hotspot/build/linux/platform_ia64: Likewise. - * ports/hotspot/build/linux/platform_ppc: Likewise. - * ports/hotspot/build/linux/platform_ppc64: Likewise. - * ports/hotspot/build/linux/platform_s390: Likewise. - * ports/hotspot/build/linux/platform_s390x: Likewise. - - * .hgignore: Added platform_zero. - -2008-03-14 Lillian Angel - - * .hgignore: Updated. - -2008-03-12 Matthias Klose - - * patches/icedtea-print-lsb-release.patch: New. - * Makefile.am (ICEDTEA_PATCHES): Add new patch. - * Makefile.in: Regenerated. - -2008-03-12 Matthias Klose - - * patches/icedtea-ecj.patch (openjdk/corba/make/common/Defs-linux.gmk): - -2008-03-12 Matthias Klose - - * patches/icedtea-ecj.patch (openjdk/corba/make/common/Defs-linux.gmk): - Find libgcj.so when the version of gcc != the version of gcj. - -2008-03-12 Matthias Klose - - * configure.ac: Check for ffi.h/libffi.so without pkg-config. - * configure: Regenerated. - -2008-03-11 Lillian Angel - - * configure: Regenerated. - * configure.ac: Added conditional for WITH_OPENJDK. - -2008-03-11 Matthias Klose - - * .hgignore: Add debian packaging directory. - -2008-03-11 Lillian Angel - - * Makefile.am: Added check for WITH_OPENJDK. - * Makefile.in: Regenerated. - * configure: Regenerated. - * configure.ac: Added --with-openjdk and --with-openjdk-home options. - -2008-03-11 Matthias Klose - - * patches/icedtea-gcc-suffix.patch: Update, use GCC_SUFFIX in more - places. - -2008-03-11 Matthias Klose - - * configure.ac: Check for zip and unzip. - * configure: Regenerated. - -2008-03-10 Lillian Angel - - * Makefile.am: Added patches to EXTRA_DIST. - * Makefile.in: Regenerated. - -2008-03-10 Gary Benson - - * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp - (current_stack_region): Rewritten to cope with guard pages and ia64. - (default_stack_size, default_guard_size): Comment fixes. - -2008-03-07 Joshua Sumali - - * rt/net/sourceforge/jnlp/security/CertsInfoPane.java: Fix null pointer. - -2008-03-06 Joshua Sumali - - * Makefile.am: Added extra to EXTRA_DIST. - * Makefile.in: Regenerated. - -2008-03-06 Joshua Sumali - - * Makefile.am: Added new 'extra' targets. These new targets build the - sources in the extra/ directory to build about.jar, which is the new - sample jnlp application for javaws. - * Makefile.in: Regenerated. - * generated/sun/awt/X11/generator/sizer.32: Regenerated. - * rt/net/sourceforge/jnlp/resources/Manifest.mf: Fix boot class typo. - * rt/net/sourceforge/jnlp/resources/Messages.properties: Improved command - line options. - * rt/net/sourceforge/jnlp/runtime/Boot.java: Changed command line - behaviour. Sample application now only runs if the -about flag is passed. - * rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java: Remove call to - printStackTrace. - * rt/net/sourceforge/jnlp/security/CertsInfoPane.java: Rearranged methods - and relaxed visibility in some fields/methods for SingleCertInfoPane - class. - * rt/net/sourceforge/jnlp/security/SecurityWarningDialog.java: Added - single certificate dialog showing. - * rt/net/sourceforge/jnlp/tools/KeyTool.java: Moved KeyStore retrieving to - new SecurityUtil class. - * extra/net/sourceforge/jnlp/about/HTMLPanel.java: New File. - * extra/net/sourceforge/jnlp/about/Main.java: Likewise. - * extra/net/sourceforge/jnlp/about/resources/about.html: Likewise. - * extra/net/sourceforge/jnlp/about/resources/applications.html: Likewise. - * extra/net/sourceforge/jnlp/about/resources/jamIcon.jpg: Likewise. - * extra/net/sourceforge/jnlp/about/resources/notes.html: Likewise. - * rt/net/sourceforge/jnlp/resources/about.jnlp: Likewise. - * rt/net/sourceforge/jnlp/security/SecurityUtil.java: Likewise. - * rt/net/sourceforge/jnlp/security/SingleCertInfoPane.java: Likewise. - * rt/net/sourceforge/jnlp/security/viewer/CertificatePane.java: Likewise. - * rt/net/sourceforge/jnlp/security/viewer/CertificateViewer.java: - Likewise. - -2008-03-05 Gary Benson - - * contrib/templater/README: Updated URL. - -2008-03-05 Gary Benson - - * ports/hotspot/src/cpu/ppc/vm/jni_ppc.h: Removed. - * ports/hotspot/src/os_cpu/linux_ppc/vm/linux_ppc.s: Likewise. - * ports/hotspot/src/os_cpu/linux_ppc/vm/linux_ppc64.s: Likewise. - -2008-03-05 Gary Benson - - * ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp: Removed. - * ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/bytecodeInterpreter_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/bytecodeInterpreter_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/bytecodeInterpreter_ppc.inline.hpp: - Likewise. - * ports/hotspot/src/cpu/ppc/vm/bytecodes_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/bytecodes_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/bytes_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/c1_CodeStubs_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/c1_Defs_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/c1_FpuStackSim_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/c1_FpuStackSim_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/c1_LIRGenerator_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/c1_LinearScan_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/c1_LinearScan_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/c1_MacroAssembler_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/c1_MacroAssembler_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/c1_Runtime1_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/c1_globals_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/codeBuffer_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/copy_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/cppInterpreterGenerator_ppc.hpp: - Likewise. - * ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/debug_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/depChecker_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/depChecker_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/disassembler_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/disassembler_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/dump_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/frame_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/frame_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/frame_ppc.inline.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/globalDefinitions_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/globals_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/icBuffer_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/icache_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/icache_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/interpreterRT_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/interpreterRT_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/interpreter_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/javaFrameAnchor_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/jniFastGetField_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/jniTypes_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/nativeInst_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/nativeInst_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/registerMap_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/register_definitions_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/register_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/register_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/relocInfo_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/relocInfo_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/stubRoutines_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/stubRoutines_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.hpp: - Likewise. - * ports/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/templateTable_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/templateTable_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/vmStructs_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/vm_version_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/vmreg_ppc.cpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/vmreg_ppc.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/vmreg_ppc.inline.hpp: Likewise. - * ports/hotspot/src/cpu/ppc/vm/vtableStubs_ppc.cpp: Likewise. - * ports/hotspot/src/os_cpu/linux_ppc/vm/assembler_linux_ppc.cpp: - Likewise. - * ports/hotspot/src/os_cpu/linux_ppc/vm/atomic_linux_ppc.inline.hpp: - Likewise. - * ports/hotspot/src/os_cpu/linux_ppc/vm/bytes_linux_ppc.inline.hpp: - Likewise. - * ports/hotspot/src/os_cpu/linux_ppc/vm/globals_linux_ppc.hpp: - Likewise. - * ports/hotspot/src/os_cpu/linux_ppc/vm/orderAccess_linux_ppc.inline.hpp: - Likewise. - * ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp: Likewise. - * ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.hpp: Likewise. - * ports/hotspot/src/os_cpu/linux_ppc/vm/prefetch_linux_ppc.inline.hpp: - Likewise. - * ports/hotspot/src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.cpp: - Likewise. - * ports/hotspot/src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.hpp: - Likewise. - * ports/hotspot/src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp: Likewise. - * ports/hotspot/src/os_cpu/linux_ppc/vm/thread_linux_ppc.hpp: Likewise. - * ports/hotspot/src/os_cpu/linux_ppc/vm/vmStructs_linux_ppc.hpp: - Likewise. - * ports/hotspot/src/os_cpu/linux_ppc/vm/vm_version_linux_ppc.cpp: - Likewise. - -2008-03-05 Gary Benson +2008-03-06 Gary Benson * ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp (ThreadStackSize): Increased by 512kb to cope with 64kb pages. -2008-03-05 Lillian Angel - - * .hgignore: Updated. - * Makefile.am: Added sun/awt to COPY_PLUGS. - * Makefile.in: Regenerated. - * generated/sun/awt/X11/generator/sizer.32: Regenerated. - * generated/sun/awt/X11/generator/sizer.32.c: Regenerated. - -2008-03-04 Lillian Angel - - * rt/com/sun/script: Removed. - * rt/java/io: Removed. - * rt/javax/script: Removed. - * rt/sun/: Removed. - * Makefile.am: Updated rt.jar. - * Makefile.in: Regenerated. - * .hgignore: Updated with new files copied from openjdk srcs. - -2008-03-04 Lillian Angel - - * Makefile.am: Removed gnu from tools.jar. - * Makefile.in: Regenerated. - -2008-03-04 Lillian Angel - - * rt/gnu/*: Removed. - * Makefile.am: Removed icedtea-paths.patch. - * Makefile.in: Regenerated. - * patches/icedtea-paths.patch: Removed. - -2008-03-04 Lillian Angel - - * rt/com/sun/image/codec/jpeg/*: Removed unneeded plugs. - 2008-03-04 Matthias Klose * configure.ac: Check for xulrunner-1.9. * configure: Regenerated. -2008-03-04 Lillian Angel - - * patches/icedtea-lesstif-64.patch: Reverted. - * Makefile.am: Added above patch. +2008-03-03 Lillian Angel + + * Makefile.am: Fixed distclean target * Makefile.in: Regenerated. -2008-03-04 Gary Benson - - * patches/icedtea-ports.patch: Moved HotSpot 7 specific hunk to... - * patches/icedtea-hotspot7-ports.patch: New file. - * Makefile.am: Added the above. +2008-03-03 Gary Benson + + * patches/icedtea-ports.patch + (hotspot/src/share/vm/runtime/mutex.hpp): Reworked. + +2008-03-03 Gary Benson + + * patches/icedtea-ppc-stack-hack.patch: Removed. + * Makefile.am (ICEDTEA_PATCHES): Removed the above. * Makefile.in: Regenerated. -2008-03-04 Joshua Sumali - - * patches/icedtea-use-system-tzdata.patch: Add missing hunk. - -2008-03-04 Gary Benson - - * patches/icedtea-hotspot-6b06-7b24.patch: New file. - * patches/icedtea-hotspot7-build-fixes.patch: Likewise. - * patches/icedtea-bytecodeInterpreter.patch: Likewise. - * patches/icedtea-bytecodeInterpreterWithChecks.patch: Likewise. - * Makefile.am: Apply the above patches when zero is being built. + * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp + (current_stack_region): Fudge reported stack size. + +2008-02-29 Gary Benson + + * patches/icedtea-ppc-stack-hack.patch: More. + +2008-02-29 Gary Benson + + * patches/icedtea-ppc-stack-hack.patch: New file. + * Makefile.am (ICEDTEA_PATCHES): Added the above. * Makefile.in: Regenerated. - * patches/icedtea-linker-options.patch: Reinstate missing hunks. - * patches/icedtea-ports.patch: Likewise. - * patches/icedtea-zero.patch: Likewise. - -2008-03-04 Lillian Angel - - * generated/*: Updated generated files. - * Makefile.am: Fixed distclean target. +2008-02-28 Joshua Sumali + + * Makefile.am + (.PHONY): Remove clean-tools. + (EXTRA_DIST): Add icedtea-webservices.patch + (icedtea-compile.stamp): Removed this stamp to go back to old building of + icedtea target. + (icedtea-compile-debug.stamp): Likewise. + (clean-tools-jar): Remove clean-tools dependency. + (default-jnlp.stamp): Moved to be part of icedtea and icedtea-debug + targets. + (default-jnlp): Remove unused target. + (icedtea-compile): Likewise. + (icedtea-compile-ecj): Likewise. * Makefile.in: Regenerated. -2008-03-03 Lillian Angel - - * generated/sun/awt/X11/generator/sizer.32: Regenerated. - * generated/sun/awt/X11/generator/sizer.32.c: Likewise. - * patches/icedtea-lesstif-64.patch: Removed. - * Makefile.am: Removed above patch. +2008-02-28 Gary Benson + + * contrib/templater/README: Changed a URL. + +2008-02-28 Lillian Angel + + * Makefile.am + (stamps/default-jnlp.stamp): Added dependency. + (stamps/icedtea-compile.stamp): Removed touch at end of rule. Should + follow what the comment says. + (stamps/icedtea-compile-ecj.stamp): Likewise. + (icedtea-compile): Added new alias target. + (icedtea-compile-ecj): Likewise. * Makefile.in: Regenerated. - * rt/java/io/PushbackReader.java: New file. - -2008-03-03 Joshua Sumali - - * generated/sun/awt/X11/generator/sizer.32: Accidentally committed this - in revision 633. Reverting back to rev 632. - * generated/sun/awt/X11/generator/sizer.32.c: Likewise. - -2008-03-03 Joshua Sumali - - * Makefile.am: Updated to b06. + +2008-02-28 Mark Wielaard + + * Makefile.am (EXTRA_DIST): Removed tools and icedtea-plugin.patch. * Makefile.in: Regenerated. - * patches/icedtea-ant.patch: Updated line numbers for b06. - * patches/icedtea-bytebuffer-compact.patch: Likewise. - * patches/icedtea-copy-plugs.patch: Likewise. - * patches/icedtea-core-build.patch: Likewise. - * patches/icedtea-gcc-4.3.patch: Likewise. - * patches/icedtea-headers.patch: Likewise. - * patches/icedtea-lib64.patch: Likewise. - * patches/icedtea-libraries.patch: Likewise. - * patches/icedtea-ports.patch: Likewise. - * patches/icedtea-sunsrc.patch: Likewise. - * patches/icedtea-tools.patch: Likewise. - * patches/icedtea-use-system-tzdata.patch: Likewise. - * patches/icedtea-zero.patch: Likewise. - * patches/icedtea-graphics.patch: Removed awt patches since new awt code - is included in b06. - * rt/java/awt/*: Removed files since they are newly opened in b06. - -2008-02-28 Joshua Sumali + * .hgignore: Removed tools and tools-source-files.txt. + +2008-02-27 Joshua Sumali + + * rt/net/sourceforge/jnlp/runtime/InstallDialog.java: Fix bad resource + path. + +2008-02-27 Joshua Sumali From andrew at icedtea.classpath.org Thu Aug 22 08:13:14 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 22 Aug 2013 15:13:14 +0000 Subject: /hg/icedtea: 3 new changesets Message-ID: changeset bc58136868e2 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=bc58136868e2 author: Andrew John Hughes date: Thu Aug 22 16:12:39 2013 +0100 Close cacao branch. changeset 5a40638cb283 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5a40638cb283 author: Andrew John Hughes date: Thu Aug 22 16:12:43 2013 +0100 Close cacao branch. changeset 839184322929 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=839184322929 author: Andrew John Hughes date: Thu Aug 22 16:12:50 2013 +0100 Close cacao-b19 branch. diffstat: .hgignore | 316 +- .hgtags | 4 - AUTHORS | 5 - ChangeLog | 6138 +- INSTALL | 59 +- Makefile.am | 745 +- Makefile.in | 799 +- NEWS | 30 - README | 61 +- README.cacao | 4 + acinclude.m4 | 159 +- aclocal.m4 | 40 +- configure | 3969 +- configure.ac | 244 +- contrib/templater/README | 2 - contrib/templater/generate.py | 188 - contrib/templater/hotspot/build/linux/makefiles/CPUS.make | 46 - contrib/templater/hotspot/build/linux/platform_CPUS | 19 - contrib/templater/hotspot/src/cpu/CPU/vm/assembler_CPU.cpp | 1476 - contrib/templater/hotspot/src/cpu/CPU/vm/assembler_CPU.hpp | 481 - contrib/templater/hotspot/src/cpu/CPU/vm/bytecodeInterpreter_CPU.hpp | 103 - contrib/templater/hotspot/src/cpu/CPU/vm/bytecodeInterpreter_CPU.inline.hpp | 278 - contrib/templater/hotspot/src/cpu/CPU/vm/bytecodes_CPU.cpp | 32 - contrib/templater/hotspot/src/cpu/CPU/vm/bytecodes_CPU.hpp | 25 - contrib/templater/hotspot/src/cpu/CPU/vm/bytes_CPU.hpp | 210 - contrib/templater/hotspot/src/cpu/CPU/vm/codeBuffer_CPU.hpp | 27 - contrib/templater/hotspot/src/cpu/CPU/vm/copy_CPU.hpp | 166 - contrib/templater/hotspot/src/cpu/CPU/vm/cppInterpreterGenerator_CPU.hpp | 32 - contrib/templater/hotspot/src/cpu/CPU/vm/cppInterpreter_CPU.cpp | 1407 - contrib/templater/hotspot/src/cpu/CPU/vm/cppInterpreter_CPU.hpp | 32 - contrib/templater/hotspot/src/cpu/CPU/vm/debug_CPU.cpp | 32 - contrib/templater/hotspot/src/cpu/CPU/vm/disassembler_CPU.cpp | 696 - contrib/templater/hotspot/src/cpu/CPU/vm/disassembler_CPU.hpp | 38 - contrib/templater/hotspot/src/cpu/CPU/vm/dump_CPU.cpp | 37 - contrib/templater/hotspot/src/cpu/CPU/vm/frame_CPU.cpp | 139 - contrib/templater/hotspot/src/cpu/CPU/vm/frame_CPU.hpp | 74 - contrib/templater/hotspot/src/cpu/CPU/vm/frame_CPU.inline.hpp | 203 - contrib/templater/hotspot/src/cpu/CPU/vm/globalDefinitions_CPU.hpp | 28 - contrib/templater/hotspot/src/cpu/CPU/vm/globals_CPU.hpp | 55 - contrib/templater/hotspot/src/cpu/CPU/vm/icBuffer_CPU.cpp | 52 - contrib/templater/hotspot/src/cpu/CPU/vm/icache_CPU.cpp | 105 - contrib/templater/hotspot/src/cpu/CPU/vm/icache_CPU.hpp | 45 - contrib/templater/hotspot/src/cpu/CPU/vm/interp_masm_CPU.cpp | 191 - contrib/templater/hotspot/src/cpu/CPU/vm/interp_masm_CPU.hpp | 62 - contrib/templater/hotspot/src/cpu/CPU/vm/interpreterGenerator_CPU.hpp | 37 - contrib/templater/hotspot/src/cpu/CPU/vm/interpreterRT_CPU.cpp | 382 - contrib/templater/hotspot/src/cpu/CPU/vm/interpreterRT_CPU.hpp | 163 - contrib/templater/hotspot/src/cpu/CPU/vm/interpreter_CPU.cpp | 190 - contrib/templater/hotspot/src/cpu/CPU/vm/interpreter_CPU.hpp | 56 - contrib/templater/hotspot/src/cpu/CPU/vm/javaFrameAnchor_CPU.hpp | 79 - contrib/templater/hotspot/src/cpu/CPU/vm/jniFastGetField_CPU.cpp | 67 - contrib/templater/hotspot/src/cpu/CPU/vm/jniTypes_CPU.hpp | 108 - contrib/templater/hotspot/src/cpu/CPU/vm/jni_CPU.h | 32 - contrib/templater/hotspot/src/cpu/CPU/vm/nativeInst_CPU.hpp | 230 - contrib/templater/hotspot/src/cpu/CPU/vm/registerMap_CPU.hpp | 39 - contrib/templater/hotspot/src/cpu/CPU/vm/register_CPU.cpp | 59 - contrib/templater/hotspot/src/cpu/CPU/vm/register_CPU.hpp | 260 - contrib/templater/hotspot/src/cpu/CPU/vm/register_definitions_CPU.cpp | 115 - contrib/templater/hotspot/src/cpu/CPU/vm/relocInfo_CPU.cpp | 68 - contrib/templater/hotspot/src/cpu/CPU/vm/relocInfo_CPU.hpp | 36 - contrib/templater/hotspot/src/cpu/CPU/vm/sharedRuntime_CPU.cpp | 277 - contrib/templater/hotspot/src/cpu/CPU/vm/stubGenerator_CPU.cpp | 523 - contrib/templater/hotspot/src/cpu/CPU/vm/stubRoutines_CPU.hpp | 62 - contrib/templater/hotspot/src/cpu/CPU/vm/vmStructs_CPU.hpp | 52 - contrib/templater/hotspot/src/cpu/CPU/vm/vm_version_CPU.hpp | 32 - contrib/templater/hotspot/src/cpu/CPU/vm/vmreg_CPU.cpp | 67 - contrib/templater/hotspot/src/cpu/CPU/vm/vmreg_CPU.hpp | 29 - contrib/templater/hotspot/src/cpu/CPU/vm/vmreg_CPU.inline.hpp | 32 - contrib/templater/hotspot/src/cpu/CPU/vm/vtableStubs_CPU.cpp | 47 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/assembler_linux_CPU.cpp | 34 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/atomic_linux_CPU.inline.hpp | 164 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/bytes_linux_CPU.inline.hpp | 43 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/globals_linux_CPU.hpp | 43 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/linux_ppc.s | 76 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/linux_ppc64.s | 96 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/orderAccess_linux_CPU.inline.hpp | 101 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/os_linux_CPU.cpp | 348 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/os_linux_CPU.hpp | 36 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/prefetch_linux_CPU.inline.hpp | 42 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/threadLS_linux_CPU.cpp | 42 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/threadLS_linux_CPU.hpp | 32 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/thread_linux_CPU.hpp | 85 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/vmStructs_linux_CPU.hpp | 45 - contrib/templater/jdk/src/solaris/bin/CPUS/jvm.cfg | 44 - contrib/templater/jdk/src/solaris/bin/ergo_CPU.c | 58 - extra/net/sourceforge/jnlp/about/HTMLPanel.java | 59 - extra/net/sourceforge/jnlp/about/Main.java | 135 - extra/net/sourceforge/jnlp/about/resources/about.html | 28 - extra/net/sourceforge/jnlp/about/resources/applications.html | 36 - extra/net/sourceforge/jnlp/about/resources/jamIcon.jpg | Bin extra/net/sourceforge/jnlp/about/resources/notes.html | 82 - gcjwebplugin.cc | 14 +- generated/com/sun/accessibility/internal/resources/accessibility_en.java | 107 - generated/com/sun/corba/se/impl/logging/ActivationSystemException.java | 1 + generated/com/sun/corba/se/impl/logging/IORSystemException.java | 1 + generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java | 1 + generated/com/sun/corba/se/impl/logging/LogStrings.properties | 30 +- generated/com/sun/corba/se/impl/logging/NamingSystemException.java | 1 + generated/com/sun/corba/se/impl/logging/OMGSystemException.java | 1 + generated/com/sun/corba/se/impl/logging/ORBUtilSystemException.java | 1 + generated/com/sun/corba/se/impl/logging/POASystemException.java | 1 + generated/com/sun/corba/se/impl/logging/UtilSystemException.java | 1 + generated/com/sun/java/swing/plaf/motif/resources/motif.java | 1 - generated/com/sun/java/swing/plaf/motif/resources/motif_de.java | 1 - generated/com/sun/java/swing/plaf/motif/resources/motif_es.java | 1 - generated/com/sun/java/swing/plaf/motif/resources/motif_fr.java | 1 - generated/com/sun/java/swing/plaf/motif/resources/motif_it.java | 1 - generated/com/sun/java/swing/plaf/motif/resources/motif_ja.java | 1 - generated/com/sun/java/swing/plaf/motif/resources/motif_ko.java | 1 - generated/com/sun/java/swing/plaf/motif/resources/motif_sv.java | 1 - generated/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.java | 1 - generated/com/sun/java/swing/plaf/motif/resources/motif_zh_HK.java | 1 - generated/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.java | 1 - generated/com/sun/java/swing/plaf/windows/resources/windows.java | 3 - generated/com/sun/java/swing/plaf/windows/resources/windows_de.java | 3 - generated/com/sun/java/swing/plaf/windows/resources/windows_es.java | 3 - generated/com/sun/java/swing/plaf/windows/resources/windows_fr.java | 3 - generated/com/sun/java/swing/plaf/windows/resources/windows_it.java | 3 - generated/com/sun/java/swing/plaf/windows/resources/windows_ja.java | 3 - generated/com/sun/java/swing/plaf/windows/resources/windows_ko.java | 3 - generated/com/sun/java/swing/plaf/windows/resources/windows_sv.java | 3 - generated/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.java | 3 - generated/com/sun/java/swing/plaf/windows/resources/windows_zh_HK.java | 3 - generated/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.java | 3 - generated/com/sun/swing/internal/plaf/basic/resources/basic.java | 2 - generated/com/sun/swing/internal/plaf/basic/resources/basic_de.java | 2 - generated/com/sun/swing/internal/plaf/basic/resources/basic_es.java | 2 - generated/com/sun/swing/internal/plaf/basic/resources/basic_fr.java | 2 - generated/com/sun/swing/internal/plaf/basic/resources/basic_it.java | 2 - generated/com/sun/swing/internal/plaf/basic/resources/basic_ja.java | 2 - generated/com/sun/swing/internal/plaf/basic/resources/basic_ko.java | 2 - generated/com/sun/swing/internal/plaf/basic/resources/basic_sv.java | 2 - generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.java | 2 - generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_HK.java | 2 - generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.java | 2 - generated/com/sun/swing/internal/plaf/metal/resources/metal.java | 1 - generated/com/sun/swing/internal/plaf/metal/resources/metal_de.java | 1 - generated/com/sun/swing/internal/plaf/metal/resources/metal_es.java | 1 - generated/com/sun/swing/internal/plaf/metal/resources/metal_fr.java | 1 - generated/com/sun/swing/internal/plaf/metal/resources/metal_it.java | 1 - generated/com/sun/swing/internal/plaf/metal/resources/metal_ja.java | 1 - generated/com/sun/swing/internal/plaf/metal/resources/metal_ko.java | 1 - generated/com/sun/swing/internal/plaf/metal/resources/metal_sv.java | 1 - generated/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.java | 1 - generated/com/sun/swing/internal/plaf/metal/resources/metal_zh_HK.java | 1 - generated/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.java | 1 - generated/com/sun/swing/internal/plaf/synth/resources/synth.java | 1 - generated/com/sun/swing/internal/plaf/synth/resources/synth_de.java | 1 - generated/com/sun/swing/internal/plaf/synth/resources/synth_es.java | 1 - generated/com/sun/swing/internal/plaf/synth/resources/synth_fr.java | 1 - generated/com/sun/swing/internal/plaf/synth/resources/synth_it.java | 1 - generated/com/sun/swing/internal/plaf/synth/resources/synth_ja.java | 1 - generated/com/sun/swing/internal/plaf/synth/resources/synth_ko.java | 1 - generated/com/sun/swing/internal/plaf/synth/resources/synth_sv.java | 1 - generated/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.java | 1 - generated/com/sun/swing/internal/plaf/synth/resources/synth_zh_HK.java | 1 - generated/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.java | 1 - generated/com/sun/tools/jdi/JDWP.java | 22 +- generated/fontconfig/fontconfig.Fedora.bfc | Bin generated/fontconfig/fontconfig.SuSE.bfc | Bin generated/fontconfig/fontconfig.Ubuntu.bfc | Bin generated/fontconfig/fontconfig.bfc | Bin generated/java/lang/CharacterData00.java | 2 + generated/java/lang/CharacterData01.java | 2 + generated/java/lang/CharacterData02.java | 2 + generated/java/lang/CharacterData0E.java | 2 + generated/java/lang/CharacterDataLatin1.java | 2 + generated/java/nio/BufferOverflowException.java | 6 +- generated/java/nio/BufferUnderflowException.java | 6 +- generated/java/nio/ByteBuffer.java | 249 +- generated/java/nio/ByteBufferAsCharBufferB.java | 164 +- generated/java/nio/ByteBufferAsCharBufferL.java | 164 +- generated/java/nio/ByteBufferAsCharBufferRB.java | 98 +- generated/java/nio/ByteBufferAsCharBufferRL.java | 98 +- generated/java/nio/ByteBufferAsDoubleBufferB.java | 116 +- generated/java/nio/ByteBufferAsDoubleBufferL.java | 116 +- generated/java/nio/ByteBufferAsDoubleBufferRB.java | 50 +- generated/java/nio/ByteBufferAsDoubleBufferRL.java | 50 +- generated/java/nio/ByteBufferAsFloatBufferB.java | 116 +- generated/java/nio/ByteBufferAsFloatBufferL.java | 116 +- generated/java/nio/ByteBufferAsFloatBufferRB.java | 50 +- generated/java/nio/ByteBufferAsFloatBufferRL.java | 50 +- generated/java/nio/ByteBufferAsIntBufferB.java | 116 +- generated/java/nio/ByteBufferAsIntBufferL.java | 116 +- generated/java/nio/ByteBufferAsIntBufferRB.java | 50 +- generated/java/nio/ByteBufferAsIntBufferRL.java | 50 +- generated/java/nio/ByteBufferAsLongBufferB.java | 116 +- generated/java/nio/ByteBufferAsLongBufferL.java | 116 +- generated/java/nio/ByteBufferAsLongBufferRB.java | 50 +- generated/java/nio/ByteBufferAsLongBufferRL.java | 50 +- generated/java/nio/ByteBufferAsShortBufferB.java | 116 +- generated/java/nio/ByteBufferAsShortBufferL.java | 116 +- generated/java/nio/ByteBufferAsShortBufferRB.java | 50 +- generated/java/nio/ByteBufferAsShortBufferRL.java | 50 +- generated/java/nio/CharBuffer.java | 257 +- generated/java/nio/DirectByteBuffer.java | 941 +- generated/java/nio/DirectByteBufferR.java | 513 +- generated/java/nio/DirectCharBufferRS.java | 107 +- generated/java/nio/DirectCharBufferRU.java | 107 +- generated/java/nio/DirectCharBufferS.java | 277 +- generated/java/nio/DirectCharBufferU.java | 277 +- generated/java/nio/DirectDoubleBufferRS.java | 59 +- generated/java/nio/DirectDoubleBufferRU.java | 59 +- generated/java/nio/DirectDoubleBufferS.java | 229 +- generated/java/nio/DirectDoubleBufferU.java | 229 +- generated/java/nio/DirectFloatBufferRS.java | 59 +- generated/java/nio/DirectFloatBufferRU.java | 59 +- generated/java/nio/DirectFloatBufferS.java | 229 +- generated/java/nio/DirectFloatBufferU.java | 229 +- generated/java/nio/DirectIntBufferRS.java | 59 +- generated/java/nio/DirectIntBufferRU.java | 59 +- generated/java/nio/DirectIntBufferS.java | 229 +- generated/java/nio/DirectIntBufferU.java | 229 +- generated/java/nio/DirectLongBufferRS.java | 59 +- generated/java/nio/DirectLongBufferRU.java | 59 +- generated/java/nio/DirectLongBufferS.java | 229 +- generated/java/nio/DirectLongBufferU.java | 229 +- generated/java/nio/DirectShortBufferRS.java | 59 +- generated/java/nio/DirectShortBufferRU.java | 59 +- generated/java/nio/DirectShortBufferS.java | 229 +- generated/java/nio/DirectShortBufferU.java | 229 +- generated/java/nio/DoubleBuffer.java | 221 +- generated/java/nio/FloatBuffer.java | 221 +- generated/java/nio/HeapByteBuffer.java | 429 +- generated/java/nio/HeapByteBufferR.java | 273 +- generated/java/nio/HeapCharBuffer.java | 193 +- generated/java/nio/HeapCharBufferR.java | 85 +- generated/java/nio/HeapDoubleBuffer.java | 171 +- generated/java/nio/HeapDoubleBufferR.java | 63 +- generated/java/nio/HeapFloatBuffer.java | 171 +- generated/java/nio/HeapFloatBufferR.java | 63 +- generated/java/nio/HeapIntBuffer.java | 171 +- generated/java/nio/HeapIntBufferR.java | 63 +- generated/java/nio/HeapLongBuffer.java | 171 +- generated/java/nio/HeapLongBufferR.java | 63 +- generated/java/nio/HeapShortBuffer.java | 171 +- generated/java/nio/HeapShortBufferR.java | 63 +- generated/java/nio/IntBuffer.java | 221 +- generated/java/nio/InvalidMarkException.java | 6 +- generated/java/nio/LongBuffer.java | 221 +- generated/java/nio/ReadOnlyBufferException.java | 6 +- generated/java/nio/ShortBuffer.java | 221 +- generated/java/nio/channels/AlreadyConnectedException.java | 6 +- generated/java/nio/channels/AsynchronousCloseException.java | 6 +- generated/java/nio/channels/CancelledKeyException.java | 6 +- generated/java/nio/channels/ClosedByInterruptException.java | 6 +- generated/java/nio/channels/ClosedChannelException.java | 6 +- generated/java/nio/channels/ClosedSelectorException.java | 6 +- generated/java/nio/channels/ConnectionPendingException.java | 6 +- generated/java/nio/channels/FileLockInterruptionException.java | 6 +- generated/java/nio/channels/IllegalBlockingModeException.java | 6 +- generated/java/nio/channels/IllegalSelectorException.java | 6 +- generated/java/nio/channels/NoConnectionPendingException.java | 6 +- generated/java/nio/channels/NonReadableChannelException.java | 6 +- generated/java/nio/channels/NonWritableChannelException.java | 6 +- generated/java/nio/channels/NotYetBoundException.java | 6 +- generated/java/nio/channels/NotYetConnectedException.java | 6 +- generated/java/nio/channels/OverlappingFileLockException.java | 6 +- generated/java/nio/channels/UnresolvedAddressException.java | 6 +- generated/java/nio/channels/UnsupportedAddressTypeException.java | 6 +- generated/java/nio/charset/CharacterCodingException.java | 6 +- generated/java/nio/charset/CharsetDecoder.java | 295 +- generated/java/nio/charset/CharsetEncoder.java | 379 +- generated/java/nio/charset/IllegalCharsetNameException.java | 6 +- generated/java/nio/charset/UnsupportedCharsetException.java | 6 +- generated/org/omg/PortableServer/AdapterActivator.java | 2 +- generated/org/omg/PortableServer/AdapterActivatorOperations.java | 2 +- generated/org/omg/PortableServer/Current.java | 2 +- generated/org/omg/PortableServer/CurrentOperations.java | 2 +- generated/org/omg/PortableServer/CurrentPackage/NoContext.java | 2 +- generated/org/omg/PortableServer/CurrentPackage/NoContextHelper.java | 2 +- generated/org/omg/PortableServer/ForwardRequest.java | 2 +- generated/org/omg/PortableServer/ForwardRequestHelper.java | 2 +- generated/org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.java | 2 +- generated/org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.java | 2 +- generated/org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.java | 2 +- generated/org/omg/PortableServer/IdAssignmentPolicy.java | 2 +- generated/org/omg/PortableServer/IdAssignmentPolicyOperations.java | 2 +- generated/org/omg/PortableServer/IdAssignmentPolicyValue.java | 2 +- generated/org/omg/PortableServer/IdUniquenessPolicy.java | 2 +- generated/org/omg/PortableServer/IdUniquenessPolicyOperations.java | 2 +- generated/org/omg/PortableServer/IdUniquenessPolicyValue.java | 2 +- generated/org/omg/PortableServer/ImplicitActivationPolicy.java | 2 +- generated/org/omg/PortableServer/ImplicitActivationPolicyOperations.java | 2 +- generated/org/omg/PortableServer/ImplicitActivationPolicyValue.java | 2 +- generated/org/omg/PortableServer/LIFESPAN_POLICY_ID.java | 2 +- generated/org/omg/PortableServer/LifespanPolicy.java | 2 +- generated/org/omg/PortableServer/LifespanPolicyOperations.java | 2 +- generated/org/omg/PortableServer/LifespanPolicyValue.java | 2 +- generated/org/omg/PortableServer/POA.java | 2 +- generated/org/omg/PortableServer/POAManager.java | 2 +- generated/org/omg/PortableServer/POAManagerOperations.java | 2 +- generated/org/omg/PortableServer/POAManagerPackage/AdapterInactive.java | 2 +- generated/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java | 2 +- generated/org/omg/PortableServer/POAManagerPackage/State.java | 2 +- generated/org/omg/PortableServer/POAOperations.java | 2 +- generated/org/omg/PortableServer/POAPackage/AdapterAlreadyExists.java | 2 +- generated/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java | 2 +- generated/org/omg/PortableServer/POAPackage/AdapterNonExistent.java | 2 +- generated/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java | 2 +- generated/org/omg/PortableServer/POAPackage/InvalidPolicy.java | 2 +- generated/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java | 2 +- generated/org/omg/PortableServer/POAPackage/NoServant.java | 2 +- generated/org/omg/PortableServer/POAPackage/NoServantHelper.java | 2 +- generated/org/omg/PortableServer/POAPackage/ObjectAlreadyActive.java | 2 +- generated/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java | 2 +- generated/org/omg/PortableServer/POAPackage/ObjectNotActive.java | 2 +- generated/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java | 2 +- generated/org/omg/PortableServer/POAPackage/ServantAlreadyActive.java | 2 +- generated/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java | 2 +- generated/org/omg/PortableServer/POAPackage/ServantNotActive.java | 2 +- generated/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java | 2 +- generated/org/omg/PortableServer/POAPackage/WrongAdapter.java | 2 +- generated/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java | 2 +- generated/org/omg/PortableServer/POAPackage/WrongPolicy.java | 2 +- generated/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java | 2 +- generated/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.java | 2 +- generated/org/omg/PortableServer/RequestProcessingPolicy.java | 2 +- generated/org/omg/PortableServer/RequestProcessingPolicyOperations.java | 2 +- generated/org/omg/PortableServer/RequestProcessingPolicyValue.java | 2 +- generated/org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.java | 2 +- generated/org/omg/PortableServer/ServantActivator.java | 2 +- generated/org/omg/PortableServer/ServantActivatorHelper.java | 2 +- generated/org/omg/PortableServer/ServantActivatorOperations.java | 2 +- generated/org/omg/PortableServer/ServantActivatorPOA.java | 2 +- generated/org/omg/PortableServer/ServantLocator.java | 2 +- generated/org/omg/PortableServer/ServantLocatorHelper.java | 2 +- generated/org/omg/PortableServer/ServantLocatorOperations.java | 2 +- generated/org/omg/PortableServer/ServantLocatorPOA.java | 2 +- generated/org/omg/PortableServer/ServantManager.java | 2 +- generated/org/omg/PortableServer/ServantManagerOperations.java | 2 +- generated/org/omg/PortableServer/ServantRetentionPolicy.java | 2 +- generated/org/omg/PortableServer/ServantRetentionPolicyOperations.java | 2 +- generated/org/omg/PortableServer/ServantRetentionPolicyValue.java | 2 +- generated/org/omg/PortableServer/THREAD_POLICY_ID.java | 2 +- generated/org/omg/PortableServer/ThreadPolicy.java | 2 +- generated/org/omg/PortableServer/ThreadPolicyOperations.java | 2 +- generated/org/omg/PortableServer/ThreadPolicyValue.java | 2 +- generated/org/omg/PortableServer/_ServantActivatorStub.java | 2 +- generated/org/omg/PortableServer/_ServantLocatorStub.java | 2 +- generated/sun/awt/X11/XAWTIcon32_java_icon16_png.java | 33 +- generated/sun/awt/X11/XAWTIcon32_java_icon24_png.java | 63 +- generated/sun/awt/X11/XAWTIcon32_java_icon32_png.java | 110 +- generated/sun/awt/X11/XAWTIcon32_java_icon48_png.java | 238 +- generated/sun/awt/X11/XAWTIcon64_java_icon16_png.java | 33 +- generated/sun/awt/X11/XAWTIcon64_java_icon24_png.java | 63 +- generated/sun/awt/X11/XAWTIcon64_java_icon32_png.java | 110 +- generated/sun/awt/X11/XAWTIcon64_java_icon48_png.java | 238 +- generated/sun/awt/X11/generator/sizer.32 | Bin generated/sun/awt/X11/generator/sizer.32.c | 1007 - generated/sun/awt/X11/generator/sizes.32 | 789 - generated/sun/management/resources/agent.java | 6 - generated/sun/misc/Version.java | 68 +- generated/sun/nio/ch/AlreadyBoundException.java | 6 +- generated/sun/nio/cs/StandardCharsets.java | 25 +- generated/sun/tools/jconsole/Version.java | 6 +- generated/sun/util/CoreResourceBundleControl.java | 32 +- generated/sun/util/LocaleDataMetaInfo.java | 48 +- generated/sun/util/resources/CalendarData.java | 12 - generated/sun/util/resources/CalendarData_ar.java | 12 - generated/sun/util/resources/CalendarData_be.java | 10 - generated/sun/util/resources/CalendarData_bg.java | 10 - generated/sun/util/resources/CalendarData_ca.java | 12 - generated/sun/util/resources/CalendarData_cs.java | 12 - generated/sun/util/resources/CalendarData_da.java | 12 - generated/sun/util/resources/CalendarData_de.java | 12 - generated/sun/util/resources/CalendarData_el.java | 12 - generated/sun/util/resources/CalendarData_el_CY.java | 11 - generated/sun/util/resources/CalendarData_en.java | 10 - generated/sun/util/resources/CalendarData_en_GB.java | 12 - generated/sun/util/resources/CalendarData_en_IE.java | 12 - generated/sun/util/resources/CalendarData_en_MT.java | 11 - generated/sun/util/resources/CalendarData_es.java | 12 - generated/sun/util/resources/CalendarData_es_ES.java | 12 - generated/sun/util/resources/CalendarData_es_US.java | 11 - generated/sun/util/resources/CalendarData_et.java | 12 - generated/sun/util/resources/CalendarData_fi.java | 12 - generated/sun/util/resources/CalendarData_fr.java | 12 - generated/sun/util/resources/CalendarData_fr_CA.java | 12 - generated/sun/util/resources/CalendarData_hi.java | 10 - generated/sun/util/resources/CalendarData_hr.java | 11 - generated/sun/util/resources/CalendarData_hu.java | 12 - generated/sun/util/resources/CalendarData_in_ID.java | 11 - generated/sun/util/resources/CalendarData_is.java | 12 - generated/sun/util/resources/CalendarData_it.java | 12 - generated/sun/util/resources/CalendarData_iw.java | 10 - generated/sun/util/resources/CalendarData_ja.java | 10 - generated/sun/util/resources/CalendarData_ko.java | 10 - generated/sun/util/resources/CalendarData_lt.java | 12 - generated/sun/util/resources/CalendarData_lv.java | 10 - generated/sun/util/resources/CalendarData_mk.java | 10 - generated/sun/util/resources/CalendarData_ms_MY.java | 11 - generated/sun/util/resources/CalendarData_mt.java | 11 - generated/sun/util/resources/CalendarData_mt_MT.java | 11 - generated/sun/util/resources/CalendarData_nl.java | 12 - generated/sun/util/resources/CalendarData_no.java | 12 - generated/sun/util/resources/CalendarData_pl.java | 12 - generated/sun/util/resources/CalendarData_pt.java | 12 - generated/sun/util/resources/CalendarData_pt_PT.java | 12 - generated/sun/util/resources/CalendarData_ro.java | 12 - generated/sun/util/resources/CalendarData_ru.java | 12 - generated/sun/util/resources/CalendarData_sk.java | 12 - generated/sun/util/resources/CalendarData_sl.java | 10 - generated/sun/util/resources/CalendarData_sq.java | 10 - generated/sun/util/resources/CalendarData_sr.java | 11 - generated/sun/util/resources/CalendarData_sv.java | 12 - generated/sun/util/resources/CalendarData_th.java | 10 - generated/sun/util/resources/CalendarData_tr.java | 12 - generated/sun/util/resources/CalendarData_uk.java | 12 - generated/sun/util/resources/CalendarData_vi.java | 10 - generated/sun/util/resources/CalendarData_zh.java | 10 - generated/sun/util/resources/CurrencyNames.java | 431 - generated/sun/util/resources/CurrencyNames_ar_AE.java | 11 - generated/sun/util/resources/CurrencyNames_ar_BH.java | 11 - generated/sun/util/resources/CurrencyNames_ar_DZ.java | 11 - generated/sun/util/resources/CurrencyNames_ar_EG.java | 11 - generated/sun/util/resources/CurrencyNames_ar_IQ.java | 11 - generated/sun/util/resources/CurrencyNames_ar_JO.java | 11 - generated/sun/util/resources/CurrencyNames_ar_KW.java | 11 - generated/sun/util/resources/CurrencyNames_ar_LB.java | 11 - generated/sun/util/resources/CurrencyNames_ar_LY.java | 11 - generated/sun/util/resources/CurrencyNames_ar_MA.java | 11 - generated/sun/util/resources/CurrencyNames_ar_OM.java | 11 - generated/sun/util/resources/CurrencyNames_ar_QA.java | 11 - generated/sun/util/resources/CurrencyNames_ar_SA.java | 11 - generated/sun/util/resources/CurrencyNames_ar_SD.java | 12 - generated/sun/util/resources/CurrencyNames_ar_SY.java | 11 - generated/sun/util/resources/CurrencyNames_ar_TN.java | 11 - generated/sun/util/resources/CurrencyNames_ar_YE.java | 11 - generated/sun/util/resources/CurrencyNames_be_BY.java | 11 - generated/sun/util/resources/CurrencyNames_bg_BG.java | 11 - generated/sun/util/resources/CurrencyNames_ca_ES.java | 12 - generated/sun/util/resources/CurrencyNames_cs_CZ.java | 11 - generated/sun/util/resources/CurrencyNames_da_DK.java | 12 - generated/sun/util/resources/CurrencyNames_de.java | 205 - generated/sun/util/resources/CurrencyNames_de_AT.java | 12 - generated/sun/util/resources/CurrencyNames_de_CH.java | 11 - generated/sun/util/resources/CurrencyNames_de_DE.java | 12 - generated/sun/util/resources/CurrencyNames_de_GR.java | 12 - generated/sun/util/resources/CurrencyNames_de_LU.java | 12 - generated/sun/util/resources/CurrencyNames_el_CY.java | 12 - generated/sun/util/resources/CurrencyNames_el_GR.java | 12 - generated/sun/util/resources/CurrencyNames_en_AU.java | 11 - generated/sun/util/resources/CurrencyNames_en_CA.java | 12 - generated/sun/util/resources/CurrencyNames_en_GB.java | 12 - generated/sun/util/resources/CurrencyNames_en_IE.java | 12 - generated/sun/util/resources/CurrencyNames_en_IN.java | 11 - generated/sun/util/resources/CurrencyNames_en_MT.java | 12 - generated/sun/util/resources/CurrencyNames_en_NZ.java | 11 - generated/sun/util/resources/CurrencyNames_en_PH.java | 11 - generated/sun/util/resources/CurrencyNames_en_SG.java | 11 - generated/sun/util/resources/CurrencyNames_en_US.java | 11 - generated/sun/util/resources/CurrencyNames_en_ZA.java | 11 - generated/sun/util/resources/CurrencyNames_es.java | 214 - generated/sun/util/resources/CurrencyNames_es_AR.java | 12 - generated/sun/util/resources/CurrencyNames_es_BO.java | 11 - generated/sun/util/resources/CurrencyNames_es_CL.java | 11 - generated/sun/util/resources/CurrencyNames_es_CO.java | 11 - generated/sun/util/resources/CurrencyNames_es_CR.java | 11 - generated/sun/util/resources/CurrencyNames_es_DO.java | 11 - generated/sun/util/resources/CurrencyNames_es_EC.java | 11 - generated/sun/util/resources/CurrencyNames_es_ES.java | 12 - generated/sun/util/resources/CurrencyNames_es_GT.java | 11 - generated/sun/util/resources/CurrencyNames_es_HN.java | 11 - generated/sun/util/resources/CurrencyNames_es_MX.java | 12 - generated/sun/util/resources/CurrencyNames_es_NI.java | 11 - generated/sun/util/resources/CurrencyNames_es_PA.java | 11 - generated/sun/util/resources/CurrencyNames_es_PE.java | 11 - generated/sun/util/resources/CurrencyNames_es_PR.java | 11 - generated/sun/util/resources/CurrencyNames_es_PY.java | 11 - generated/sun/util/resources/CurrencyNames_es_SV.java | 11 - generated/sun/util/resources/CurrencyNames_es_US.java | 11 - generated/sun/util/resources/CurrencyNames_es_UY.java | 11 - generated/sun/util/resources/CurrencyNames_es_VE.java | 12 - generated/sun/util/resources/CurrencyNames_et_EE.java | 11 - generated/sun/util/resources/CurrencyNames_fi_FI.java | 12 - generated/sun/util/resources/CurrencyNames_fr.java | 209 - generated/sun/util/resources/CurrencyNames_fr_BE.java | 12 - generated/sun/util/resources/CurrencyNames_fr_CA.java | 11 - generated/sun/util/resources/CurrencyNames_fr_CH.java | 11 - generated/sun/util/resources/CurrencyNames_fr_FR.java | 12 - generated/sun/util/resources/CurrencyNames_fr_LU.java | 12 - generated/sun/util/resources/CurrencyNames_ga_IE.java | 11 - generated/sun/util/resources/CurrencyNames_hi_IN.java | 11 - generated/sun/util/resources/CurrencyNames_hr_HR.java | 11 - generated/sun/util/resources/CurrencyNames_hu_HU.java | 11 - generated/sun/util/resources/CurrencyNames_in_ID.java | 11 - generated/sun/util/resources/CurrencyNames_is_IS.java | 11 - generated/sun/util/resources/CurrencyNames_it.java | 207 - generated/sun/util/resources/CurrencyNames_it_CH.java | 11 - generated/sun/util/resources/CurrencyNames_it_IT.java | 12 - generated/sun/util/resources/CurrencyNames_iw_IL.java | 11 - generated/sun/util/resources/CurrencyNames_ja.java | 206 - generated/sun/util/resources/CurrencyNames_ja_JP.java | 11 - generated/sun/util/resources/CurrencyNames_ko.java | 193 - generated/sun/util/resources/CurrencyNames_ko_KR.java | 11 - generated/sun/util/resources/CurrencyNames_lt_LT.java | 11 - generated/sun/util/resources/CurrencyNames_lv_LV.java | 11 - generated/sun/util/resources/CurrencyNames_mk_MK.java | 11 - generated/sun/util/resources/CurrencyNames_ms_MY.java | 11 - generated/sun/util/resources/CurrencyNames_mt_MT.java | 12 - generated/sun/util/resources/CurrencyNames_nl_BE.java | 12 - generated/sun/util/resources/CurrencyNames_nl_NL.java | 12 - generated/sun/util/resources/CurrencyNames_no_NO.java | 11 - generated/sun/util/resources/CurrencyNames_pl_PL.java | 11 - generated/sun/util/resources/CurrencyNames_pt_BR.java | 12 - generated/sun/util/resources/CurrencyNames_pt_PT.java | 12 - generated/sun/util/resources/CurrencyNames_ro_RO.java | 12 - generated/sun/util/resources/CurrencyNames_ru_RU.java | 11 - generated/sun/util/resources/CurrencyNames_sk_SK.java | 11 - generated/sun/util/resources/CurrencyNames_sl_SI.java | 12 - generated/sun/util/resources/CurrencyNames_sq_AL.java | 11 - generated/sun/util/resources/CurrencyNames_sr_BA.java | 12 - generated/sun/util/resources/CurrencyNames_sr_CS.java | 11 - generated/sun/util/resources/CurrencyNames_sr_ME.java | 11 - generated/sun/util/resources/CurrencyNames_sv.java | 198 - generated/sun/util/resources/CurrencyNames_sv_SE.java | 12 - generated/sun/util/resources/CurrencyNames_th_TH.java | 11 - generated/sun/util/resources/CurrencyNames_tr_TR.java | 12 - generated/sun/util/resources/CurrencyNames_uk_UA.java | 11 - generated/sun/util/resources/CurrencyNames_vi_VN.java | 11 - generated/sun/util/resources/CurrencyNames_zh_CN.java | 214 - generated/sun/util/resources/CurrencyNames_zh_TW.java | 207 - generated/sun/util/resources/LocaleNames.java | 449 - generated/sun/util/resources/LocaleNames_ar.java | 28 - generated/sun/util/resources/LocaleNames_be.java | 12 - generated/sun/util/resources/LocaleNames_bg.java | 12 - generated/sun/util/resources/LocaleNames_ca.java | 348 - generated/sun/util/resources/LocaleNames_cs.java | 12 - generated/sun/util/resources/LocaleNames_da.java | 12 - generated/sun/util/resources/LocaleNames_de.java | 440 - generated/sun/util/resources/LocaleNames_el.java | 310 - generated/sun/util/resources/LocaleNames_el_CY.java | 309 - generated/sun/util/resources/LocaleNames_en.java | 10 - generated/sun/util/resources/LocaleNames_en_MT.java | 40 - generated/sun/util/resources/LocaleNames_en_PH.java | 40 - generated/sun/util/resources/LocaleNames_en_SG.java | 40 - generated/sun/util/resources/LocaleNames_es.java | 440 - generated/sun/util/resources/LocaleNames_es_US.java | 131 - generated/sun/util/resources/LocaleNames_et.java | 12 - generated/sun/util/resources/LocaleNames_fi.java | 63 - generated/sun/util/resources/LocaleNames_fr.java | 440 - generated/sun/util/resources/LocaleNames_ga.java | 343 - generated/sun/util/resources/LocaleNames_hi.java | 14 - generated/sun/util/resources/LocaleNames_hr.java | 12 - generated/sun/util/resources/LocaleNames_hu.java | 12 - generated/sun/util/resources/LocaleNames_in.java | 163 - generated/sun/util/resources/LocaleNames_is.java | 12 - generated/sun/util/resources/LocaleNames_it.java | 440 - generated/sun/util/resources/LocaleNames_iw.java | 12 - generated/sun/util/resources/LocaleNames_ja.java | 440 - generated/sun/util/resources/LocaleNames_ko.java | 440 - generated/sun/util/resources/LocaleNames_lt.java | 12 - generated/sun/util/resources/LocaleNames_lv.java | 12 - generated/sun/util/resources/LocaleNames_mk.java | 12 - generated/sun/util/resources/LocaleNames_ms.java | 79 - generated/sun/util/resources/LocaleNames_mt.java | 332 - generated/sun/util/resources/LocaleNames_nl.java | 13 - generated/sun/util/resources/LocaleNames_no.java | 14 - generated/sun/util/resources/LocaleNames_pl.java | 348 - generated/sun/util/resources/LocaleNames_pt.java | 374 - generated/sun/util/resources/LocaleNames_pt_BR.java | 22 - generated/sun/util/resources/LocaleNames_pt_PT.java | 72 - generated/sun/util/resources/LocaleNames_ro.java | 12 - generated/sun/util/resources/LocaleNames_ru.java | 348 - generated/sun/util/resources/LocaleNames_sk.java | 12 - generated/sun/util/resources/LocaleNames_sl.java | 12 - generated/sun/util/resources/LocaleNames_sq.java | 12 - generated/sun/util/resources/LocaleNames_sr.java | 307 - generated/sun/util/resources/LocaleNames_sv.java | 440 - generated/sun/util/resources/LocaleNames_th.java | 348 - generated/sun/util/resources/LocaleNames_tr.java | 12 - generated/sun/util/resources/LocaleNames_uk.java | 12 - generated/sun/util/resources/LocaleNames_vi.java | 257 - generated/sun/util/resources/LocaleNames_zh.java | 440 - generated/sun/util/resources/LocaleNames_zh_SG.java | 103 - generated/sun/util/resources/LocaleNames_zh_TW.java | 440 - javac.in | 5 - jce/gnu/classpath/debug/Component.java | 175 + jce/gnu/classpath/debug/PreciseFilter.java | 105 + jce/gnu/classpath/debug/Simple1LineFormatter.java | 161 + jce/gnu/classpath/debug/SystemLogger.java | 102 + jce/gnu/classpath/debug/TeeInputStream.java | 98 + jce/gnu/classpath/debug/TeeOutputStream.java | 93 + jce/gnu/classpath/debug/TeeReader.java | 98 + jce/gnu/classpath/debug/TeeWriter.java | 93 + jce/gnu/java/security/Configuration.java | 56 + jce/gnu/java/security/Engine.java | 280 + jce/gnu/java/security/OID.java | 510 + jce/gnu/java/security/PolicyFile.java | 685 + jce/gnu/java/security/Properties.java | 348 + jce/gnu/java/security/Registry.java | 465 + jce/gnu/java/security/Requires.java | 59 + jce/gnu/java/security/action/GetPropertyAction.java | 89 + jce/gnu/java/security/action/GetSecurityPropertyAction.java | 93 + jce/gnu/java/security/action/SetAccessibleAction.java | 77 + jce/gnu/java/security/der/BitString.java | 330 + jce/gnu/java/security/der/DER.java | 86 + jce/gnu/java/security/der/DEREncodingException.java | 54 + jce/gnu/java/security/der/DERReader.java | 437 + jce/gnu/java/security/der/DERValue.java | 189 + jce/gnu/java/security/der/DERWriter.java | 355 + jce/gnu/java/security/hash/BaseHash.java | 183 + jce/gnu/java/security/hash/HashFactory.java | 135 + jce/gnu/java/security/hash/Haval.java | 807 + jce/gnu/java/security/hash/IMessageDigest.java | 127 + jce/gnu/java/security/hash/MD2.java | 256 + jce/gnu/java/security/hash/MD4.java | 337 + jce/gnu/java/security/hash/MD5.java | 371 + jce/gnu/java/security/hash/RipeMD128.java | 257 + jce/gnu/java/security/hash/RipeMD160.java | 291 + jce/gnu/java/security/hash/Sha160.java | 241 + jce/gnu/java/security/hash/Sha256.java | 252 + jce/gnu/java/security/hash/Sha384.java | 279 + jce/gnu/java/security/hash/Sha512.java | 281 + jce/gnu/java/security/hash/Tiger.java | 864 + jce/gnu/java/security/hash/Whirlpool.java | 606 + jce/gnu/java/security/icedtea/CertBundleKeyStoreImpl.java | 199 + jce/gnu/java/security/icedtea/GNUTlsKeyMaterialGeneratorImpl.java | 201 + jce/gnu/java/security/icedtea/GNUTlsMasterSecretGenerator.java | 122 + jce/gnu/java/security/icedtea/GNUTlsPrfGeneratorImpl.java | 180 + jce/gnu/java/security/icedtea/GNUTlsRsaPreMasterSecretGeneratorImpl.java | 120 + jce/gnu/java/security/icedtea/IcedTls.java | 60 + jce/gnu/java/security/jce/hash/HavalSpi.java | 54 + jce/gnu/java/security/jce/hash/MD2Spi.java | 55 + jce/gnu/java/security/jce/hash/MD4Spi.java | 55 + jce/gnu/java/security/jce/hash/MD5Spi.java | 54 + jce/gnu/java/security/jce/hash/MessageDigestAdapter.java | 133 + jce/gnu/java/security/jce/hash/RipeMD128Spi.java | 54 + jce/gnu/java/security/jce/hash/RipeMD160Spi.java | 54 + jce/gnu/java/security/jce/hash/Sha160Spi.java | 54 + jce/gnu/java/security/jce/hash/Sha256Spi.java | 54 + jce/gnu/java/security/jce/hash/Sha384Spi.java | 54 + jce/gnu/java/security/jce/hash/Sha512Spi.java | 54 + jce/gnu/java/security/jce/hash/TigerSpi.java | 55 + jce/gnu/java/security/jce/hash/WhirlpoolSpi.java | 54 + jce/gnu/java/security/jce/prng/HavalRandomSpi.java | 54 + jce/gnu/java/security/jce/prng/MD2RandomSpi.java | 54 + jce/gnu/java/security/jce/prng/MD4RandomSpi.java | 54 + jce/gnu/java/security/jce/prng/MD5RandomSpi.java | 54 + jce/gnu/java/security/jce/prng/RipeMD128RandomSpi.java | 54 + jce/gnu/java/security/jce/prng/RipeMD160RandomSpi.java | 54 + jce/gnu/java/security/jce/prng/SecureRandomAdapter.java | 107 + jce/gnu/java/security/jce/prng/Sha160RandomSpi.java | 54 + jce/gnu/java/security/jce/prng/Sha256RandomSpi.java | 54 + jce/gnu/java/security/jce/prng/Sha384RandomSpi.java | 54 + jce/gnu/java/security/jce/prng/Sha512RandomSpi.java | 54 + jce/gnu/java/security/jce/prng/TigerRandomSpi.java | 54 + jce/gnu/java/security/jce/prng/WhirlpoolRandomSpi.java | 54 + jce/gnu/java/security/jce/sig/DSSKeyFactory.java | 221 + jce/gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java | 146 + jce/gnu/java/security/jce/sig/DSSParameters.java | 218 + jce/gnu/java/security/jce/sig/DSSParametersGenerator.java | 125 + jce/gnu/java/security/jce/sig/DSSRawSignatureSpi.java | 56 + jce/gnu/java/security/jce/sig/EncodedKeyFactory.java | 430 + jce/gnu/java/security/jce/sig/KeyPairGeneratorAdapter.java | 95 + jce/gnu/java/security/jce/sig/MD2withRSA.java | 56 + jce/gnu/java/security/jce/sig/MD5withRSA.java | 56 + jce/gnu/java/security/jce/sig/RSAKeyFactory.java | 231 + jce/gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.java | 96 + jce/gnu/java/security/jce/sig/RSAPSSRawSignatureSpi.java | 56 + jce/gnu/java/security/jce/sig/SHA160withDSS.java | 54 + jce/gnu/java/security/jce/sig/SHA160withRSA.java | 56 + jce/gnu/java/security/jce/sig/SHA256withRSA.java | 56 + jce/gnu/java/security/jce/sig/SHA384withRSA.java | 56 + jce/gnu/java/security/jce/sig/SHA512withRSA.java | 56 + jce/gnu/java/security/jce/sig/SignatureAdapter.java | 250 + jce/gnu/java/security/key/IKeyPairCodec.java | 124 + jce/gnu/java/security/key/IKeyPairGenerator.java | 73 + jce/gnu/java/security/key/KeyPairCodecFactory.java | 360 + jce/gnu/java/security/key/KeyPairGeneratorFactory.java | 120 + jce/gnu/java/security/key/dss/DSSKey.java | 211 + jce/gnu/java/security/key/dss/DSSKeyPairGenerator.java | 382 + jce/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java | 249 + jce/gnu/java/security/key/dss/DSSKeyPairRawCodec.java | 347 + jce/gnu/java/security/key/dss/DSSKeyPairX509Codec.java | 276 + jce/gnu/java/security/key/dss/DSSPrivateKey.java | 203 + jce/gnu/java/security/key/dss/DSSPublicKey.java | 201 + jce/gnu/java/security/key/dss/FIPS186.java | 262 + jce/gnu/java/security/key/rsa/GnuRSAKey.java | 176 + jce/gnu/java/security/key/rsa/GnuRSAPrivateKey.java | 311 + jce/gnu/java/security/key/rsa/GnuRSAPublicKey.java | 188 + jce/gnu/java/security/key/rsa/RSAKeyPairGenerator.java | 246 + jce/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java | 299 + jce/gnu/java/security/key/rsa/RSAKeyPairRawCodec.java | 300 + jce/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java | 250 + jce/gnu/java/security/prng/BasePRNG.java | 178 + jce/gnu/java/security/prng/EntropySource.java | 61 + jce/gnu/java/security/prng/IRandom.java | 174 + jce/gnu/java/security/prng/LimitReachedException.java | 57 + jce/gnu/java/security/prng/MDGenerator.java | 127 + jce/gnu/java/security/prng/PRNGFactory.java | 92 + jce/gnu/java/security/prng/RandomEvent.java | 81 + jce/gnu/java/security/prng/RandomEventListener.java | 50 + jce/gnu/java/security/provider/CollectionCertStoreImpl.java | 102 + jce/gnu/java/security/provider/DefaultPolicy.java | 68 + jce/gnu/java/security/provider/Gnu.java | 306 + jce/gnu/java/security/provider/PKIXCertPathValidatorImpl.java | 693 + jce/gnu/java/security/provider/X509CertificateFactory.java | 294 + jce/gnu/java/security/provider/package.html | 46 + jce/gnu/java/security/sig/BaseSignature.java | 219 + jce/gnu/java/security/sig/ISignature.java | 160 + jce/gnu/java/security/sig/ISignatureCodec.java | 59 + jce/gnu/java/security/sig/SignatureCodecFactory.java | 226 + jce/gnu/java/security/sig/SignatureFactory.java | 101 + jce/gnu/java/security/sig/dss/DSSSignature.java | 275 + jce/gnu/java/security/sig/dss/DSSSignatureRawCodec.java | 164 + jce/gnu/java/security/sig/dss/DSSSignatureX509Codec.java | 193 + jce/gnu/java/security/sig/rsa/EME_PKCS1_V1_5.java | 274 + jce/gnu/java/security/sig/rsa/EMSA_PKCS1_V1_5.java | 243 + jce/gnu/java/security/sig/rsa/EMSA_PSS.java | 371 + jce/gnu/java/security/sig/rsa/RSA.java | 324 + jce/gnu/java/security/sig/rsa/RSAPKCS1V1_5Signature.java | 224 + jce/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureRawCodec.java | 153 + jce/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureX509Codec.java | 128 + jce/gnu/java/security/sig/rsa/RSAPSSSignature.java | 255 + jce/gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.java | 134 + jce/gnu/java/security/sig/rsa/RSASignatureFactory.java | 176 + jce/gnu/java/security/util/ByteArray.java | 109 + jce/gnu/java/security/util/ByteBufferOutputStream.java | 118 + jce/gnu/java/security/util/DerUtil.java | 64 + jce/gnu/java/security/util/ExpirableObject.java | 150 + jce/gnu/java/security/util/FormatUtil.java | 140 + jce/gnu/java/security/util/IntegerUtil.java | 109 + jce/gnu/java/security/util/PRNG.java | 141 + jce/gnu/java/security/util/Prime.java | 164 + jce/gnu/java/security/util/Sequence.java | 133 + jce/gnu/java/security/util/SimpleList.java | 155 + jce/gnu/java/security/util/Util.java | 627 + jce/gnu/java/security/util/package.html | 46 + jce/gnu/java/security/x509/GnuPKIExtension.java | 59 + jce/gnu/java/security/x509/PolicyNodeImpl.java | 214 + jce/gnu/java/security/x509/Util.java | 202 + jce/gnu/java/security/x509/X500DistinguishedName.java | 556 + jce/gnu/java/security/x509/X509CRL.java | 485 + jce/gnu/java/security/x509/X509CRLEntry.java | 273 + jce/gnu/java/security/x509/X509CRLSelectorImpl.java | 138 + jce/gnu/java/security/x509/X509CertPath.java | 303 + jce/gnu/java/security/x509/X509CertSelectorImpl.java | 197 + jce/gnu/java/security/x509/X509Certificate.java | 757 + jce/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java | 133 + jce/gnu/java/security/x509/ext/BasicConstraints.java | 129 + jce/gnu/java/security/x509/ext/CRLNumber.java | 97 + jce/gnu/java/security/x509/ext/CertificatePolicies.java | 205 + jce/gnu/java/security/x509/ext/ExtendedKeyUsage.java | 95 + jce/gnu/java/security/x509/ext/Extension.java | 297 + jce/gnu/java/security/x509/ext/GeneralName.java | 232 + jce/gnu/java/security/x509/ext/GeneralNames.java | 89 + jce/gnu/java/security/x509/ext/GeneralSubtree.java | 156 + jce/gnu/java/security/x509/ext/IssuerAlternativeNames.java | 77 + jce/gnu/java/security/x509/ext/KeyUsage.java | 92 + jce/gnu/java/security/x509/ext/NameConstraints.java | 161 + jce/gnu/java/security/x509/ext/PolicyConstraint.java | 107 + jce/gnu/java/security/x509/ext/PolicyMappings.java | 104 + jce/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java | 105 + jce/gnu/java/security/x509/ext/ReasonCode.java | 85 + jce/gnu/java/security/x509/ext/SubjectAlternativeNames.java | 77 + jce/gnu/java/security/x509/ext/SubjectKeyIdentifier.java | 84 + jce/gnu/java/security/x509/ext/package.html | 46 + jce/gnu/java/security/x509/package.html | 46 + jce/gnu/javax/crypto/RSACipherImpl.java | 347 + jce/gnu/javax/crypto/assembly/Assembly.java | 272 + jce/gnu/javax/crypto/assembly/Cascade.java | 348 + jce/gnu/javax/crypto/assembly/CascadeStage.java | 93 + jce/gnu/javax/crypto/assembly/CascadeTransformer.java | 123 + jce/gnu/javax/crypto/assembly/DeflateTransformer.java | 177 + jce/gnu/javax/crypto/assembly/Direction.java | 78 + jce/gnu/javax/crypto/assembly/LoopbackTransformer.java | 100 + jce/gnu/javax/crypto/assembly/ModeStage.java | 112 + jce/gnu/javax/crypto/assembly/Operation.java | 73 + jce/gnu/javax/crypto/assembly/PaddingTransformer.java | 164 + jce/gnu/javax/crypto/assembly/Stage.java | 202 + jce/gnu/javax/crypto/assembly/Transformer.java | 421 + jce/gnu/javax/crypto/assembly/TransformerException.java | 138 + jce/gnu/javax/crypto/cipher/Anubis.java | 491 + jce/gnu/javax/crypto/cipher/BaseCipher.java | 247 + jce/gnu/javax/crypto/cipher/Blowfish.java | 611 + jce/gnu/javax/crypto/cipher/Cast5.java | 987 + jce/gnu/javax/crypto/cipher/CipherFactory.java | 129 + jce/gnu/javax/crypto/cipher/DES.java | 652 + jce/gnu/javax/crypto/cipher/IBlockCipher.java | 195 + jce/gnu/javax/crypto/cipher/IBlockCipherSpi.java | 124 + jce/gnu/javax/crypto/cipher/Khazad.java | 449 + jce/gnu/javax/crypto/cipher/NullCipher.java | 108 + jce/gnu/javax/crypto/cipher/Rijndael.java | 704 + jce/gnu/javax/crypto/cipher/Serpent.java | 1781 + jce/gnu/javax/crypto/cipher/Square.java | 425 + jce/gnu/javax/crypto/cipher/TripleDES.java | 257 + jce/gnu/javax/crypto/cipher/Twofish.java | 737 + jce/gnu/javax/crypto/cipher/WeakKeyException.java | 59 + jce/gnu/javax/crypto/jce/DiffieHellmanImpl.java | 218 + jce/gnu/javax/crypto/jce/GnuCrypto.java | 606 + jce/gnu/javax/crypto/jce/GnuSasl.java | 124 + jce/gnu/javax/crypto/jce/PBESecretKeyFactory.java | 83 + jce/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java | 218 + jce/gnu/javax/crypto/jce/cipher/AES128KeyWrapSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/AES192KeyWrapSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/AES256KeyWrapSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.java | 88 + jce/gnu/javax/crypto/jce/cipher/AESSpi.java | 92 + jce/gnu/javax/crypto/jce/cipher/ARCFourSpi.java | 183 + jce/gnu/javax/crypto/jce/cipher/AnubisSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/BlowfishSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/Cast5Spi.java | 54 + jce/gnu/javax/crypto/jce/cipher/CipherAdapter.java | 533 + jce/gnu/javax/crypto/jce/cipher/DESSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.java | 423 + jce/gnu/javax/crypto/jce/cipher/KhazadSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/NullCipherSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/PBE.java | 229 + jce/gnu/javax/crypto/jce/cipher/PBES2.java | 1379 + jce/gnu/javax/crypto/jce/cipher/RijndaelSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/SerpentSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/SquareSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/TripleDESKeyWrapSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/TripleDESSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/TwofishSpi.java | 54 + jce/gnu/javax/crypto/jce/key/AnubisKeyGeneratorImpl.java | 50 + jce/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.java | 47 + jce/gnu/javax/crypto/jce/key/BlowfishKeyGeneratorImpl.java | 50 + jce/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java | 47 + jce/gnu/javax/crypto/jce/key/Cast5KeyGeneratorImpl.java | 50 + jce/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.java | 47 + jce/gnu/javax/crypto/jce/key/DESKeyGeneratorImpl.java | 68 + jce/gnu/javax/crypto/jce/key/DESSecretKeyFactoryImpl.java | 82 + jce/gnu/javax/crypto/jce/key/DESedeSecretKeyFactoryImpl.java | 82 + jce/gnu/javax/crypto/jce/key/KhazadKeyGeneratorImpl.java | 50 + jce/gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.java | 47 + jce/gnu/javax/crypto/jce/key/RijndaelKeyGeneratorImpl.java | 50 + jce/gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.java | 47 + jce/gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.java | 87 + jce/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java | 110 + jce/gnu/javax/crypto/jce/key/SerpentKeyGeneratorImpl.java | 50 + jce/gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.java | 47 + jce/gnu/javax/crypto/jce/key/SquareKeyGeneratorImpl.java | 50 + jce/gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.java | 47 + jce/gnu/javax/crypto/jce/key/TripleDESKeyGeneratorImpl.java | 50 + jce/gnu/javax/crypto/jce/key/TwofishKeyGeneratorImpl.java | 50 + jce/gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.java | 47 + jce/gnu/javax/crypto/jce/keyring/GnuKeyring.java | 507 + jce/gnu/javax/crypto/jce/mac/HMacHavalSpi.java | 54 + jce/gnu/javax/crypto/jce/mac/HMacMD2Spi.java | 54 + jce/gnu/javax/crypto/jce/mac/HMacMD4Spi.java | 54 + jce/gnu/javax/crypto/jce/mac/HMacMD5Spi.java | 54 + jce/gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.java | 54 + jce/gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.java | 54 + jce/gnu/javax/crypto/jce/mac/HMacSHA160Spi.java | 54 + jce/gnu/javax/crypto/jce/mac/HMacSHA256Spi.java | 54 + jce/gnu/javax/crypto/jce/mac/HMacSHA384Spi.java | 54 + jce/gnu/javax/crypto/jce/mac/HMacSHA512Spi.java | 54 + jce/gnu/javax/crypto/jce/mac/HMacTigerSpi.java | 54 + jce/gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.java | 54 + jce/gnu/javax/crypto/jce/mac/MacAdapter.java | 136 + jce/gnu/javax/crypto/jce/mac/OMacAnubisImpl.java | 50 + jce/gnu/javax/crypto/jce/mac/OMacBlowfishImpl.java | 50 + jce/gnu/javax/crypto/jce/mac/OMacCast5Impl.java | 50 + jce/gnu/javax/crypto/jce/mac/OMacDESImpl.java | 50 + jce/gnu/javax/crypto/jce/mac/OMacImpl.java | 140 + jce/gnu/javax/crypto/jce/mac/OMacKhazadImpl.java | 50 + jce/gnu/javax/crypto/jce/mac/OMacRijndaelImpl.java | 50 + jce/gnu/javax/crypto/jce/mac/OMacSerpentImpl.java | 50 + jce/gnu/javax/crypto/jce/mac/OMacSquareImpl.java | 50 + jce/gnu/javax/crypto/jce/mac/OMacTripleDESImpl.java | 50 + jce/gnu/javax/crypto/jce/mac/OMacTwofishImpl.java | 50 + jce/gnu/javax/crypto/jce/mac/TMMH16Spi.java | 81 + jce/gnu/javax/crypto/jce/mac/UHash32Spi.java | 54 + jce/gnu/javax/crypto/jce/mac/UMac32Spi.java | 79 + jce/gnu/javax/crypto/jce/params/BlockCipherParameters.java | 149 + jce/gnu/javax/crypto/jce/params/DEREncodingException.java | 54 + jce/gnu/javax/crypto/jce/params/DERReader.java | 139 + jce/gnu/javax/crypto/jce/params/DERWriter.java | 143 + jce/gnu/javax/crypto/jce/prng/ARCFourRandomSpi.java | 101 + jce/gnu/javax/crypto/jce/prng/CSPRNGSpi.java | 96 + jce/gnu/javax/crypto/jce/prng/FortunaImpl.java | 87 + jce/gnu/javax/crypto/jce/prng/ICMRandomSpi.java | 217 + jce/gnu/javax/crypto/jce/prng/UMacRandomSpi.java | 168 + jce/gnu/javax/crypto/jce/sig/DHKeyFactory.java | 219 + jce/gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java | 93 + jce/gnu/javax/crypto/jce/sig/DHParameters.java | 220 + jce/gnu/javax/crypto/jce/sig/DHParametersGenerator.java | 152 + jce/gnu/javax/crypto/jce/spec/BlockCipherParameterSpec.java | 122 + jce/gnu/javax/crypto/jce/spec/TMMHParameterSpec.java | 117 + jce/gnu/javax/crypto/jce/spec/UMac32ParameterSpec.java | 73 + jce/gnu/javax/crypto/key/BaseKeyAgreementParty.java | 168 + jce/gnu/javax/crypto/key/GnuPBEKey.java | 96 + jce/gnu/javax/crypto/key/GnuSecretKey.java | 131 + jce/gnu/javax/crypto/key/IKeyAgreementParty.java | 100 + jce/gnu/javax/crypto/key/IncomingMessage.java | 318 + jce/gnu/javax/crypto/key/KeyAgreementException.java | 166 + jce/gnu/javax/crypto/key/KeyAgreementFactory.java | 143 + jce/gnu/javax/crypto/key/OutgoingMessage.java | 234 + jce/gnu/javax/crypto/key/dh/DHKeyPairPKCS8Codec.java | 240 + jce/gnu/javax/crypto/key/dh/DHKeyPairRawCodec.java | 336 + jce/gnu/javax/crypto/key/dh/DHKeyPairX509Codec.java | 255 + jce/gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.java | 119 + jce/gnu/javax/crypto/key/dh/DiffieHellmanReceiver.java | 117 + jce/gnu/javax/crypto/key/dh/DiffieHellmanSender.java | 126 + jce/gnu/javax/crypto/key/dh/ElGamalKeyAgreement.java | 115 + jce/gnu/javax/crypto/key/dh/ElGamalReceiver.java | 99 + jce/gnu/javax/crypto/key/dh/ElGamalSender.java | 112 + jce/gnu/javax/crypto/key/dh/GnuDHKey.java | 174 + jce/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java | 235 + jce/gnu/javax/crypto/key/dh/GnuDHPrivateKey.java | 200 + jce/gnu/javax/crypto/key/dh/GnuDHPublicKey.java | 196 + jce/gnu/javax/crypto/key/dh/RFC2631.java | 217 + jce/gnu/javax/crypto/key/srp6/SRP6Host.java | 161 + jce/gnu/javax/crypto/key/srp6/SRP6KeyAgreement.java | 141 + jce/gnu/javax/crypto/key/srp6/SRP6SaslClient.java | 90 + jce/gnu/javax/crypto/key/srp6/SRP6SaslServer.java | 90 + jce/gnu/javax/crypto/key/srp6/SRP6TLSClient.java | 155 + jce/gnu/javax/crypto/key/srp6/SRP6TLSServer.java | 177 + jce/gnu/javax/crypto/key/srp6/SRP6User.java | 163 + jce/gnu/javax/crypto/key/srp6/SRPAlgorithm.java | 131 + jce/gnu/javax/crypto/key/srp6/SRPKey.java | 147 + jce/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java | 282 + jce/gnu/javax/crypto/key/srp6/SRPKeyPairRawCodec.java | 334 + jce/gnu/javax/crypto/key/srp6/SRPPrivateKey.java | 227 + jce/gnu/javax/crypto/key/srp6/SRPPublicKey.java | 175 + jce/gnu/javax/crypto/keyring/AuthenticatedEntry.java | 176 + jce/gnu/javax/crypto/keyring/BaseKeyring.java | 158 + jce/gnu/javax/crypto/keyring/BinaryDataEntry.java | 111 + jce/gnu/javax/crypto/keyring/CertPathEntry.java | 112 + jce/gnu/javax/crypto/keyring/CertificateEntry.java | 128 + jce/gnu/javax/crypto/keyring/CompressedEntry.java | 93 + jce/gnu/javax/crypto/keyring/EncryptedEntry.java | 191 + jce/gnu/javax/crypto/keyring/Entry.java | 179 + jce/gnu/javax/crypto/keyring/EnvelopeEntry.java | 439 + jce/gnu/javax/crypto/keyring/GnuPrivateKeyring.java | 368 + jce/gnu/javax/crypto/keyring/GnuPublicKeyring.java | 151 + jce/gnu/javax/crypto/keyring/IKeyring.java | 162 + jce/gnu/javax/crypto/keyring/IPrivateKeyring.java | 144 + jce/gnu/javax/crypto/keyring/IPublicKeyring.java | 82 + jce/gnu/javax/crypto/keyring/MalformedKeyringException.java | 55 + jce/gnu/javax/crypto/keyring/MaskableEnvelopeEntry.java | 135 + jce/gnu/javax/crypto/keyring/MeteredInputStream.java | 127 + jce/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java | 286 + jce/gnu/javax/crypto/keyring/PasswordEncryptedEntry.java | 293 + jce/gnu/javax/crypto/keyring/PasswordProtectedEntry.java | 57 + jce/gnu/javax/crypto/keyring/PrimitiveEntry.java | 112 + jce/gnu/javax/crypto/keyring/PrivateKeyEntry.java | 194 + jce/gnu/javax/crypto/keyring/Properties.java | 203 + jce/gnu/javax/crypto/keyring/PublicKeyEntry.java | 162 + jce/gnu/javax/crypto/kwa/AESKeyWrap.java | 168 + jce/gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.java | 145 + jce/gnu/javax/crypto/kwa/IKeyWrappingAlgorithm.java | 160 + jce/gnu/javax/crypto/kwa/KeyUnwrappingException.java | 67 + jce/gnu/javax/crypto/kwa/KeyWrappingAlgorithmFactory.java | 110 + jce/gnu/javax/crypto/kwa/TripleDESKeyWrap.java | 292 + jce/gnu/javax/crypto/mac/BaseMac.java | 127 + jce/gnu/javax/crypto/mac/HMac.java | 263 + jce/gnu/javax/crypto/mac/HMacFactory.java | 111 + jce/gnu/javax/crypto/mac/IMac.java | 181 + jce/gnu/javax/crypto/mac/MacFactory.java | 130 + jce/gnu/javax/crypto/mac/MacInputStream.java | 124 + jce/gnu/javax/crypto/mac/MacOutputStream.java | 123 + jce/gnu/javax/crypto/mac/OMAC.java | 303 + jce/gnu/javax/crypto/mac/TMMH16.java | 339 + jce/gnu/javax/crypto/mac/UHash32.java | 758 + jce/gnu/javax/crypto/mac/UMac32.java | 418 + jce/gnu/javax/crypto/mode/BaseMode.java | 293 + jce/gnu/javax/crypto/mode/CBC.java | 123 + jce/gnu/javax/crypto/mode/CFB.java | 155 + jce/gnu/javax/crypto/mode/CTR.java | 168 + jce/gnu/javax/crypto/mode/EAX.java | 289 + jce/gnu/javax/crypto/mode/ECB.java | 121 + jce/gnu/javax/crypto/mode/IAuthenticatedMode.java | 56 + jce/gnu/javax/crypto/mode/ICM.java | 181 + jce/gnu/javax/crypto/mode/IMode.java | 123 + jce/gnu/javax/crypto/mode/ModeFactory.java | 151 + jce/gnu/javax/crypto/mode/OFB.java | 174 + jce/gnu/javax/crypto/pad/BasePad.java | 191 + jce/gnu/javax/crypto/pad/IPad.java | 127 + jce/gnu/javax/crypto/pad/ISO10126.java | 109 + jce/gnu/javax/crypto/pad/PKCS1_V1_5.java | 156 + jce/gnu/javax/crypto/pad/PKCS7.java | 111 + jce/gnu/javax/crypto/pad/PadFactory.java | 120 + jce/gnu/javax/crypto/pad/SSL3.java | 90 + jce/gnu/javax/crypto/pad/TBC.java | 118 + jce/gnu/javax/crypto/pad/TLS1.java | 91 + jce/gnu/javax/crypto/pad/WrongPaddingException.java | 48 + jce/gnu/javax/crypto/prng/ARCFour.java | 137 + jce/gnu/javax/crypto/prng/CSPRNG.java | 985 + jce/gnu/javax/crypto/prng/Fortuna.java | 349 + jce/gnu/javax/crypto/prng/ICMGenerator.java | 297 + jce/gnu/javax/crypto/prng/IPBE.java | 81 + jce/gnu/javax/crypto/prng/PBKDF2.java | 184 + jce/gnu/javax/crypto/prng/PRNGFactory.java | 115 + jce/gnu/javax/crypto/prng/UMacGenerator.java | 186 + jce/gnu/javax/crypto/sasl/AuthInfo.java | 129 + jce/gnu/javax/crypto/sasl/AuthInfoProviderFactory.java | 67 + jce/gnu/javax/crypto/sasl/ClientFactory.java | 168 + jce/gnu/javax/crypto/sasl/ClientMechanism.java | 293 + jce/gnu/javax/crypto/sasl/ConfidentialityException.java | 82 + jce/gnu/javax/crypto/sasl/IAuthInfoProvider.java | 116 + jce/gnu/javax/crypto/sasl/IAuthInfoProviderFactory.java | 55 + jce/gnu/javax/crypto/sasl/IllegalMechanismStateException.java | 84 + jce/gnu/javax/crypto/sasl/InputBuffer.java | 272 + jce/gnu/javax/crypto/sasl/IntegrityException.java | 83 + jce/gnu/javax/crypto/sasl/NoSuchMechanismException.java | 62 + jce/gnu/javax/crypto/sasl/NoSuchUserException.java | 67 + jce/gnu/javax/crypto/sasl/OutputBuffer.java | 198 + jce/gnu/javax/crypto/sasl/SaslEncodingException.java | 66 + jce/gnu/javax/crypto/sasl/SaslInputStream.java | 393 + jce/gnu/javax/crypto/sasl/SaslOutputStream.java | 175 + jce/gnu/javax/crypto/sasl/SaslUtil.java | 75 + jce/gnu/javax/crypto/sasl/ServerFactory.java | 158 + jce/gnu/javax/crypto/sasl/ServerMechanism.java | 294 + jce/gnu/javax/crypto/sasl/UserAlreadyExistsException.java | 70 + jce/gnu/javax/crypto/sasl/anonymous/AnonymousClient.java | 102 + jce/gnu/javax/crypto/sasl/anonymous/AnonymousServer.java | 90 + jce/gnu/javax/crypto/sasl/anonymous/AnonymousUtil.java | 83 + jce/gnu/javax/crypto/sasl/crammd5/CramMD5AuthInfoProvider.java | 166 + jce/gnu/javax/crypto/sasl/crammd5/CramMD5Client.java | 168 + jce/gnu/javax/crypto/sasl/crammd5/CramMD5Registry.java | 60 + jce/gnu/javax/crypto/sasl/crammd5/CramMD5Server.java | 158 + jce/gnu/javax/crypto/sasl/crammd5/CramMD5Util.java | 120 + jce/gnu/javax/crypto/sasl/crammd5/PasswordFile.java | 238 + jce/gnu/javax/crypto/sasl/plain/PasswordFile.java | 243 + jce/gnu/javax/crypto/sasl/plain/PlainAuthInfoProvider.java | 166 + jce/gnu/javax/crypto/sasl/plain/PlainClient.java | 154 + jce/gnu/javax/crypto/sasl/plain/PlainRegistry.java | 57 + jce/gnu/javax/crypto/sasl/plain/PlainServer.java | 155 + jce/gnu/javax/crypto/sasl/srp/CALG.java | 221 + jce/gnu/javax/crypto/sasl/srp/ClientStore.java | 155 + jce/gnu/javax/crypto/sasl/srp/IALG.java | 128 + jce/gnu/javax/crypto/sasl/srp/KDF.java | 140 + jce/gnu/javax/crypto/sasl/srp/PasswordFile.java | 625 + jce/gnu/javax/crypto/sasl/srp/SRP.java | 255 + jce/gnu/javax/crypto/sasl/srp/SRPAuthInfoProvider.java | 177 + jce/gnu/javax/crypto/sasl/srp/SRPClient.java | 952 + jce/gnu/javax/crypto/sasl/srp/SRPRegistry.java | 165 + jce/gnu/javax/crypto/sasl/srp/SRPServer.java | 840 + jce/gnu/javax/crypto/sasl/srp/SecurityContext.java | 140 + jce/gnu/javax/crypto/sasl/srp/ServerStore.java | 175 + jce/gnu/javax/crypto/sasl/srp/StoreEntry.java | 75 + jce/gnu/javax/security/auth/Password.java | 285 + jce/gnu/javax/security/auth/callback/AbstractCallbackHandler.java | 295 + jce/gnu/javax/security/auth/callback/CertificateCallback.java | 64 + jce/gnu/javax/security/auth/callback/ConsoleCallbackHandler.java | 299 + jce/gnu/javax/security/auth/callback/DefaultCallbackHandler.java | 109 + jce/gnu/javax/security/auth/callback/GnuCallbacks.java | 65 + jce/gnu/javax/security/auth/login/ConfigFileParser.java | 346 + jce/gnu/javax/security/auth/login/ConfigFileTokenizer.java | 244 + jce/gnu/javax/security/auth/login/GnuConfiguration.java | 466 + jce/javax/crypto/BadPaddingException.java | 79 + jce/javax/crypto/Cipher.java | 1154 + jce/javax/crypto/CipherInputStream.java | 368 + jce/javax/crypto/CipherOutputStream.java | 154 + jce/javax/crypto/CipherSpi.java | 445 + jce/javax/crypto/EncryptedPrivateKeyInfo.java | 317 + jce/javax/crypto/ExemptionMechanism.java | 274 + jce/javax/crypto/ExemptionMechanismException.java | 78 + jce/javax/crypto/ExemptionMechanismSpi.java | 149 + jce/javax/crypto/IllegalBlockSizeException.java | 71 + jce/javax/crypto/KeyAgreement.java | 378 + jce/javax/crypto/KeyAgreementSpi.java | 160 + jce/javax/crypto/KeyGenerator.java | 298 + jce/javax/crypto/KeyGeneratorSpi.java | 112 + jce/javax/crypto/Mac.java | 434 + jce/javax/crypto/MacSpi.java | 163 + jce/javax/crypto/NoSuchPaddingException.java | 71 + jce/javax/crypto/NullCipher.java | 62 + jce/javax/crypto/NullCipherImpl.java | 127 + jce/javax/crypto/SealedObject.java | 355 + jce/javax/crypto/SecretKey.java | 65 + jce/javax/crypto/SecretKeyFactory.java | 255 + jce/javax/crypto/SecretKeyFactorySpi.java | 108 + jce/javax/crypto/ShortBufferException.java | 70 + jce/javax/crypto/interfaces/DHKey.java | 61 + jce/javax/crypto/interfaces/DHPrivateKey.java | 69 + jce/javax/crypto/interfaces/DHPublicKey.java | 68 + jce/javax/crypto/interfaces/PBEKey.java | 90 + jce/javax/crypto/spec/DESKeySpec.java | 220 + jce/javax/crypto/spec/DESedeKeySpec.java | 151 + jce/javax/crypto/spec/DHGenParameterSpec.java | 100 + jce/javax/crypto/spec/DHParameterSpec.java | 135 + jce/javax/crypto/spec/DHPrivateKeySpec.java | 115 + jce/javax/crypto/spec/DHPublicKeySpec.java | 115 + jce/javax/crypto/spec/IvParameterSpec.java | 96 + jce/javax/crypto/spec/OAEPParameterSpec.java | 78 + jce/javax/crypto/spec/PBEKeySpec.java | 292 + jce/javax/crypto/spec/PBEParameterSpec.java | 100 + jce/javax/crypto/spec/PSource.java | 69 + jce/javax/crypto/spec/RC2ParameterSpec.java | 166 + jce/javax/crypto/spec/RC5ParameterSpec.java | 202 + jce/javax/crypto/spec/SecretKeySpec.java | 163 + jce/sun/security/internal/interfaces/TlsMasterSecret.java | 44 + jce/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java | 78 + jce/sun/security/internal/spec/TlsKeyMaterialSpec.java | 118 + jce/sun/security/internal/spec/TlsMasterSecretParameterSpec.java | 60 + jce/sun/security/internal/spec/TlsPrfParameterSpec.java | 58 + jce/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java | 69 + patches/icedtea-ant.patch | 106 - patches/icedtea-antialias.patch | 60 + patches/icedtea-assembler_amd64.patch | 16 + patches/icedtea-bytebuffer-compact.patch | 82 - patches/icedtea-bytecodeInterpreter.patch | 36 - patches/icedtea-bytecodeInterpreterWithChecks.patch | 18 - patches/icedtea-cacao-Compiler-gcc-gmk.patch | 46 + patches/icedtea-cacao-Defs-linux-gmk.patch | 13 + patches/icedtea-cacao-Platform-gmk.patch | 32 + patches/icedtea-cacao-Program-gmk.patch | 13 + patches/icedtea-cacao-docs-Makefile.patch | 30 + patches/icedtea-cacao-instrument-Makefile.patch | 13 + patches/icedtea-cacao-java-c.patch | 14 + patches/icedtea-cacao-jvm-cfg.patch | 87 + patches/icedtea-cacao.patch | 13 - patches/icedtea-certbundle.patch | 221 +- patches/icedtea-copy-plugs.patch | 142 +- patches/icedtea-corba.patch | 14 - patches/icedtea-core-build.patch | 334 - patches/icedtea-debuginfo.patch | 66 +- patches/icedtea-demos.patch | 32 +- patches/icedtea-ecj-bootstrap.patch | 366 + patches/icedtea-ecj.patch | 1025 - patches/icedtea-float-double-trailing-zeros.patch | 29 - patches/icedtea-gcc-4.3.patch | 84 - patches/icedtea-gcc-suffix.patch | 72 - patches/icedtea-generated.patch | 10 - patches/icedtea-graphics.patch | 187 +- patches/icedtea-gtkplaf.patch | 23 - patches/icedtea-headers.patch | 50 - patches/icedtea-hotspot-6b06-7b24.patch | 201186 ---------- patches/icedtea-hotspot7-build-fixes.patch | 64 - patches/icedtea-java.security.patch | 30 + patches/icedtea-javafiles.patch | 157 - patches/icedtea-lcms-leak.patch | 11 - patches/icedtea-lesstif-64.patch | 29 - patches/icedtea-lesstif_amd64.patch | 29 + patches/icedtea-lib64.patch | 15 - patches/icedtea-libpng.patch | 11 + patches/icedtea-libraries.patch | 25548 - patches/icedtea-license-headers.patch | 239 +- patches/icedtea-linker-options.patch | 48 - patches/icedtea-memory-limits.patch | 21 - patches/icedtea-netx-plugin.patch | 49 - patches/icedtea-paths.patch | 624 + patches/icedtea-plugin.patch | 1280 + patches/icedtea-ports.patch | 243 - patches/icedtea-print-lsb-release.patch | 48 - patches/icedtea-rmi_amd64.patch | 4 +- patches/icedtea-signature-iterator.patch | 44 - patches/icedtea-signed-types.patch | 24 - patches/icedtea-speed.patch | 40 +- patches/icedtea-ssl.patch | 61 +- patches/icedtea-static-libstdc++.patch | 33 - patches/icedtea-sunsrc.patch | 67 - patches/icedtea-test-atomic-operations.patch | 25 - patches/icedtea-text-relocations.patch | 2 +- patches/icedtea-timerqueue.patch | 18 - patches/icedtea-tools.patch | 32 +- patches/icedtea-use-system-tzdata.patch | 59 - patches/icedtea-version.patch | 74 +- patches/icedtea-webservices.patch | 1373 - patches/icedtea-zero-build.patch | 132 - patches/icedtea-zero.patch | 135 - platform_zero.in | 17 - ports/hotspot/build/linux/makefiles/zero.make | 41 - ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp | 87 - ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp | 70 - ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp | 55 - ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp | 157 - ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp | 278 - ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp | 32 - ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp | 25 - ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp | 307 - ports/hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp | 27 - ports/hotspot/src/cpu/zero/vm/copy_zero.hpp | 166 - ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 752 - ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp | 37 - ports/hotspot/src/cpu/zero/vm/debug_zero.cpp | 32 - ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp | 44 - ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp | 38 - ports/hotspot/src/cpu/zero/vm/dump_zero.cpp | 37 - ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp | 62 - ports/hotspot/src/cpu/zero/vm/frame_zero.cpp | 118 - ports/hotspot/src/cpu/zero/vm/frame_zero.hpp | 51 - ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp | 154 - ports/hotspot/src/cpu/zero/vm/globals_zero.hpp | 54 - ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp | 52 - ports/hotspot/src/cpu/zero/vm/icache_zero.cpp | 36 - ports/hotspot/src/cpu/zero/vm/icache_zero.hpp | 33 - ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp | 31 - ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp | 68 - ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp | 37 - ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 170 - ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp | 144 - ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp | 63 - ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp | 59 - ports/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp | 78 - ports/hotspot/src/cpu/zero/vm/javaStack_zero.hpp | 159 - ports/hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp | 67 - ports/hotspot/src/cpu/zero/vm/jniTypes_zero.hpp | 108 - ports/hotspot/src/cpu/zero/vm/jni_zero.h | 32 - ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp | 222 - ports/hotspot/src/cpu/zero/vm/registerMap_zero.hpp | 39 - ports/hotspot/src/cpu/zero/vm/register_zero.cpp | 39 - ports/hotspot/src/cpu/zero/vm/register_zero.hpp | 114 - ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp | 68 - ports/hotspot/src/cpu/zero/vm/relocInfo_zero.hpp | 33 - ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp | 116 - ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp | 169 - ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp | 254 - ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp | 31 - ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp | 50 - ports/hotspot/src/cpu/zero/vm/vmStructs_zero.hpp | 52 - ports/hotspot/src/cpu/zero/vm/vm_version_zero.hpp | 32 - ports/hotspot/src/cpu/zero/vm/vmreg_zero.cpp | 67 - ports/hotspot/src/cpu/zero/vm/vmreg_zero.hpp | 29 - ports/hotspot/src/cpu/zero/vm/vmreg_zero.inline.hpp | 32 - ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp | 47 - ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp | 160 - ports/hotspot/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp | 43 - ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp | 43 - ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp | 101 - ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 372 - ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp | 31 - ports/hotspot/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp | 32 - ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp | 42 - ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp | 32 - ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 100 - ports/hotspot/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp | 45 - ports/jdk/src/solaris/bin/alpha/jvm.cfg | 45 - ports/jdk/src/solaris/bin/arm/jvm.cfg | 45 - ports/jdk/src/solaris/bin/ergo_alpha.c | 58 - ports/jdk/src/solaris/bin/ergo_arm.c | 58 - ports/jdk/src/solaris/bin/ergo_ia64.c | 58 - ports/jdk/src/solaris/bin/ergo_mips.c | 58 - ports/jdk/src/solaris/bin/ergo_ppc.c | 58 - ports/jdk/src/solaris/bin/ergo_s390.c | 58 - ports/jdk/src/solaris/bin/mips/jvm.cfg | 45 - ports/jdk/src/solaris/bin/ppc/jvm.cfg | 45 - ports/jdk/src/solaris/bin/ppc64/jvm.cfg | 45 - ports/jdk/src/solaris/bin/s390/jvm.cfg | 45 - ports/jdk/src/solaris/bin/s390x/jvm.cfg | 45 - rt/com/sun/media/sound/AutoConnectSequencer.java | 50 + rt/com/sun/media/sound/DataPusher.java | 62 + rt/com/sun/media/sound/DirectAudioDevice.java | 45 + rt/com/sun/media/sound/DirectAudioDeviceProvider.java | 45 + rt/com/sun/media/sound/JDK13Services.java | 62 + rt/com/sun/media/sound/JavaSoundAudioClip.java | 68 + rt/com/sun/media/sound/MidiInDevice.java | 45 + rt/com/sun/media/sound/MidiInDeviceProvider.java | 45 + rt/com/sun/media/sound/MidiOutDevice.java | 44 + rt/com/sun/media/sound/MidiOutDeviceProvider.java | 45 + rt/com/sun/media/sound/MidiUtils.java | 59 + rt/com/sun/media/sound/MixerSequencer.java | 188 - rt/com/sun/media/sound/MixerSynth.java | 10 - rt/com/sun/media/sound/Platform.java | 45 + rt/com/sun/media/sound/PortMixer.java | 45 + rt/com/sun/media/sound/PortMixerProvider.java | 45 + rt/com/sun/media/sound/ReferenceCountingDevice.java | 57 + rt/com/sun/media/sound/Toolkit.java | 50 + rt/com/sun/script/javascript/ClassShutter.java | 43 + rt/com/sun/script/javascript/Context.java | 170 + rt/com/sun/script/javascript/ContextFactory.java | 60 + rt/com/sun/script/javascript/Function.java | 48 + rt/com/sun/script/javascript/ImporterTopLevel.java | 131 + rt/com/sun/script/javascript/JavaScriptException.java | 54 + rt/com/sun/script/javascript/LazilyLoadedCtor.java | 47 + rt/com/sun/script/javascript/NativeArray.java | 54 + rt/com/sun/script/javascript/NativeJavaClass.java | 44 + rt/com/sun/script/javascript/NativeJavaObject.java | 127 + rt/com/sun/script/javascript/RhinoException.java | 59 + rt/com/sun/script/javascript/Script.java | 48 + rt/com/sun/script/javascript/ScriptRuntime.java | 54 + rt/com/sun/script/javascript/Scriptable.java | 70 + rt/com/sun/script/javascript/ScriptableObject.java | 107 + rt/com/sun/script/javascript/Undefined.java | 42 + rt/com/sun/script/javascript/WrapFactory.java | 48 + rt/gnu/java/awt/BitMaskExtent.java | 79 + rt/gnu/java/awt/Buffers.java | 225 + rt/gnu/java/awt/CubicSegment.java | 184 + rt/gnu/java/awt/LineSegment.java | 118 + rt/gnu/java/awt/QuadSegment.java | 264 + rt/gnu/java/awt/Segment.java | 158 + rt/gnu/java/awt/color/CieXyzConverter.java | 73 + rt/gnu/java/awt/color/ClutProfileConverter.java | 152 + rt/gnu/java/awt/color/ColorLookUpTable.java | 429 + rt/gnu/java/awt/color/ColorSpaceConverter.java | 69 + rt/gnu/java/awt/color/GrayProfileConverter.java | 137 + rt/gnu/java/awt/color/GrayScaleConverter.java | 110 + rt/gnu/java/awt/color/LinearRGBConverter.java | 152 + rt/gnu/java/awt/color/ProfileHeader.java | 398 + rt/gnu/java/awt/color/PyccConverter.java | 72 + rt/gnu/java/awt/color/RgbProfileConverter.java | 244 + rt/gnu/java/awt/color/SrgbConverter.java | 152 + rt/gnu/java/awt/color/TagEntry.java | 121 + rt/gnu/java/awt/color/ToneReproductionCurve.java | 177 + rt/gnu/java/io/Base64InputStream.java | 220 + rt/gnu/java/security/provider/Gnu.java | 306 + rt/java/awt/color/CMMException.java | 63 + rt/java/awt/color/ColorSpace.java | 190 + rt/java/awt/color/ICC_ColorSpace.java | 314 + rt/java/awt/color/ICC_Profile.java | 1284 + rt/java/awt/color/ICC_ProfileGray.java | 133 + rt/java/awt/color/ICC_ProfileRGB.java | 227 + rt/java/awt/image/BandedSampleModel.java | 758 + rt/java/awt/image/ColorConvertOp.java | 537 + rt/java/awt/image/ComponentSampleModel.java | 762 + rt/java/awt/image/DataBuffer.java | 473 + rt/java/awt/image/DataBufferByte.java | 245 + rt/java/awt/image/DataBufferInt.java | 244 + rt/java/awt/image/DataBufferShort.java | 245 + rt/java/awt/image/DataBufferUShort.java | 246 + rt/java/awt/image/MultiPixelPackedSampleModel.java | 602 + rt/java/awt/image/Raster.java | 1152 + rt/java/awt/image/RenderedImage.java | 70 + rt/java/awt/image/SampleModel.java | 981 + rt/java/awt/image/SinglePixelPackedSampleModel.java | 597 + rt/java/awt/image/WritableRaster.java | 436 + rt/java/awt/image/WritableRenderedImage.java | 56 + rt/java/awt/image/renderable/ContextualRenderedImageFactory.java | 56 + rt/java/awt/image/renderable/RenderContext.java | 141 + rt/java/awt/image/renderable/RenderableImage.java | 62 + rt/java/awt/image/renderable/RenderableImageOp.java | 157 + rt/java/awt/image/renderable/RenderableImageProducer.java | 166 + rt/java/awt/image/renderable/RenderedImageFactory.java | 47 + rt/javax/jnlp/BasicService.java | 13 - rt/javax/jnlp/ClipboardService.java | 11 - rt/javax/jnlp/DownloadService.java | 25 - rt/javax/jnlp/DownloadServiceListener.java | 13 - rt/javax/jnlp/ExtensionInstallerService.java | 22 - rt/javax/jnlp/FileContents.java | 18 - rt/javax/jnlp/FileOpenService.java | 11 - rt/javax/jnlp/FileSaveService.java | 11 - rt/javax/jnlp/JNLPRandomAccessFile.java | 46 - rt/javax/jnlp/PersistenceService.java | 18 - rt/javax/jnlp/PrintService.java | 13 - rt/javax/jnlp/ServiceManager.java | 54 - rt/javax/jnlp/ServiceManagerStub.java | 11 - rt/javax/jnlp/UnavailableServiceException.java | 16 - rt/javax/script/Synchronizer.java | 49 + rt/net/sourceforge/jnlp/AppletDesc.java | 125 - rt/net/sourceforge/jnlp/ApplicationDesc.java | 76 - rt/net/sourceforge/jnlp/ComponentDesc.java | 43 - rt/net/sourceforge/jnlp/DefaultLaunchHandler.java | 116 - rt/net/sourceforge/jnlp/ExtensionDesc.java | 146 - rt/net/sourceforge/jnlp/IconDesc.java | 135 - rt/net/sourceforge/jnlp/InformationDesc.java | 241 - rt/net/sourceforge/jnlp/InstallerDesc.java | 54 - rt/net/sourceforge/jnlp/JARDesc.java | 131 - rt/net/sourceforge/jnlp/JNLPFile.java | 512 - rt/net/sourceforge/jnlp/JREDesc.java | 123 - rt/net/sourceforge/jnlp/LaunchException.java | 190 - rt/net/sourceforge/jnlp/LaunchHandler.java | 68 - rt/net/sourceforge/jnlp/Launcher.java | 583 - rt/net/sourceforge/jnlp/NetxPanel.java | 159 - rt/net/sourceforge/jnlp/PackageDesc.java | 105 - rt/net/sourceforge/jnlp/ParseException.java | 94 - rt/net/sourceforge/jnlp/Parser.java | 1101 - rt/net/sourceforge/jnlp/PluginBridge.java | 188 - rt/net/sourceforge/jnlp/PropertyDesc.java | 66 - rt/net/sourceforge/jnlp/ResourcesDesc.java | 231 - rt/net/sourceforge/jnlp/SecurityDesc.java | 173 - rt/net/sourceforge/jnlp/Version.java | 354 - rt/net/sourceforge/jnlp/cache/CacheEntry.java | 174 - rt/net/sourceforge/jnlp/cache/CacheUtil.java | 391 - rt/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java | 318 - rt/net/sourceforge/jnlp/cache/DownloadIndicator.java | 92 - rt/net/sourceforge/jnlp/cache/Resource.java | 259 - rt/net/sourceforge/jnlp/cache/ResourceTracker.java | 926 - rt/net/sourceforge/jnlp/cache/UpdatePolicy.java | 89 - rt/net/sourceforge/jnlp/cache/package.html | 28 - rt/net/sourceforge/jnlp/event/ApplicationEvent.java | 57 - rt/net/sourceforge/jnlp/event/ApplicationListener.java | 38 - rt/net/sourceforge/jnlp/event/DownloadEvent.java | 72 - rt/net/sourceforge/jnlp/event/DownloadListener.java | 51 - rt/net/sourceforge/jnlp/event/package.html | 28 - rt/net/sourceforge/jnlp/package.html | 30 - rt/net/sourceforge/jnlp/resources/Manifest.mf | 6 - rt/net/sourceforge/jnlp/resources/Messages.properties | 159 - rt/net/sourceforge/jnlp/resources/about.jnlp | 20 - rt/net/sourceforge/jnlp/resources/default.jnlp | 20 - rt/net/sourceforge/jnlp/resources/install.png | Bin rt/net/sourceforge/jnlp/resources/netx-icon.png | Bin rt/net/sourceforge/jnlp/runtime/AppThreadGroup.java | 68 - rt/net/sourceforge/jnlp/runtime/AppletAudioClip.java | 109 - rt/net/sourceforge/jnlp/runtime/AppletEnvironment.java | 343 - rt/net/sourceforge/jnlp/runtime/AppletInstance.java | 139 - rt/net/sourceforge/jnlp/runtime/ApplicationInstance.java | 248 - rt/net/sourceforge/jnlp/runtime/Boot.java | 415 - rt/net/sourceforge/jnlp/runtime/Boot13.java | 103 - rt/net/sourceforge/jnlp/runtime/InstallDialog.java | 169 - rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 781 - rt/net/sourceforge/jnlp/runtime/JNLPPolicy.java | 89 - rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 469 - rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 349 - rt/net/sourceforge/jnlp/runtime/package.html | 29 - rt/net/sourceforge/jnlp/security/AccessWarningPane.java | 199 - rt/net/sourceforge/jnlp/security/AppletWarningPane.java | 120 - rt/net/sourceforge/jnlp/security/CertWarningPane.java | 263 - rt/net/sourceforge/jnlp/security/CertsInfoPane.java | 357 - rt/net/sourceforge/jnlp/security/MoreInfoPane.java | 110 - rt/net/sourceforge/jnlp/security/SecurityDialogUI.java | 197 - rt/net/sourceforge/jnlp/security/SecurityUtil.java | 200 - rt/net/sourceforge/jnlp/security/SecurityWarningDialog.java | 389 - rt/net/sourceforge/jnlp/security/SingleCertInfoPane.java | 77 - rt/net/sourceforge/jnlp/security/viewer/CertificatePane.java | 358 - rt/net/sourceforge/jnlp/security/viewer/CertificateViewer.java | 148 - rt/net/sourceforge/jnlp/services/ServiceUtil.java | 200 - rt/net/sourceforge/jnlp/services/XBasicService.java | 174 - rt/net/sourceforge/jnlp/services/XClipboardService.java | 81 - rt/net/sourceforge/jnlp/services/XDownloadService.java | 181 - rt/net/sourceforge/jnlp/services/XExtensionInstallerService.java | 123 - rt/net/sourceforge/jnlp/services/XFileContents.java | 122 - rt/net/sourceforge/jnlp/services/XFileOpenService.java | 113 - rt/net/sourceforge/jnlp/services/XFileSaveService.java | 140 - rt/net/sourceforge/jnlp/services/XPersistenceService.java | 176 - rt/net/sourceforge/jnlp/services/XServiceManagerStub.java | 102 - rt/net/sourceforge/jnlp/services/package.html | 29 - rt/net/sourceforge/jnlp/tools/CharacterEncoder.java | 354 - rt/net/sourceforge/jnlp/tools/HexDumpEncoder.java | 120 - rt/net/sourceforge/jnlp/tools/JarRunner.java | 15 - rt/net/sourceforge/jnlp/tools/JarSigner.java | 515 - rt/net/sourceforge/jnlp/tools/JarSignerResources.java | 212 - rt/net/sourceforge/jnlp/tools/KeyStoreUtil.java | 69 - rt/net/sourceforge/jnlp/tools/KeyTool.java | 479 - rt/net/sourceforge/jnlp/util/PropertiesFile.java | 148 - rt/net/sourceforge/jnlp/util/Reflect.java | 148 - rt/net/sourceforge/jnlp/util/WeakList.java | 128 - rt/net/sourceforge/nanoxml/XMLElement.java | 1205 - rt/net/sourceforge/nanoxml/XMLParseException.java | 130 - rt/sun/dc/path/FastPathProducer.java | 56 + rt/sun/dc/path/PathConsumer.java | 60 + rt/sun/dc/path/PathException.java | 42 + rt/sun/dc/pr/PRException.java | 42 + rt/sun/dc/pr/PathDasher.java | 115 + rt/sun/dc/pr/PathStroker.java | 139 + rt/sun/dc/pr/Rasterizer.java | 212 + rt/sun/org/mozilla/javascript/internal/NativeJavaArray.java | 47 + rt/sun/org/mozilla/javascript/internal/Wrapper.java | 48 + tools-copy-files.txt | 77 + tools-copy/tools-corba-copy-files.txt | 6 - tools-copy/tools-jaxws-copy-files.txt | 101 - tools-copy/tools-jdk-copy-files.txt | 39 - tools-copy/tools-langtools-copy-files.txt | 51 - 1437 files changed, 122255 insertions(+), 300855 deletions(-) diffs (truncated from 441391 to 500 lines): diff -r 2b413b0a984f -r 839184322929 .hgignore --- a/.hgignore Mon Mar 17 16:00:18 2008 +0100 +++ b/.hgignore Thu Aug 22 16:12:50 2013 +0100 @@ -5,21 +5,12 @@ autom4te.cache openjdk bootstrap -debian lib -tools -stamps Makefile config.log config.status javac javap -gcjwebplugin.so -extra-source-files.txt -rt-source-files.txt -hotspot-tools-source-files.txt -tools-source-files.txt -platform_zero rt/com/sun/jdi/AbsentInformationException.java rt/com/sun/jdi/Accessible.java rt/com/sun/jdi/ArrayReference.java @@ -36,43 +27,8 @@ rt/com/sun/jdi/ClassNotPreparedException.java rt/com/sun/jdi/ClassObjectReference.java rt/com/sun/jdi/ClassType.java -rt/com/sun/jdi/connect/AttachingConnector.java -rt/com/sun/jdi/connect/Connector.java -rt/com/sun/jdi/connect/IllegalConnectorArgumentsException.java -rt/com/sun/jdi/connect/LaunchingConnector.java -rt/com/sun/jdi/connect/ListeningConnector.java -rt/com/sun/jdi/connect/spi/ClosedConnectionException.java -rt/com/sun/jdi/connect/spi/Connection.java -rt/com/sun/jdi/connect/spi/TransportService.java -rt/com/sun/jdi/connect/Transport.java -rt/com/sun/jdi/connect/TransportTimeoutException.java -rt/com/sun/jdi/connect/VMStartException.java rt/com/sun/jdi/DoubleType.java rt/com/sun/jdi/DoubleValue.java -rt/com/sun/jdi/event/AccessWatchpointEvent.java -rt/com/sun/jdi/event/BreakpointEvent.java -rt/com/sun/jdi/event/ClassPrepareEvent.java -rt/com/sun/jdi/event/ClassUnloadEvent.java -rt/com/sun/jdi/event/EventIterator.java -rt/com/sun/jdi/event/Event.java -rt/com/sun/jdi/event/EventQueue.java -rt/com/sun/jdi/event/EventSet.java -rt/com/sun/jdi/event/ExceptionEvent.java -rt/com/sun/jdi/event/LocatableEvent.java -rt/com/sun/jdi/event/MethodEntryEvent.java -rt/com/sun/jdi/event/MethodExitEvent.java -rt/com/sun/jdi/event/ModificationWatchpointEvent.java -rt/com/sun/jdi/event/MonitorContendedEnteredEvent.java -rt/com/sun/jdi/event/MonitorContendedEnterEvent.java -rt/com/sun/jdi/event/MonitorWaitedEvent.java -rt/com/sun/jdi/event/MonitorWaitEvent.java -rt/com/sun/jdi/event/StepEvent.java -rt/com/sun/jdi/event/ThreadDeathEvent.java -rt/com/sun/jdi/event/ThreadStartEvent.java -rt/com/sun/jdi/event/VMDeathEvent.java -rt/com/sun/jdi/event/VMDisconnectEvent.java -rt/com/sun/jdi/event/VMStartEvent.java -rt/com/sun/jdi/event/WatchpointEvent.java rt/com/sun/jdi/Field.java rt/com/sun/jdi/FloatType.java rt/com/sun/jdi/FloatValue.java @@ -103,6 +59,58 @@ rt/com/sun/jdi/PrimitiveType.java rt/com/sun/jdi/PrimitiveValue.java rt/com/sun/jdi/ReferenceType.java +rt/com/sun/jdi/ShortType.java +rt/com/sun/jdi/ShortValue.java +rt/com/sun/jdi/StackFrame.java +rt/com/sun/jdi/StringReference.java +rt/com/sun/jdi/ThreadGroupReference.java +rt/com/sun/jdi/ThreadReference.java +rt/com/sun/jdi/Type.java +rt/com/sun/jdi/TypeComponent.java +rt/com/sun/jdi/VMCannotBeModifiedException.java +rt/com/sun/jdi/VMDisconnectedException.java +rt/com/sun/jdi/VMMismatchException.java +rt/com/sun/jdi/VMOutOfMemoryException.java +rt/com/sun/jdi/Value.java +rt/com/sun/jdi/VirtualMachine.java +rt/com/sun/jdi/VirtualMachineManager.java +rt/com/sun/jdi/VoidType.java +rt/com/sun/jdi/VoidValue.java +rt/com/sun/jdi/connect/AttachingConnector.java +rt/com/sun/jdi/connect/Connector.java +rt/com/sun/jdi/connect/IllegalConnectorArgumentsException.java +rt/com/sun/jdi/connect/LaunchingConnector.java +rt/com/sun/jdi/connect/ListeningConnector.java +rt/com/sun/jdi/connect/Transport.java +rt/com/sun/jdi/connect/TransportTimeoutException.java +rt/com/sun/jdi/connect/VMStartException.java +rt/com/sun/jdi/connect/spi/ClosedConnectionException.java +rt/com/sun/jdi/connect/spi/Connection.java +rt/com/sun/jdi/connect/spi/TransportService.java +rt/com/sun/jdi/event/AccessWatchpointEvent.java +rt/com/sun/jdi/event/BreakpointEvent.java +rt/com/sun/jdi/event/ClassPrepareEvent.java +rt/com/sun/jdi/event/ClassUnloadEvent.java +rt/com/sun/jdi/event/Event.java +rt/com/sun/jdi/event/EventIterator.java +rt/com/sun/jdi/event/EventQueue.java +rt/com/sun/jdi/event/EventSet.java +rt/com/sun/jdi/event/ExceptionEvent.java +rt/com/sun/jdi/event/LocatableEvent.java +rt/com/sun/jdi/event/MethodEntryEvent.java +rt/com/sun/jdi/event/MethodExitEvent.java +rt/com/sun/jdi/event/ModificationWatchpointEvent.java +rt/com/sun/jdi/event/MonitorContendedEnterEvent.java +rt/com/sun/jdi/event/MonitorContendedEnteredEvent.java +rt/com/sun/jdi/event/MonitorWaitEvent.java +rt/com/sun/jdi/event/MonitorWaitedEvent.java +rt/com/sun/jdi/event/StepEvent.java +rt/com/sun/jdi/event/ThreadDeathEvent.java +rt/com/sun/jdi/event/ThreadStartEvent.java +rt/com/sun/jdi/event/VMDeathEvent.java +rt/com/sun/jdi/event/VMDisconnectEvent.java +rt/com/sun/jdi/event/VMStartEvent.java +rt/com/sun/jdi/event/WatchpointEvent.java rt/com/sun/jdi/request/AccessWatchpointRequest.java rt/com/sun/jdi/request/BreakpointRequest.java rt/com/sun/jdi/request/ClassPrepareRequest.java @@ -115,32 +123,35 @@ rt/com/sun/jdi/request/MethodEntryRequest.java rt/com/sun/jdi/request/MethodExitRequest.java rt/com/sun/jdi/request/ModificationWatchpointRequest.java +rt/com/sun/jdi/request/MonitorContendedEnterRequest.java rt/com/sun/jdi/request/MonitorContendedEnteredRequest.java -rt/com/sun/jdi/request/MonitorContendedEnterRequest.java +rt/com/sun/jdi/request/MonitorWaitRequest.java rt/com/sun/jdi/request/MonitorWaitedRequest.java -rt/com/sun/jdi/request/MonitorWaitRequest.java rt/com/sun/jdi/request/StepRequest.java rt/com/sun/jdi/request/ThreadDeathRequest.java rt/com/sun/jdi/request/ThreadStartRequest.java rt/com/sun/jdi/request/VMDeathRequest.java rt/com/sun/jdi/request/WatchpointRequest.java -rt/com/sun/jdi/ShortType.java -rt/com/sun/jdi/ShortValue.java -rt/com/sun/jdi/StackFrame.java -rt/com/sun/jdi/StringReference.java -rt/com/sun/jdi/ThreadGroupReference.java -rt/com/sun/jdi/ThreadReference.java -rt/com/sun/jdi/TypeComponent.java -rt/com/sun/jdi/Type.java -rt/com/sun/jdi/Value.java -rt/com/sun/jdi/VirtualMachine.java -rt/com/sun/jdi/VirtualMachineManager.java -rt/com/sun/jdi/VMCannotBeModifiedException.java -rt/com/sun/jdi/VMDisconnectedException.java -rt/com/sun/jdi/VMMismatchException.java -rt/com/sun/jdi/VMOutOfMemoryException.java -rt/com/sun/jdi/VoidType.java -rt/com/sun/jdi/VoidValue.java +rt/com/sun/tools/jdi/LinkedHashMap.java +rt/java/util/Observer.java +rt/java/security/cert/CertPathValidator.java +rt/java/util/Timer.java +rt/javax/security/auth/callback/ChoiceCallback.java +rt/javax/security/auth/callback/ConfirmationCallback.java +rt/javax/security/auth/callback/LanguageCallback.java +rt/javax/security/auth/callback/NameCallback.java +rt/javax/security/auth/callback/TextInputCallback.java +rt/javax/security/auth/callback/TextOutputCallback.java +rt/javax/security/sasl/AuthenticationException.java +rt/javax/security/sasl/Sasl.java +rt/javax/security/sasl/SaslClient.java +rt/javax/security/sasl/SaslClientFactory.java +rt/javax/security/sasl/SaslException.java +rt/javax/security/sasl/SaslServer.java +rt/javax/security/sasl/SaslServerFactory.java +generated/gen-srcs.lst +rt/com/sun/jmx/snmp/agent/SnmpMibEntry.java +rt/com/sun/jmx/snmp/agent/SnmpMib.java rt/com/sun/jmx/snmp/agent/SnmpEntryOid.java rt/com/sun/jmx/snmp/agent/SnmpErrorHandlerAgent.java rt/com/sun/jmx/snmp/agent/SnmpGenericMetaServer.java @@ -148,14 +159,13 @@ rt/com/sun/jmx/snmp/agent/SnmpIndex.java rt/com/sun/jmx/snmp/agent/SnmpMibAgent.java rt/com/sun/jmx/snmp/agent/SnmpMibAgentMBean.java -rt/com/sun/jmx/snmp/agent/SnmpMibEntry.java +rt/com/sun/jmx/snmp/agent/SnmpMibEntry.javt rt/com/sun/jmx/snmp/agent/SnmpMibGroup.java rt/com/sun/jmx/snmp/agent/SnmpMibHandler.java -rt/com/sun/jmx/snmp/agent/SnmpMib.java rt/com/sun/jmx/snmp/agent/SnmpMibNode.java rt/com/sun/jmx/snmp/agent/SnmpMibOid.java +rt/com/sun/jmx/snmp/agent/SnmpMibRequest.java rt/com/sun/jmx/snmp/agent/SnmpMibRequestImpl.java -rt/com/sun/jmx/snmp/agent/SnmpMibRequest.java rt/com/sun/jmx/snmp/agent/SnmpMibSubRequest.java rt/com/sun/jmx/snmp/agent/SnmpMibTable.java rt/com/sun/jmx/snmp/agent/SnmpRequestTree.java @@ -166,21 +176,6 @@ rt/com/sun/jmx/snmp/agent/SnmpTableEntryNotification.java rt/com/sun/jmx/snmp/agent/SnmpTableSupport.java rt/com/sun/jmx/snmp/agent/SnmpUserDataFactory.java -rt/com/sun/jmx/snmp/daemon/SnmpInformRequest.java -rt/com/sun/jmx/snmp/daemon/SnmpSession.java -rt/com/sun/jmx/snmp/SnmpDataTypeEnums.java -rt/com/sun/jmx/snmp/SnmpDefinitions.java -rt/com/sun/jmx/snmp/SnmpOid.java -rt/com/sun/jmx/snmp/SnmpOidRecord.java -rt/com/sun/jmx/snmp/SnmpOidTable.java -rt/com/sun/jmx/snmp/SnmpOidTableSupport.java -rt/com/sun/jmx/snmp/SnmpParameters.java -rt/com/sun/jmx/snmp/SnmpPduPacket.java -rt/com/sun/jmx/snmp/SnmpPeer.java -rt/com/sun/jmx/snmp/SnmpSession.java -rt/com/sun/jmx/snmp/SnmpTimeticks.java -rt/com/sun/jmx/snmp/SnmpVarBind.java -rt/com/sun/jmx/snmp/SnmpVarBindList.java rt/com/sun/tools/jdi/AbstractLauncher.java rt/com/sun/tools/jdi/ArrayReferenceImpl.java rt/com/sun/tools/jdi/ArrayTypeImpl.java @@ -214,7 +209,6 @@ rt/com/sun/tools/jdi/JDWPException.java rt/com/sun/tools/jdi/JNITypeParser.java rt/com/sun/tools/jdi/LineInfo.java -rt/com/sun/tools/jdi/LinkedHashMap.java rt/com/sun/tools/jdi/LocalVariableImpl.java rt/com/sun/tools/jdi/LocationImpl.java rt/com/sun/tools/jdi/LockObject.java @@ -250,17 +244,59 @@ rt/com/sun/tools/jdi/ThreadReferenceImpl.java rt/com/sun/tools/jdi/TypeComponentImpl.java rt/com/sun/tools/jdi/TypeImpl.java +rt/com/sun/tools/jdi/VMAction.java +rt/com/sun/tools/jdi/VMListener.java +rt/com/sun/tools/jdi/VMModifiers.java +rt/com/sun/tools/jdi/VMState.java rt/com/sun/tools/jdi/ValueContainer.java rt/com/sun/tools/jdi/ValueImpl.java rt/com/sun/tools/jdi/VirtualMachineImpl.java rt/com/sun/tools/jdi/VirtualMachineManagerImpl.java rt/com/sun/tools/jdi/VirtualMachineManagerService.java -rt/com/sun/tools/jdi/VMAction.java -rt/com/sun/tools/jdi/VMListener.java -rt/com/sun/tools/jdi/VMModifiers.java -rt/com/sun/tools/jdi/VMState.java rt/com/sun/tools/jdi/VoidTypeImpl.java rt/com/sun/tools/jdi/VoidValueImpl.java +rt/java/security/cert/CRL.java +rt/java/security/cert/CRLException.java +rt/java/security/cert/CRLSelector.java +rt/java/security/cert/CertPath.java +rt/java/security/cert/CertPathBuilder.java +rt/java/security/cert/CertPathBuilderException.java +rt/java/security/cert/CertPathBuilderResult.java +rt/java/security/cert/CertPathBuilderSpi.java +rt/java/security/cert/CertPathHelperImpl.java +rt/java/security/cert/CertPathParameters.java +rt/java/security/cert/CertPathValidatorException.java +rt/java/security/cert/CertPathValidatorResult.java +rt/java/security/cert/CertPathValidatorSpi.java +rt/java/security/cert/CertSelector.java +rt/java/security/cert/CertStore.java +rt/java/security/cert/CertStoreException.java +rt/java/security/cert/CertStoreParameters.java +rt/java/security/cert/CertStoreSpi.java +rt/java/security/cert/Certificate.java +rt/java/security/cert/CertificateEncodingException.java +rt/java/security/cert/CertificateException.java +rt/java/security/cert/CertificateExpiredException.java +rt/java/security/cert/CertificateFactory.java +rt/java/security/cert/CertificateFactorySpi.java +rt/java/security/cert/CertificateNotYetValidException.java +rt/java/security/cert/CertificateParsingException.java +rt/java/security/cert/CollectionCertStoreParameters.java +rt/java/security/cert/LDAPCertStoreParameters.java +rt/java/security/cert/PKIXBuilderParameters.java +rt/java/security/cert/PKIXCertPathBuilderResult.java +rt/java/security/cert/PKIXCertPathChecker.java +rt/java/security/cert/PKIXCertPathValidatorResult.java +rt/java/security/cert/PKIXParameters.java +rt/java/security/cert/PolicyNode.java +rt/java/security/cert/PolicyQualifierInfo.java +rt/java/security/cert/TrustAnchor.java +rt/java/security/cert/X509CRL.java +rt/java/security/cert/X509CRLEntry.java +rt/java/security/cert/X509CRLSelector.java +rt/java/security/cert/X509CertSelector.java +rt/java/security/cert/X509Certificate.java +rt/java/security/cert/X509Extension.java rt/java/util/AbstractCollection.java rt/java/util/AbstractList.java rt/java/util/AbstractMap.java @@ -282,17 +318,17 @@ rt/java/util/Dictionary.java rt/java/util/DuplicateFormatFlagsException.java rt/java/util/EmptyStackException.java -rt/java/util/Enumeration.java rt/java/util/EnumMap.java rt/java/util/EnumSet.java +rt/java/util/Enumeration.java rt/java/util/EventListener.java rt/java/util/EventListenerProxy.java rt/java/util/EventObject.java rt/java/util/FormatFlagsConversionMismatchException.java +rt/java/util/Formattable.java rt/java/util/FormattableFlags.java -rt/java/util/Formattable.java +rt/java/util/Formatter.java rt/java/util/FormatterClosedException.java -rt/java/util/Formatter.java rt/java/util/GregorianCalendar.java rt/java/util/HashMap.java rt/java/util/HashSet.java @@ -312,11 +348,11 @@ rt/java/util/LinkedHashMap.java rt/java/util/LinkedHashSet.java rt/java/util/LinkedList.java +rt/java/util/List.java rt/java/util/ListIterator.java -rt/java/util/List.java rt/java/util/ListResourceBundle.java +rt/java/util/Locale.java rt/java/util/LocaleISOData.java -rt/java/util/Locale.java rt/java/util/Map.java rt/java/util/MissingFormatArgumentException.java rt/java/util/MissingFormatWidthException.java @@ -325,14 +361,13 @@ rt/java/util/NavigableSet.java rt/java/util/NoSuchElementException.java rt/java/util/Observable.java -rt/java/util/Observer.java rt/java/util/PriorityQueue.java rt/java/util/Properties.java rt/java/util/PropertyPermission.java rt/java/util/PropertyResourceBundle.java rt/java/util/Queue.java +rt/java/util/Random.java rt/java/util/RandomAccess.java -rt/java/util/Random.java rt/java/util/RegularEnumSet.java rt/java/util/ResourceBundle.java rt/java/util/Scanner.java @@ -344,83 +379,36 @@ rt/java/util/SortedSet.java rt/java/util/Stack.java rt/java/util/StringTokenizer.java -rt/java/util/Timer.java +rt/java/util/TimeZone.java rt/java/util/TimerTask.java -rt/java/util/TimeZone.java rt/java/util/TooManyListenersException.java rt/java/util/TreeMap.java rt/java/util/TreeSet.java +rt/java/util/UUID.java rt/java/util/UnknownFormatConversionException.java rt/java/util/UnknownFormatFlagsException.java -rt/java/util/UUID.java rt/java/util/Vector.java rt/java/util/WeakHashMap.java rt/java/util/XMLUtils.java -rt/java/rmi/AccessException.java -rt/java/rmi/AlreadyBoundException.java -rt/java/rmi/ConnectException.java -rt/java/rmi/ConnectIOException.java -rt/java/rmi/MarshalException.java -rt/java/rmi/MarshalledObject.java -rt/java/rmi/Naming.java -rt/java/rmi/NoSuchObjectException.java -rt/java/rmi/NotBoundException.java -rt/java/rmi/RMISecurityException.java -rt/java/rmi/RMISecurityManager.java -rt/java/rmi/Remote.java -rt/java/rmi/RemoteException.java -rt/java/rmi/ServerError.java -rt/java/rmi/ServerException.java -rt/java/rmi/ServerRuntimeException.java -rt/java/rmi/StubNotFoundException.java -rt/java/rmi/UnexpectedException.java -rt/java/rmi/UnknownHostException.java -rt/java/rmi/UnmarshalException.java -rt/sun/rmi/rmic/BatchEnvironment.java -rt/sun/rmi/rmic/Constants.java -rt/sun/rmi/rmic/Generator.java -rt/sun/rmi/rmic/IndentingWriter.java -rt/sun/rmi/rmic/Main.java -rt/sun/rmi/rmic/Names.java -rt/sun/rmi/rmic/RMIConstants.java -rt/sun/rmi/rmic/RMIGenerator.java -rt/sun/rmi/rmic/RemoteClass.java -rt/sun/rmi/rmic/Util.java -rt/javax/net/ssl/CertPathTrustManagerParameters.java -rt/javax/net/ssl/HandshakeCompletedEvent.java -rt/javax/net/ssl/HandshakeCompletedListener.java -rt/javax/net/ssl/HostnameVerifier.java -rt/javax/net/ssl/HttpsURLConnection.java -rt/javax/net/ssl/KeyManager.java -rt/javax/net/ssl/KeyManagerFactory.java -rt/javax/net/ssl/KeyManagerFactorySpi.java -rt/javax/net/ssl/KeyStoreBuilderParameters.java -rt/javax/net/ssl/ManagerFactoryParameters.java -rt/javax/net/ssl/SSLContext.java -rt/javax/net/ssl/SSLContextSpi.java -rt/javax/net/ssl/SSLEngine.java -rt/javax/net/ssl/SSLEngineResult.java -rt/javax/net/ssl/SSLException.java -rt/javax/net/ssl/SSLHandshakeException.java -rt/javax/net/ssl/SSLKeyException.java -rt/javax/net/ssl/SSLParameters.java -rt/javax/net/ssl/SSLPeerUnverifiedException.java -rt/javax/net/ssl/SSLPermission.java -rt/javax/net/ssl/SSLProtocolException.java -rt/javax/net/ssl/SSLServerSocket.java -rt/javax/net/ssl/SSLServerSocketFactory.java -rt/javax/net/ssl/SSLSession.java -rt/javax/net/ssl/SSLSessionBindingEvent.java -rt/javax/net/ssl/SSLSessionBindingListener.java -rt/javax/net/ssl/SSLSessionContext.java -rt/javax/net/ssl/SSLSocket.java -rt/javax/net/ssl/SSLSocketFactory.java -rt/javax/net/ssl/TrustManager.java -rt/javax/net/ssl/TrustManagerFactory.java -rt/javax/net/ssl/TrustManagerFactorySpi.java -rt/javax/net/ssl/X509ExtendedKeyManager.java -rt/javax/net/ssl/X509KeyManager.java -rt/javax/net/ssl/X509TrustManager.java -rt/java/io/ -rt/sun/awt -generated/sun/awt/X11/generator/sizer.32.orig +rt/javax/security/auth/AuthPermission.java +rt/javax/security/auth/DestroyFailedException.java +rt/javax/security/auth/Destroyable.java +rt/javax/security/auth/Policy.java +rt/javax/security/auth/PrivateCredentialPermission.java +rt/javax/security/auth/RefreshFailedException.java +rt/javax/security/auth/Refreshable.java +rt/javax/security/auth/Subject.java +rt/javax/security/auth/SubjectDomainCombiner.java +rt/javax/security/auth/callback/Callback.java +rt/javax/security/auth/callback/CallbackHandler.java +rt/javax/security/auth/callback/PasswordCallback.java +rt/javax/security/auth/callback/UnsupportedCallbackException.java +rt/javax/security/sasl/AuthorizeCallback.java +rt/javax/security/sasl/RealmCallback.java +rt/javax/security/sasl/RealmChoiceCallback.java +gcjwebplugin.so +jce-source-files.txt +rt-source-files.txt +tools-source-files.txt +tools/ +stamps/ diff -r 2b413b0a984f -r 839184322929 .hgtags --- a/.hgtags Mon Mar 17 16:00:18 2008 +0100 +++ b/.hgtags Thu Aug 22 16:12:50 2013 +0100 @@ -2,7 +2,3 @@ b639d73581e34a5db114ed5addfd84b093d00254 icedtea-1.1 1ce086327b07f17892cc351719de6897819e32fa icedtea-1.2 8ea2619c21cfea2611b44879aab0f781ffd3fd50 icedtea-1.3 -cb78e0fccf14ed4a80b0ada2c98e4621479acbf5 icedtea-1.4 -5ca86e9ca40533c48ca3445a10fd3b058ef94885 icedtea-1.5 -bb3929528d3e9de0529da995c4b71975fd77fb5a icedtea-1.6 -38e6eb354632588f5ac8dbcd69229ebd031f57cb icedtea6-1.0 diff -r 2b413b0a984f -r 839184322929 AUTHORS --- a/AUTHORS Mon Mar 17 16:00:18 2008 +0100 +++ b/AUTHORS Thu Aug 22 16:12:50 2013 +0100 @@ -5,18 +5,13 @@ Gary Benson Tania Bento Thomas Fitzsimmons -Matthew Flaschen Kyle Galloway Andrew Haley -Matthias Klose Francis Kung Casey Marshall Raif Naffah -Bernhard Rosenkr??nzer -Keith Seitz Joshua Sumali Christian Thalinger -Dalibor Topic Mark Wielaard This project also includes code from the following projects: diff -r 2b413b0a984f -r 839184322929 ChangeLog --- a/ChangeLog Mon Mar 17 16:00:18 2008 +0100 +++ b/ChangeLog Thu Aug 22 16:12:50 2013 +0100 @@ -1,2441 +1,48 @@ -2008-03-17 Gary Benson +2007-10-11 Christan Thalinger - * patches/icedtea-static-libstdc++.patch: New file. + * README.cacao: Added b19. This commit is just to create a new + branch which is able to build IcedTea b19 with CACAO. -2008-03-17 Gary Benson +2007-09-18 Christan Thalinger From andrew at icedtea.classpath.org Thu Aug 22 08:13:48 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 22 Aug 2013 15:13:48 +0000 Subject: /hg/icedtea6: 2 new changesets Message-ID: changeset b71ba618f774 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b71ba618f774 author: Andrew John Hughes date: Thu Aug 22 16:06:27 2013 +0100 Close cacao branch. changeset eea7630060cd in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=eea7630060cd author: Andrew John Hughes date: Thu Aug 22 16:07:14 2013 +0100 Close cacao-b19 branch. diffstat: .hgignore | 316 +- .hgtags | 4 - AUTHORS | 5 - ChangeLog | 6138 +- INSTALL | 59 +- Makefile.am | 745 +- Makefile.in | 799 +- NEWS | 30 - README | 61 +- README.cacao | 4 + acinclude.m4 | 159 +- aclocal.m4 | 40 +- configure | 3969 +- configure.ac | 244 +- contrib/templater/README | 2 - contrib/templater/generate.py | 188 - contrib/templater/hotspot/build/linux/makefiles/CPUS.make | 46 - contrib/templater/hotspot/build/linux/platform_CPUS | 19 - contrib/templater/hotspot/src/cpu/CPU/vm/assembler_CPU.cpp | 1476 - contrib/templater/hotspot/src/cpu/CPU/vm/assembler_CPU.hpp | 481 - contrib/templater/hotspot/src/cpu/CPU/vm/bytecodeInterpreter_CPU.hpp | 103 - contrib/templater/hotspot/src/cpu/CPU/vm/bytecodeInterpreter_CPU.inline.hpp | 278 - contrib/templater/hotspot/src/cpu/CPU/vm/bytecodes_CPU.cpp | 32 - contrib/templater/hotspot/src/cpu/CPU/vm/bytecodes_CPU.hpp | 25 - contrib/templater/hotspot/src/cpu/CPU/vm/bytes_CPU.hpp | 210 - contrib/templater/hotspot/src/cpu/CPU/vm/codeBuffer_CPU.hpp | 27 - contrib/templater/hotspot/src/cpu/CPU/vm/copy_CPU.hpp | 166 - contrib/templater/hotspot/src/cpu/CPU/vm/cppInterpreterGenerator_CPU.hpp | 32 - contrib/templater/hotspot/src/cpu/CPU/vm/cppInterpreter_CPU.cpp | 1407 - contrib/templater/hotspot/src/cpu/CPU/vm/cppInterpreter_CPU.hpp | 32 - contrib/templater/hotspot/src/cpu/CPU/vm/debug_CPU.cpp | 32 - contrib/templater/hotspot/src/cpu/CPU/vm/disassembler_CPU.cpp | 696 - contrib/templater/hotspot/src/cpu/CPU/vm/disassembler_CPU.hpp | 38 - contrib/templater/hotspot/src/cpu/CPU/vm/dump_CPU.cpp | 37 - contrib/templater/hotspot/src/cpu/CPU/vm/frame_CPU.cpp | 139 - contrib/templater/hotspot/src/cpu/CPU/vm/frame_CPU.hpp | 74 - contrib/templater/hotspot/src/cpu/CPU/vm/frame_CPU.inline.hpp | 203 - contrib/templater/hotspot/src/cpu/CPU/vm/globalDefinitions_CPU.hpp | 28 - contrib/templater/hotspot/src/cpu/CPU/vm/globals_CPU.hpp | 55 - contrib/templater/hotspot/src/cpu/CPU/vm/icBuffer_CPU.cpp | 52 - contrib/templater/hotspot/src/cpu/CPU/vm/icache_CPU.cpp | 105 - contrib/templater/hotspot/src/cpu/CPU/vm/icache_CPU.hpp | 45 - contrib/templater/hotspot/src/cpu/CPU/vm/interp_masm_CPU.cpp | 191 - contrib/templater/hotspot/src/cpu/CPU/vm/interp_masm_CPU.hpp | 62 - contrib/templater/hotspot/src/cpu/CPU/vm/interpreterGenerator_CPU.hpp | 37 - contrib/templater/hotspot/src/cpu/CPU/vm/interpreterRT_CPU.cpp | 382 - contrib/templater/hotspot/src/cpu/CPU/vm/interpreterRT_CPU.hpp | 163 - contrib/templater/hotspot/src/cpu/CPU/vm/interpreter_CPU.cpp | 190 - contrib/templater/hotspot/src/cpu/CPU/vm/interpreter_CPU.hpp | 56 - contrib/templater/hotspot/src/cpu/CPU/vm/javaFrameAnchor_CPU.hpp | 79 - contrib/templater/hotspot/src/cpu/CPU/vm/jniFastGetField_CPU.cpp | 67 - contrib/templater/hotspot/src/cpu/CPU/vm/jniTypes_CPU.hpp | 108 - contrib/templater/hotspot/src/cpu/CPU/vm/jni_CPU.h | 32 - contrib/templater/hotspot/src/cpu/CPU/vm/nativeInst_CPU.hpp | 230 - contrib/templater/hotspot/src/cpu/CPU/vm/registerMap_CPU.hpp | 39 - contrib/templater/hotspot/src/cpu/CPU/vm/register_CPU.cpp | 59 - contrib/templater/hotspot/src/cpu/CPU/vm/register_CPU.hpp | 260 - contrib/templater/hotspot/src/cpu/CPU/vm/register_definitions_CPU.cpp | 115 - contrib/templater/hotspot/src/cpu/CPU/vm/relocInfo_CPU.cpp | 68 - contrib/templater/hotspot/src/cpu/CPU/vm/relocInfo_CPU.hpp | 36 - contrib/templater/hotspot/src/cpu/CPU/vm/sharedRuntime_CPU.cpp | 277 - contrib/templater/hotspot/src/cpu/CPU/vm/stubGenerator_CPU.cpp | 523 - contrib/templater/hotspot/src/cpu/CPU/vm/stubRoutines_CPU.hpp | 62 - contrib/templater/hotspot/src/cpu/CPU/vm/vmStructs_CPU.hpp | 52 - contrib/templater/hotspot/src/cpu/CPU/vm/vm_version_CPU.hpp | 32 - contrib/templater/hotspot/src/cpu/CPU/vm/vmreg_CPU.cpp | 67 - contrib/templater/hotspot/src/cpu/CPU/vm/vmreg_CPU.hpp | 29 - contrib/templater/hotspot/src/cpu/CPU/vm/vmreg_CPU.inline.hpp | 32 - contrib/templater/hotspot/src/cpu/CPU/vm/vtableStubs_CPU.cpp | 47 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/assembler_linux_CPU.cpp | 34 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/atomic_linux_CPU.inline.hpp | 164 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/bytes_linux_CPU.inline.hpp | 43 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/globals_linux_CPU.hpp | 43 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/linux_ppc.s | 76 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/linux_ppc64.s | 96 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/orderAccess_linux_CPU.inline.hpp | 101 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/os_linux_CPU.cpp | 348 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/os_linux_CPU.hpp | 36 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/prefetch_linux_CPU.inline.hpp | 42 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/threadLS_linux_CPU.cpp | 42 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/threadLS_linux_CPU.hpp | 32 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/thread_linux_CPU.hpp | 85 - contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/vmStructs_linux_CPU.hpp | 45 - contrib/templater/jdk/src/solaris/bin/CPUS/jvm.cfg | 44 - contrib/templater/jdk/src/solaris/bin/ergo_CPU.c | 58 - extra/net/sourceforge/jnlp/about/HTMLPanel.java | 59 - extra/net/sourceforge/jnlp/about/Main.java | 135 - extra/net/sourceforge/jnlp/about/resources/about.html | 28 - extra/net/sourceforge/jnlp/about/resources/applications.html | 36 - extra/net/sourceforge/jnlp/about/resources/jamIcon.jpg | Bin extra/net/sourceforge/jnlp/about/resources/notes.html | 82 - gcjwebplugin.cc | 14 +- generated/com/sun/accessibility/internal/resources/accessibility_en.java | 107 - generated/com/sun/corba/se/impl/logging/ActivationSystemException.java | 1 + generated/com/sun/corba/se/impl/logging/IORSystemException.java | 1 + generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java | 1 + generated/com/sun/corba/se/impl/logging/LogStrings.properties | 30 +- generated/com/sun/corba/se/impl/logging/NamingSystemException.java | 1 + generated/com/sun/corba/se/impl/logging/OMGSystemException.java | 1 + generated/com/sun/corba/se/impl/logging/ORBUtilSystemException.java | 1 + generated/com/sun/corba/se/impl/logging/POASystemException.java | 1 + generated/com/sun/corba/se/impl/logging/UtilSystemException.java | 1 + generated/com/sun/java/swing/plaf/motif/resources/motif.java | 1 - generated/com/sun/java/swing/plaf/motif/resources/motif_de.java | 1 - generated/com/sun/java/swing/plaf/motif/resources/motif_es.java | 1 - generated/com/sun/java/swing/plaf/motif/resources/motif_fr.java | 1 - generated/com/sun/java/swing/plaf/motif/resources/motif_it.java | 1 - generated/com/sun/java/swing/plaf/motif/resources/motif_ja.java | 1 - generated/com/sun/java/swing/plaf/motif/resources/motif_ko.java | 1 - generated/com/sun/java/swing/plaf/motif/resources/motif_sv.java | 1 - generated/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.java | 1 - generated/com/sun/java/swing/plaf/motif/resources/motif_zh_HK.java | 1 - generated/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.java | 1 - generated/com/sun/java/swing/plaf/windows/resources/windows.java | 3 - generated/com/sun/java/swing/plaf/windows/resources/windows_de.java | 3 - generated/com/sun/java/swing/plaf/windows/resources/windows_es.java | 3 - generated/com/sun/java/swing/plaf/windows/resources/windows_fr.java | 3 - generated/com/sun/java/swing/plaf/windows/resources/windows_it.java | 3 - generated/com/sun/java/swing/plaf/windows/resources/windows_ja.java | 3 - generated/com/sun/java/swing/plaf/windows/resources/windows_ko.java | 3 - generated/com/sun/java/swing/plaf/windows/resources/windows_sv.java | 3 - generated/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.java | 3 - generated/com/sun/java/swing/plaf/windows/resources/windows_zh_HK.java | 3 - generated/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.java | 3 - generated/com/sun/swing/internal/plaf/basic/resources/basic.java | 2 - generated/com/sun/swing/internal/plaf/basic/resources/basic_de.java | 2 - generated/com/sun/swing/internal/plaf/basic/resources/basic_es.java | 2 - generated/com/sun/swing/internal/plaf/basic/resources/basic_fr.java | 2 - generated/com/sun/swing/internal/plaf/basic/resources/basic_it.java | 2 - generated/com/sun/swing/internal/plaf/basic/resources/basic_ja.java | 2 - generated/com/sun/swing/internal/plaf/basic/resources/basic_ko.java | 2 - generated/com/sun/swing/internal/plaf/basic/resources/basic_sv.java | 2 - generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.java | 2 - generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_HK.java | 2 - generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.java | 2 - generated/com/sun/swing/internal/plaf/metal/resources/metal.java | 1 - generated/com/sun/swing/internal/plaf/metal/resources/metal_de.java | 1 - generated/com/sun/swing/internal/plaf/metal/resources/metal_es.java | 1 - generated/com/sun/swing/internal/plaf/metal/resources/metal_fr.java | 1 - generated/com/sun/swing/internal/plaf/metal/resources/metal_it.java | 1 - generated/com/sun/swing/internal/plaf/metal/resources/metal_ja.java | 1 - generated/com/sun/swing/internal/plaf/metal/resources/metal_ko.java | 1 - generated/com/sun/swing/internal/plaf/metal/resources/metal_sv.java | 1 - generated/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.java | 1 - generated/com/sun/swing/internal/plaf/metal/resources/metal_zh_HK.java | 1 - generated/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.java | 1 - generated/com/sun/swing/internal/plaf/synth/resources/synth.java | 1 - generated/com/sun/swing/internal/plaf/synth/resources/synth_de.java | 1 - generated/com/sun/swing/internal/plaf/synth/resources/synth_es.java | 1 - generated/com/sun/swing/internal/plaf/synth/resources/synth_fr.java | 1 - generated/com/sun/swing/internal/plaf/synth/resources/synth_it.java | 1 - generated/com/sun/swing/internal/plaf/synth/resources/synth_ja.java | 1 - generated/com/sun/swing/internal/plaf/synth/resources/synth_ko.java | 1 - generated/com/sun/swing/internal/plaf/synth/resources/synth_sv.java | 1 - generated/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.java | 1 - generated/com/sun/swing/internal/plaf/synth/resources/synth_zh_HK.java | 1 - generated/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.java | 1 - generated/com/sun/tools/jdi/JDWP.java | 22 +- generated/fontconfig/fontconfig.Fedora.bfc | Bin generated/fontconfig/fontconfig.SuSE.bfc | Bin generated/fontconfig/fontconfig.Ubuntu.bfc | Bin generated/fontconfig/fontconfig.bfc | Bin generated/java/lang/CharacterData00.java | 2 + generated/java/lang/CharacterData01.java | 2 + generated/java/lang/CharacterData02.java | 2 + generated/java/lang/CharacterData0E.java | 2 + generated/java/lang/CharacterDataLatin1.java | 2 + generated/java/nio/BufferOverflowException.java | 6 +- generated/java/nio/BufferUnderflowException.java | 6 +- generated/java/nio/ByteBuffer.java | 249 +- generated/java/nio/ByteBufferAsCharBufferB.java | 164 +- generated/java/nio/ByteBufferAsCharBufferL.java | 164 +- generated/java/nio/ByteBufferAsCharBufferRB.java | 98 +- generated/java/nio/ByteBufferAsCharBufferRL.java | 98 +- generated/java/nio/ByteBufferAsDoubleBufferB.java | 116 +- generated/java/nio/ByteBufferAsDoubleBufferL.java | 116 +- generated/java/nio/ByteBufferAsDoubleBufferRB.java | 50 +- generated/java/nio/ByteBufferAsDoubleBufferRL.java | 50 +- generated/java/nio/ByteBufferAsFloatBufferB.java | 116 +- generated/java/nio/ByteBufferAsFloatBufferL.java | 116 +- generated/java/nio/ByteBufferAsFloatBufferRB.java | 50 +- generated/java/nio/ByteBufferAsFloatBufferRL.java | 50 +- generated/java/nio/ByteBufferAsIntBufferB.java | 116 +- generated/java/nio/ByteBufferAsIntBufferL.java | 116 +- generated/java/nio/ByteBufferAsIntBufferRB.java | 50 +- generated/java/nio/ByteBufferAsIntBufferRL.java | 50 +- generated/java/nio/ByteBufferAsLongBufferB.java | 116 +- generated/java/nio/ByteBufferAsLongBufferL.java | 116 +- generated/java/nio/ByteBufferAsLongBufferRB.java | 50 +- generated/java/nio/ByteBufferAsLongBufferRL.java | 50 +- generated/java/nio/ByteBufferAsShortBufferB.java | 116 +- generated/java/nio/ByteBufferAsShortBufferL.java | 116 +- generated/java/nio/ByteBufferAsShortBufferRB.java | 50 +- generated/java/nio/ByteBufferAsShortBufferRL.java | 50 +- generated/java/nio/CharBuffer.java | 257 +- generated/java/nio/DirectByteBuffer.java | 941 +- generated/java/nio/DirectByteBufferR.java | 513 +- generated/java/nio/DirectCharBufferRS.java | 107 +- generated/java/nio/DirectCharBufferRU.java | 107 +- generated/java/nio/DirectCharBufferS.java | 277 +- generated/java/nio/DirectCharBufferU.java | 277 +- generated/java/nio/DirectDoubleBufferRS.java | 59 +- generated/java/nio/DirectDoubleBufferRU.java | 59 +- generated/java/nio/DirectDoubleBufferS.java | 229 +- generated/java/nio/DirectDoubleBufferU.java | 229 +- generated/java/nio/DirectFloatBufferRS.java | 59 +- generated/java/nio/DirectFloatBufferRU.java | 59 +- generated/java/nio/DirectFloatBufferS.java | 229 +- generated/java/nio/DirectFloatBufferU.java | 229 +- generated/java/nio/DirectIntBufferRS.java | 59 +- generated/java/nio/DirectIntBufferRU.java | 59 +- generated/java/nio/DirectIntBufferS.java | 229 +- generated/java/nio/DirectIntBufferU.java | 229 +- generated/java/nio/DirectLongBufferRS.java | 59 +- generated/java/nio/DirectLongBufferRU.java | 59 +- generated/java/nio/DirectLongBufferS.java | 229 +- generated/java/nio/DirectLongBufferU.java | 229 +- generated/java/nio/DirectShortBufferRS.java | 59 +- generated/java/nio/DirectShortBufferRU.java | 59 +- generated/java/nio/DirectShortBufferS.java | 229 +- generated/java/nio/DirectShortBufferU.java | 229 +- generated/java/nio/DoubleBuffer.java | 221 +- generated/java/nio/FloatBuffer.java | 221 +- generated/java/nio/HeapByteBuffer.java | 429 +- generated/java/nio/HeapByteBufferR.java | 273 +- generated/java/nio/HeapCharBuffer.java | 193 +- generated/java/nio/HeapCharBufferR.java | 85 +- generated/java/nio/HeapDoubleBuffer.java | 171 +- generated/java/nio/HeapDoubleBufferR.java | 63 +- generated/java/nio/HeapFloatBuffer.java | 171 +- generated/java/nio/HeapFloatBufferR.java | 63 +- generated/java/nio/HeapIntBuffer.java | 171 +- generated/java/nio/HeapIntBufferR.java | 63 +- generated/java/nio/HeapLongBuffer.java | 171 +- generated/java/nio/HeapLongBufferR.java | 63 +- generated/java/nio/HeapShortBuffer.java | 171 +- generated/java/nio/HeapShortBufferR.java | 63 +- generated/java/nio/IntBuffer.java | 221 +- generated/java/nio/InvalidMarkException.java | 6 +- generated/java/nio/LongBuffer.java | 221 +- generated/java/nio/ReadOnlyBufferException.java | 6 +- generated/java/nio/ShortBuffer.java | 221 +- generated/java/nio/channels/AlreadyConnectedException.java | 6 +- generated/java/nio/channels/AsynchronousCloseException.java | 6 +- generated/java/nio/channels/CancelledKeyException.java | 6 +- generated/java/nio/channels/ClosedByInterruptException.java | 6 +- generated/java/nio/channels/ClosedChannelException.java | 6 +- generated/java/nio/channels/ClosedSelectorException.java | 6 +- generated/java/nio/channels/ConnectionPendingException.java | 6 +- generated/java/nio/channels/FileLockInterruptionException.java | 6 +- generated/java/nio/channels/IllegalBlockingModeException.java | 6 +- generated/java/nio/channels/IllegalSelectorException.java | 6 +- generated/java/nio/channels/NoConnectionPendingException.java | 6 +- generated/java/nio/channels/NonReadableChannelException.java | 6 +- generated/java/nio/channels/NonWritableChannelException.java | 6 +- generated/java/nio/channels/NotYetBoundException.java | 6 +- generated/java/nio/channels/NotYetConnectedException.java | 6 +- generated/java/nio/channels/OverlappingFileLockException.java | 6 +- generated/java/nio/channels/UnresolvedAddressException.java | 6 +- generated/java/nio/channels/UnsupportedAddressTypeException.java | 6 +- generated/java/nio/charset/CharacterCodingException.java | 6 +- generated/java/nio/charset/CharsetDecoder.java | 295 +- generated/java/nio/charset/CharsetEncoder.java | 379 +- generated/java/nio/charset/IllegalCharsetNameException.java | 6 +- generated/java/nio/charset/UnsupportedCharsetException.java | 6 +- generated/org/omg/PortableServer/AdapterActivator.java | 2 +- generated/org/omg/PortableServer/AdapterActivatorOperations.java | 2 +- generated/org/omg/PortableServer/Current.java | 2 +- generated/org/omg/PortableServer/CurrentOperations.java | 2 +- generated/org/omg/PortableServer/CurrentPackage/NoContext.java | 2 +- generated/org/omg/PortableServer/CurrentPackage/NoContextHelper.java | 2 +- generated/org/omg/PortableServer/ForwardRequest.java | 2 +- generated/org/omg/PortableServer/ForwardRequestHelper.java | 2 +- generated/org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.java | 2 +- generated/org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.java | 2 +- generated/org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.java | 2 +- generated/org/omg/PortableServer/IdAssignmentPolicy.java | 2 +- generated/org/omg/PortableServer/IdAssignmentPolicyOperations.java | 2 +- generated/org/omg/PortableServer/IdAssignmentPolicyValue.java | 2 +- generated/org/omg/PortableServer/IdUniquenessPolicy.java | 2 +- generated/org/omg/PortableServer/IdUniquenessPolicyOperations.java | 2 +- generated/org/omg/PortableServer/IdUniquenessPolicyValue.java | 2 +- generated/org/omg/PortableServer/ImplicitActivationPolicy.java | 2 +- generated/org/omg/PortableServer/ImplicitActivationPolicyOperations.java | 2 +- generated/org/omg/PortableServer/ImplicitActivationPolicyValue.java | 2 +- generated/org/omg/PortableServer/LIFESPAN_POLICY_ID.java | 2 +- generated/org/omg/PortableServer/LifespanPolicy.java | 2 +- generated/org/omg/PortableServer/LifespanPolicyOperations.java | 2 +- generated/org/omg/PortableServer/LifespanPolicyValue.java | 2 +- generated/org/omg/PortableServer/POA.java | 2 +- generated/org/omg/PortableServer/POAManager.java | 2 +- generated/org/omg/PortableServer/POAManagerOperations.java | 2 +- generated/org/omg/PortableServer/POAManagerPackage/AdapterInactive.java | 2 +- generated/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java | 2 +- generated/org/omg/PortableServer/POAManagerPackage/State.java | 2 +- generated/org/omg/PortableServer/POAOperations.java | 2 +- generated/org/omg/PortableServer/POAPackage/AdapterAlreadyExists.java | 2 +- generated/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java | 2 +- generated/org/omg/PortableServer/POAPackage/AdapterNonExistent.java | 2 +- generated/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java | 2 +- generated/org/omg/PortableServer/POAPackage/InvalidPolicy.java | 2 +- generated/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java | 2 +- generated/org/omg/PortableServer/POAPackage/NoServant.java | 2 +- generated/org/omg/PortableServer/POAPackage/NoServantHelper.java | 2 +- generated/org/omg/PortableServer/POAPackage/ObjectAlreadyActive.java | 2 +- generated/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java | 2 +- generated/org/omg/PortableServer/POAPackage/ObjectNotActive.java | 2 +- generated/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java | 2 +- generated/org/omg/PortableServer/POAPackage/ServantAlreadyActive.java | 2 +- generated/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java | 2 +- generated/org/omg/PortableServer/POAPackage/ServantNotActive.java | 2 +- generated/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java | 2 +- generated/org/omg/PortableServer/POAPackage/WrongAdapter.java | 2 +- generated/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java | 2 +- generated/org/omg/PortableServer/POAPackage/WrongPolicy.java | 2 +- generated/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java | 2 +- generated/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.java | 2 +- generated/org/omg/PortableServer/RequestProcessingPolicy.java | 2 +- generated/org/omg/PortableServer/RequestProcessingPolicyOperations.java | 2 +- generated/org/omg/PortableServer/RequestProcessingPolicyValue.java | 2 +- generated/org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.java | 2 +- generated/org/omg/PortableServer/ServantActivator.java | 2 +- generated/org/omg/PortableServer/ServantActivatorHelper.java | 2 +- generated/org/omg/PortableServer/ServantActivatorOperations.java | 2 +- generated/org/omg/PortableServer/ServantActivatorPOA.java | 2 +- generated/org/omg/PortableServer/ServantLocator.java | 2 +- generated/org/omg/PortableServer/ServantLocatorHelper.java | 2 +- generated/org/omg/PortableServer/ServantLocatorOperations.java | 2 +- generated/org/omg/PortableServer/ServantLocatorPOA.java | 2 +- generated/org/omg/PortableServer/ServantManager.java | 2 +- generated/org/omg/PortableServer/ServantManagerOperations.java | 2 +- generated/org/omg/PortableServer/ServantRetentionPolicy.java | 2 +- generated/org/omg/PortableServer/ServantRetentionPolicyOperations.java | 2 +- generated/org/omg/PortableServer/ServantRetentionPolicyValue.java | 2 +- generated/org/omg/PortableServer/THREAD_POLICY_ID.java | 2 +- generated/org/omg/PortableServer/ThreadPolicy.java | 2 +- generated/org/omg/PortableServer/ThreadPolicyOperations.java | 2 +- generated/org/omg/PortableServer/ThreadPolicyValue.java | 2 +- generated/org/omg/PortableServer/_ServantActivatorStub.java | 2 +- generated/org/omg/PortableServer/_ServantLocatorStub.java | 2 +- generated/sun/awt/X11/XAWTIcon32_java_icon16_png.java | 33 +- generated/sun/awt/X11/XAWTIcon32_java_icon24_png.java | 63 +- generated/sun/awt/X11/XAWTIcon32_java_icon32_png.java | 110 +- generated/sun/awt/X11/XAWTIcon32_java_icon48_png.java | 238 +- generated/sun/awt/X11/XAWTIcon64_java_icon16_png.java | 33 +- generated/sun/awt/X11/XAWTIcon64_java_icon24_png.java | 63 +- generated/sun/awt/X11/XAWTIcon64_java_icon32_png.java | 110 +- generated/sun/awt/X11/XAWTIcon64_java_icon48_png.java | 238 +- generated/sun/awt/X11/generator/sizer.32 | Bin generated/sun/awt/X11/generator/sizer.32.c | 1007 - generated/sun/awt/X11/generator/sizes.32 | 789 - generated/sun/management/resources/agent.java | 6 - generated/sun/misc/Version.java | 68 +- generated/sun/nio/ch/AlreadyBoundException.java | 6 +- generated/sun/nio/cs/StandardCharsets.java | 25 +- generated/sun/tools/jconsole/Version.java | 6 +- generated/sun/util/CoreResourceBundleControl.java | 32 +- generated/sun/util/LocaleDataMetaInfo.java | 48 +- generated/sun/util/resources/CalendarData.java | 12 - generated/sun/util/resources/CalendarData_ar.java | 12 - generated/sun/util/resources/CalendarData_be.java | 10 - generated/sun/util/resources/CalendarData_bg.java | 10 - generated/sun/util/resources/CalendarData_ca.java | 12 - generated/sun/util/resources/CalendarData_cs.java | 12 - generated/sun/util/resources/CalendarData_da.java | 12 - generated/sun/util/resources/CalendarData_de.java | 12 - generated/sun/util/resources/CalendarData_el.java | 12 - generated/sun/util/resources/CalendarData_el_CY.java | 11 - generated/sun/util/resources/CalendarData_en.java | 10 - generated/sun/util/resources/CalendarData_en_GB.java | 12 - generated/sun/util/resources/CalendarData_en_IE.java | 12 - generated/sun/util/resources/CalendarData_en_MT.java | 11 - generated/sun/util/resources/CalendarData_es.java | 12 - generated/sun/util/resources/CalendarData_es_ES.java | 12 - generated/sun/util/resources/CalendarData_es_US.java | 11 - generated/sun/util/resources/CalendarData_et.java | 12 - generated/sun/util/resources/CalendarData_fi.java | 12 - generated/sun/util/resources/CalendarData_fr.java | 12 - generated/sun/util/resources/CalendarData_fr_CA.java | 12 - generated/sun/util/resources/CalendarData_hi.java | 10 - generated/sun/util/resources/CalendarData_hr.java | 11 - generated/sun/util/resources/CalendarData_hu.java | 12 - generated/sun/util/resources/CalendarData_in_ID.java | 11 - generated/sun/util/resources/CalendarData_is.java | 12 - generated/sun/util/resources/CalendarData_it.java | 12 - generated/sun/util/resources/CalendarData_iw.java | 10 - generated/sun/util/resources/CalendarData_ja.java | 10 - generated/sun/util/resources/CalendarData_ko.java | 10 - generated/sun/util/resources/CalendarData_lt.java | 12 - generated/sun/util/resources/CalendarData_lv.java | 10 - generated/sun/util/resources/CalendarData_mk.java | 10 - generated/sun/util/resources/CalendarData_ms_MY.java | 11 - generated/sun/util/resources/CalendarData_mt.java | 11 - generated/sun/util/resources/CalendarData_mt_MT.java | 11 - generated/sun/util/resources/CalendarData_nl.java | 12 - generated/sun/util/resources/CalendarData_no.java | 12 - generated/sun/util/resources/CalendarData_pl.java | 12 - generated/sun/util/resources/CalendarData_pt.java | 12 - generated/sun/util/resources/CalendarData_pt_PT.java | 12 - generated/sun/util/resources/CalendarData_ro.java | 12 - generated/sun/util/resources/CalendarData_ru.java | 12 - generated/sun/util/resources/CalendarData_sk.java | 12 - generated/sun/util/resources/CalendarData_sl.java | 10 - generated/sun/util/resources/CalendarData_sq.java | 10 - generated/sun/util/resources/CalendarData_sr.java | 11 - generated/sun/util/resources/CalendarData_sv.java | 12 - generated/sun/util/resources/CalendarData_th.java | 10 - generated/sun/util/resources/CalendarData_tr.java | 12 - generated/sun/util/resources/CalendarData_uk.java | 12 - generated/sun/util/resources/CalendarData_vi.java | 10 - generated/sun/util/resources/CalendarData_zh.java | 10 - generated/sun/util/resources/CurrencyNames.java | 431 - generated/sun/util/resources/CurrencyNames_ar_AE.java | 11 - generated/sun/util/resources/CurrencyNames_ar_BH.java | 11 - generated/sun/util/resources/CurrencyNames_ar_DZ.java | 11 - generated/sun/util/resources/CurrencyNames_ar_EG.java | 11 - generated/sun/util/resources/CurrencyNames_ar_IQ.java | 11 - generated/sun/util/resources/CurrencyNames_ar_JO.java | 11 - generated/sun/util/resources/CurrencyNames_ar_KW.java | 11 - generated/sun/util/resources/CurrencyNames_ar_LB.java | 11 - generated/sun/util/resources/CurrencyNames_ar_LY.java | 11 - generated/sun/util/resources/CurrencyNames_ar_MA.java | 11 - generated/sun/util/resources/CurrencyNames_ar_OM.java | 11 - generated/sun/util/resources/CurrencyNames_ar_QA.java | 11 - generated/sun/util/resources/CurrencyNames_ar_SA.java | 11 - generated/sun/util/resources/CurrencyNames_ar_SD.java | 12 - generated/sun/util/resources/CurrencyNames_ar_SY.java | 11 - generated/sun/util/resources/CurrencyNames_ar_TN.java | 11 - generated/sun/util/resources/CurrencyNames_ar_YE.java | 11 - generated/sun/util/resources/CurrencyNames_be_BY.java | 11 - generated/sun/util/resources/CurrencyNames_bg_BG.java | 11 - generated/sun/util/resources/CurrencyNames_ca_ES.java | 12 - generated/sun/util/resources/CurrencyNames_cs_CZ.java | 11 - generated/sun/util/resources/CurrencyNames_da_DK.java | 12 - generated/sun/util/resources/CurrencyNames_de.java | 205 - generated/sun/util/resources/CurrencyNames_de_AT.java | 12 - generated/sun/util/resources/CurrencyNames_de_CH.java | 11 - generated/sun/util/resources/CurrencyNames_de_DE.java | 12 - generated/sun/util/resources/CurrencyNames_de_GR.java | 12 - generated/sun/util/resources/CurrencyNames_de_LU.java | 12 - generated/sun/util/resources/CurrencyNames_el_CY.java | 12 - generated/sun/util/resources/CurrencyNames_el_GR.java | 12 - generated/sun/util/resources/CurrencyNames_en_AU.java | 11 - generated/sun/util/resources/CurrencyNames_en_CA.java | 12 - generated/sun/util/resources/CurrencyNames_en_GB.java | 12 - generated/sun/util/resources/CurrencyNames_en_IE.java | 12 - generated/sun/util/resources/CurrencyNames_en_IN.java | 11 - generated/sun/util/resources/CurrencyNames_en_MT.java | 12 - generated/sun/util/resources/CurrencyNames_en_NZ.java | 11 - generated/sun/util/resources/CurrencyNames_en_PH.java | 11 - generated/sun/util/resources/CurrencyNames_en_SG.java | 11 - generated/sun/util/resources/CurrencyNames_en_US.java | 11 - generated/sun/util/resources/CurrencyNames_en_ZA.java | 11 - generated/sun/util/resources/CurrencyNames_es.java | 214 - generated/sun/util/resources/CurrencyNames_es_AR.java | 12 - generated/sun/util/resources/CurrencyNames_es_BO.java | 11 - generated/sun/util/resources/CurrencyNames_es_CL.java | 11 - generated/sun/util/resources/CurrencyNames_es_CO.java | 11 - generated/sun/util/resources/CurrencyNames_es_CR.java | 11 - generated/sun/util/resources/CurrencyNames_es_DO.java | 11 - generated/sun/util/resources/CurrencyNames_es_EC.java | 11 - generated/sun/util/resources/CurrencyNames_es_ES.java | 12 - generated/sun/util/resources/CurrencyNames_es_GT.java | 11 - generated/sun/util/resources/CurrencyNames_es_HN.java | 11 - generated/sun/util/resources/CurrencyNames_es_MX.java | 12 - generated/sun/util/resources/CurrencyNames_es_NI.java | 11 - generated/sun/util/resources/CurrencyNames_es_PA.java | 11 - generated/sun/util/resources/CurrencyNames_es_PE.java | 11 - generated/sun/util/resources/CurrencyNames_es_PR.java | 11 - generated/sun/util/resources/CurrencyNames_es_PY.java | 11 - generated/sun/util/resources/CurrencyNames_es_SV.java | 11 - generated/sun/util/resources/CurrencyNames_es_US.java | 11 - generated/sun/util/resources/CurrencyNames_es_UY.java | 11 - generated/sun/util/resources/CurrencyNames_es_VE.java | 12 - generated/sun/util/resources/CurrencyNames_et_EE.java | 11 - generated/sun/util/resources/CurrencyNames_fi_FI.java | 12 - generated/sun/util/resources/CurrencyNames_fr.java | 209 - generated/sun/util/resources/CurrencyNames_fr_BE.java | 12 - generated/sun/util/resources/CurrencyNames_fr_CA.java | 11 - generated/sun/util/resources/CurrencyNames_fr_CH.java | 11 - generated/sun/util/resources/CurrencyNames_fr_FR.java | 12 - generated/sun/util/resources/CurrencyNames_fr_LU.java | 12 - generated/sun/util/resources/CurrencyNames_ga_IE.java | 11 - generated/sun/util/resources/CurrencyNames_hi_IN.java | 11 - generated/sun/util/resources/CurrencyNames_hr_HR.java | 11 - generated/sun/util/resources/CurrencyNames_hu_HU.java | 11 - generated/sun/util/resources/CurrencyNames_in_ID.java | 11 - generated/sun/util/resources/CurrencyNames_is_IS.java | 11 - generated/sun/util/resources/CurrencyNames_it.java | 207 - generated/sun/util/resources/CurrencyNames_it_CH.java | 11 - generated/sun/util/resources/CurrencyNames_it_IT.java | 12 - generated/sun/util/resources/CurrencyNames_iw_IL.java | 11 - generated/sun/util/resources/CurrencyNames_ja.java | 206 - generated/sun/util/resources/CurrencyNames_ja_JP.java | 11 - generated/sun/util/resources/CurrencyNames_ko.java | 193 - generated/sun/util/resources/CurrencyNames_ko_KR.java | 11 - generated/sun/util/resources/CurrencyNames_lt_LT.java | 11 - generated/sun/util/resources/CurrencyNames_lv_LV.java | 11 - generated/sun/util/resources/CurrencyNames_mk_MK.java | 11 - generated/sun/util/resources/CurrencyNames_ms_MY.java | 11 - generated/sun/util/resources/CurrencyNames_mt_MT.java | 12 - generated/sun/util/resources/CurrencyNames_nl_BE.java | 12 - generated/sun/util/resources/CurrencyNames_nl_NL.java | 12 - generated/sun/util/resources/CurrencyNames_no_NO.java | 11 - generated/sun/util/resources/CurrencyNames_pl_PL.java | 11 - generated/sun/util/resources/CurrencyNames_pt_BR.java | 12 - generated/sun/util/resources/CurrencyNames_pt_PT.java | 12 - generated/sun/util/resources/CurrencyNames_ro_RO.java | 12 - generated/sun/util/resources/CurrencyNames_ru_RU.java | 11 - generated/sun/util/resources/CurrencyNames_sk_SK.java | 11 - generated/sun/util/resources/CurrencyNames_sl_SI.java | 12 - generated/sun/util/resources/CurrencyNames_sq_AL.java | 11 - generated/sun/util/resources/CurrencyNames_sr_BA.java | 12 - generated/sun/util/resources/CurrencyNames_sr_CS.java | 11 - generated/sun/util/resources/CurrencyNames_sr_ME.java | 11 - generated/sun/util/resources/CurrencyNames_sv.java | 198 - generated/sun/util/resources/CurrencyNames_sv_SE.java | 12 - generated/sun/util/resources/CurrencyNames_th_TH.java | 11 - generated/sun/util/resources/CurrencyNames_tr_TR.java | 12 - generated/sun/util/resources/CurrencyNames_uk_UA.java | 11 - generated/sun/util/resources/CurrencyNames_vi_VN.java | 11 - generated/sun/util/resources/CurrencyNames_zh_CN.java | 214 - generated/sun/util/resources/CurrencyNames_zh_TW.java | 207 - generated/sun/util/resources/LocaleNames.java | 449 - generated/sun/util/resources/LocaleNames_ar.java | 28 - generated/sun/util/resources/LocaleNames_be.java | 12 - generated/sun/util/resources/LocaleNames_bg.java | 12 - generated/sun/util/resources/LocaleNames_ca.java | 348 - generated/sun/util/resources/LocaleNames_cs.java | 12 - generated/sun/util/resources/LocaleNames_da.java | 12 - generated/sun/util/resources/LocaleNames_de.java | 440 - generated/sun/util/resources/LocaleNames_el.java | 310 - generated/sun/util/resources/LocaleNames_el_CY.java | 309 - generated/sun/util/resources/LocaleNames_en.java | 10 - generated/sun/util/resources/LocaleNames_en_MT.java | 40 - generated/sun/util/resources/LocaleNames_en_PH.java | 40 - generated/sun/util/resources/LocaleNames_en_SG.java | 40 - generated/sun/util/resources/LocaleNames_es.java | 440 - generated/sun/util/resources/LocaleNames_es_US.java | 131 - generated/sun/util/resources/LocaleNames_et.java | 12 - generated/sun/util/resources/LocaleNames_fi.java | 63 - generated/sun/util/resources/LocaleNames_fr.java | 440 - generated/sun/util/resources/LocaleNames_ga.java | 343 - generated/sun/util/resources/LocaleNames_hi.java | 14 - generated/sun/util/resources/LocaleNames_hr.java | 12 - generated/sun/util/resources/LocaleNames_hu.java | 12 - generated/sun/util/resources/LocaleNames_in.java | 163 - generated/sun/util/resources/LocaleNames_is.java | 12 - generated/sun/util/resources/LocaleNames_it.java | 440 - generated/sun/util/resources/LocaleNames_iw.java | 12 - generated/sun/util/resources/LocaleNames_ja.java | 440 - generated/sun/util/resources/LocaleNames_ko.java | 440 - generated/sun/util/resources/LocaleNames_lt.java | 12 - generated/sun/util/resources/LocaleNames_lv.java | 12 - generated/sun/util/resources/LocaleNames_mk.java | 12 - generated/sun/util/resources/LocaleNames_ms.java | 79 - generated/sun/util/resources/LocaleNames_mt.java | 332 - generated/sun/util/resources/LocaleNames_nl.java | 13 - generated/sun/util/resources/LocaleNames_no.java | 14 - generated/sun/util/resources/LocaleNames_pl.java | 348 - generated/sun/util/resources/LocaleNames_pt.java | 374 - generated/sun/util/resources/LocaleNames_pt_BR.java | 22 - generated/sun/util/resources/LocaleNames_pt_PT.java | 72 - generated/sun/util/resources/LocaleNames_ro.java | 12 - generated/sun/util/resources/LocaleNames_ru.java | 348 - generated/sun/util/resources/LocaleNames_sk.java | 12 - generated/sun/util/resources/LocaleNames_sl.java | 12 - generated/sun/util/resources/LocaleNames_sq.java | 12 - generated/sun/util/resources/LocaleNames_sr.java | 307 - generated/sun/util/resources/LocaleNames_sv.java | 440 - generated/sun/util/resources/LocaleNames_th.java | 348 - generated/sun/util/resources/LocaleNames_tr.java | 12 - generated/sun/util/resources/LocaleNames_uk.java | 12 - generated/sun/util/resources/LocaleNames_vi.java | 257 - generated/sun/util/resources/LocaleNames_zh.java | 440 - generated/sun/util/resources/LocaleNames_zh_SG.java | 103 - generated/sun/util/resources/LocaleNames_zh_TW.java | 440 - javac.in | 5 - jce/gnu/classpath/debug/Component.java | 175 + jce/gnu/classpath/debug/PreciseFilter.java | 105 + jce/gnu/classpath/debug/Simple1LineFormatter.java | 161 + jce/gnu/classpath/debug/SystemLogger.java | 102 + jce/gnu/classpath/debug/TeeInputStream.java | 98 + jce/gnu/classpath/debug/TeeOutputStream.java | 93 + jce/gnu/classpath/debug/TeeReader.java | 98 + jce/gnu/classpath/debug/TeeWriter.java | 93 + jce/gnu/java/security/Configuration.java | 56 + jce/gnu/java/security/Engine.java | 280 + jce/gnu/java/security/OID.java | 510 + jce/gnu/java/security/PolicyFile.java | 685 + jce/gnu/java/security/Properties.java | 348 + jce/gnu/java/security/Registry.java | 465 + jce/gnu/java/security/Requires.java | 59 + jce/gnu/java/security/action/GetPropertyAction.java | 89 + jce/gnu/java/security/action/GetSecurityPropertyAction.java | 93 + jce/gnu/java/security/action/SetAccessibleAction.java | 77 + jce/gnu/java/security/der/BitString.java | 330 + jce/gnu/java/security/der/DER.java | 86 + jce/gnu/java/security/der/DEREncodingException.java | 54 + jce/gnu/java/security/der/DERReader.java | 437 + jce/gnu/java/security/der/DERValue.java | 189 + jce/gnu/java/security/der/DERWriter.java | 355 + jce/gnu/java/security/hash/BaseHash.java | 183 + jce/gnu/java/security/hash/HashFactory.java | 135 + jce/gnu/java/security/hash/Haval.java | 807 + jce/gnu/java/security/hash/IMessageDigest.java | 127 + jce/gnu/java/security/hash/MD2.java | 256 + jce/gnu/java/security/hash/MD4.java | 337 + jce/gnu/java/security/hash/MD5.java | 371 + jce/gnu/java/security/hash/RipeMD128.java | 257 + jce/gnu/java/security/hash/RipeMD160.java | 291 + jce/gnu/java/security/hash/Sha160.java | 241 + jce/gnu/java/security/hash/Sha256.java | 252 + jce/gnu/java/security/hash/Sha384.java | 279 + jce/gnu/java/security/hash/Sha512.java | 281 + jce/gnu/java/security/hash/Tiger.java | 864 + jce/gnu/java/security/hash/Whirlpool.java | 606 + jce/gnu/java/security/icedtea/CertBundleKeyStoreImpl.java | 199 + jce/gnu/java/security/icedtea/GNUTlsKeyMaterialGeneratorImpl.java | 201 + jce/gnu/java/security/icedtea/GNUTlsMasterSecretGenerator.java | 122 + jce/gnu/java/security/icedtea/GNUTlsPrfGeneratorImpl.java | 180 + jce/gnu/java/security/icedtea/GNUTlsRsaPreMasterSecretGeneratorImpl.java | 120 + jce/gnu/java/security/icedtea/IcedTls.java | 60 + jce/gnu/java/security/jce/hash/HavalSpi.java | 54 + jce/gnu/java/security/jce/hash/MD2Spi.java | 55 + jce/gnu/java/security/jce/hash/MD4Spi.java | 55 + jce/gnu/java/security/jce/hash/MD5Spi.java | 54 + jce/gnu/java/security/jce/hash/MessageDigestAdapter.java | 133 + jce/gnu/java/security/jce/hash/RipeMD128Spi.java | 54 + jce/gnu/java/security/jce/hash/RipeMD160Spi.java | 54 + jce/gnu/java/security/jce/hash/Sha160Spi.java | 54 + jce/gnu/java/security/jce/hash/Sha256Spi.java | 54 + jce/gnu/java/security/jce/hash/Sha384Spi.java | 54 + jce/gnu/java/security/jce/hash/Sha512Spi.java | 54 + jce/gnu/java/security/jce/hash/TigerSpi.java | 55 + jce/gnu/java/security/jce/hash/WhirlpoolSpi.java | 54 + jce/gnu/java/security/jce/prng/HavalRandomSpi.java | 54 + jce/gnu/java/security/jce/prng/MD2RandomSpi.java | 54 + jce/gnu/java/security/jce/prng/MD4RandomSpi.java | 54 + jce/gnu/java/security/jce/prng/MD5RandomSpi.java | 54 + jce/gnu/java/security/jce/prng/RipeMD128RandomSpi.java | 54 + jce/gnu/java/security/jce/prng/RipeMD160RandomSpi.java | 54 + jce/gnu/java/security/jce/prng/SecureRandomAdapter.java | 107 + jce/gnu/java/security/jce/prng/Sha160RandomSpi.java | 54 + jce/gnu/java/security/jce/prng/Sha256RandomSpi.java | 54 + jce/gnu/java/security/jce/prng/Sha384RandomSpi.java | 54 + jce/gnu/java/security/jce/prng/Sha512RandomSpi.java | 54 + jce/gnu/java/security/jce/prng/TigerRandomSpi.java | 54 + jce/gnu/java/security/jce/prng/WhirlpoolRandomSpi.java | 54 + jce/gnu/java/security/jce/sig/DSSKeyFactory.java | 221 + jce/gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java | 146 + jce/gnu/java/security/jce/sig/DSSParameters.java | 218 + jce/gnu/java/security/jce/sig/DSSParametersGenerator.java | 125 + jce/gnu/java/security/jce/sig/DSSRawSignatureSpi.java | 56 + jce/gnu/java/security/jce/sig/EncodedKeyFactory.java | 430 + jce/gnu/java/security/jce/sig/KeyPairGeneratorAdapter.java | 95 + jce/gnu/java/security/jce/sig/MD2withRSA.java | 56 + jce/gnu/java/security/jce/sig/MD5withRSA.java | 56 + jce/gnu/java/security/jce/sig/RSAKeyFactory.java | 231 + jce/gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.java | 96 + jce/gnu/java/security/jce/sig/RSAPSSRawSignatureSpi.java | 56 + jce/gnu/java/security/jce/sig/SHA160withDSS.java | 54 + jce/gnu/java/security/jce/sig/SHA160withRSA.java | 56 + jce/gnu/java/security/jce/sig/SHA256withRSA.java | 56 + jce/gnu/java/security/jce/sig/SHA384withRSA.java | 56 + jce/gnu/java/security/jce/sig/SHA512withRSA.java | 56 + jce/gnu/java/security/jce/sig/SignatureAdapter.java | 250 + jce/gnu/java/security/key/IKeyPairCodec.java | 124 + jce/gnu/java/security/key/IKeyPairGenerator.java | 73 + jce/gnu/java/security/key/KeyPairCodecFactory.java | 360 + jce/gnu/java/security/key/KeyPairGeneratorFactory.java | 120 + jce/gnu/java/security/key/dss/DSSKey.java | 211 + jce/gnu/java/security/key/dss/DSSKeyPairGenerator.java | 382 + jce/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java | 249 + jce/gnu/java/security/key/dss/DSSKeyPairRawCodec.java | 347 + jce/gnu/java/security/key/dss/DSSKeyPairX509Codec.java | 276 + jce/gnu/java/security/key/dss/DSSPrivateKey.java | 203 + jce/gnu/java/security/key/dss/DSSPublicKey.java | 201 + jce/gnu/java/security/key/dss/FIPS186.java | 262 + jce/gnu/java/security/key/rsa/GnuRSAKey.java | 176 + jce/gnu/java/security/key/rsa/GnuRSAPrivateKey.java | 311 + jce/gnu/java/security/key/rsa/GnuRSAPublicKey.java | 188 + jce/gnu/java/security/key/rsa/RSAKeyPairGenerator.java | 246 + jce/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java | 299 + jce/gnu/java/security/key/rsa/RSAKeyPairRawCodec.java | 300 + jce/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java | 250 + jce/gnu/java/security/prng/BasePRNG.java | 178 + jce/gnu/java/security/prng/EntropySource.java | 61 + jce/gnu/java/security/prng/IRandom.java | 174 + jce/gnu/java/security/prng/LimitReachedException.java | 57 + jce/gnu/java/security/prng/MDGenerator.java | 127 + jce/gnu/java/security/prng/PRNGFactory.java | 92 + jce/gnu/java/security/prng/RandomEvent.java | 81 + jce/gnu/java/security/prng/RandomEventListener.java | 50 + jce/gnu/java/security/provider/CollectionCertStoreImpl.java | 102 + jce/gnu/java/security/provider/DefaultPolicy.java | 68 + jce/gnu/java/security/provider/Gnu.java | 306 + jce/gnu/java/security/provider/PKIXCertPathValidatorImpl.java | 693 + jce/gnu/java/security/provider/X509CertificateFactory.java | 294 + jce/gnu/java/security/provider/package.html | 46 + jce/gnu/java/security/sig/BaseSignature.java | 219 + jce/gnu/java/security/sig/ISignature.java | 160 + jce/gnu/java/security/sig/ISignatureCodec.java | 59 + jce/gnu/java/security/sig/SignatureCodecFactory.java | 226 + jce/gnu/java/security/sig/SignatureFactory.java | 101 + jce/gnu/java/security/sig/dss/DSSSignature.java | 275 + jce/gnu/java/security/sig/dss/DSSSignatureRawCodec.java | 164 + jce/gnu/java/security/sig/dss/DSSSignatureX509Codec.java | 193 + jce/gnu/java/security/sig/rsa/EME_PKCS1_V1_5.java | 274 + jce/gnu/java/security/sig/rsa/EMSA_PKCS1_V1_5.java | 243 + jce/gnu/java/security/sig/rsa/EMSA_PSS.java | 371 + jce/gnu/java/security/sig/rsa/RSA.java | 324 + jce/gnu/java/security/sig/rsa/RSAPKCS1V1_5Signature.java | 224 + jce/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureRawCodec.java | 153 + jce/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureX509Codec.java | 128 + jce/gnu/java/security/sig/rsa/RSAPSSSignature.java | 255 + jce/gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.java | 134 + jce/gnu/java/security/sig/rsa/RSASignatureFactory.java | 176 + jce/gnu/java/security/util/ByteArray.java | 109 + jce/gnu/java/security/util/ByteBufferOutputStream.java | 118 + jce/gnu/java/security/util/DerUtil.java | 64 + jce/gnu/java/security/util/ExpirableObject.java | 150 + jce/gnu/java/security/util/FormatUtil.java | 140 + jce/gnu/java/security/util/IntegerUtil.java | 109 + jce/gnu/java/security/util/PRNG.java | 141 + jce/gnu/java/security/util/Prime.java | 164 + jce/gnu/java/security/util/Sequence.java | 133 + jce/gnu/java/security/util/SimpleList.java | 155 + jce/gnu/java/security/util/Util.java | 627 + jce/gnu/java/security/util/package.html | 46 + jce/gnu/java/security/x509/GnuPKIExtension.java | 59 + jce/gnu/java/security/x509/PolicyNodeImpl.java | 214 + jce/gnu/java/security/x509/Util.java | 202 + jce/gnu/java/security/x509/X500DistinguishedName.java | 556 + jce/gnu/java/security/x509/X509CRL.java | 485 + jce/gnu/java/security/x509/X509CRLEntry.java | 273 + jce/gnu/java/security/x509/X509CRLSelectorImpl.java | 138 + jce/gnu/java/security/x509/X509CertPath.java | 303 + jce/gnu/java/security/x509/X509CertSelectorImpl.java | 197 + jce/gnu/java/security/x509/X509Certificate.java | 757 + jce/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java | 133 + jce/gnu/java/security/x509/ext/BasicConstraints.java | 129 + jce/gnu/java/security/x509/ext/CRLNumber.java | 97 + jce/gnu/java/security/x509/ext/CertificatePolicies.java | 205 + jce/gnu/java/security/x509/ext/ExtendedKeyUsage.java | 95 + jce/gnu/java/security/x509/ext/Extension.java | 297 + jce/gnu/java/security/x509/ext/GeneralName.java | 232 + jce/gnu/java/security/x509/ext/GeneralNames.java | 89 + jce/gnu/java/security/x509/ext/GeneralSubtree.java | 156 + jce/gnu/java/security/x509/ext/IssuerAlternativeNames.java | 77 + jce/gnu/java/security/x509/ext/KeyUsage.java | 92 + jce/gnu/java/security/x509/ext/NameConstraints.java | 161 + jce/gnu/java/security/x509/ext/PolicyConstraint.java | 107 + jce/gnu/java/security/x509/ext/PolicyMappings.java | 104 + jce/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java | 105 + jce/gnu/java/security/x509/ext/ReasonCode.java | 85 + jce/gnu/java/security/x509/ext/SubjectAlternativeNames.java | 77 + jce/gnu/java/security/x509/ext/SubjectKeyIdentifier.java | 84 + jce/gnu/java/security/x509/ext/package.html | 46 + jce/gnu/java/security/x509/package.html | 46 + jce/gnu/javax/crypto/RSACipherImpl.java | 347 + jce/gnu/javax/crypto/assembly/Assembly.java | 272 + jce/gnu/javax/crypto/assembly/Cascade.java | 348 + jce/gnu/javax/crypto/assembly/CascadeStage.java | 93 + jce/gnu/javax/crypto/assembly/CascadeTransformer.java | 123 + jce/gnu/javax/crypto/assembly/DeflateTransformer.java | 177 + jce/gnu/javax/crypto/assembly/Direction.java | 78 + jce/gnu/javax/crypto/assembly/LoopbackTransformer.java | 100 + jce/gnu/javax/crypto/assembly/ModeStage.java | 112 + jce/gnu/javax/crypto/assembly/Operation.java | 73 + jce/gnu/javax/crypto/assembly/PaddingTransformer.java | 164 + jce/gnu/javax/crypto/assembly/Stage.java | 202 + jce/gnu/javax/crypto/assembly/Transformer.java | 421 + jce/gnu/javax/crypto/assembly/TransformerException.java | 138 + jce/gnu/javax/crypto/cipher/Anubis.java | 491 + jce/gnu/javax/crypto/cipher/BaseCipher.java | 247 + jce/gnu/javax/crypto/cipher/Blowfish.java | 611 + jce/gnu/javax/crypto/cipher/Cast5.java | 987 + jce/gnu/javax/crypto/cipher/CipherFactory.java | 129 + jce/gnu/javax/crypto/cipher/DES.java | 652 + jce/gnu/javax/crypto/cipher/IBlockCipher.java | 195 + jce/gnu/javax/crypto/cipher/IBlockCipherSpi.java | 124 + jce/gnu/javax/crypto/cipher/Khazad.java | 449 + jce/gnu/javax/crypto/cipher/NullCipher.java | 108 + jce/gnu/javax/crypto/cipher/Rijndael.java | 704 + jce/gnu/javax/crypto/cipher/Serpent.java | 1781 + jce/gnu/javax/crypto/cipher/Square.java | 425 + jce/gnu/javax/crypto/cipher/TripleDES.java | 257 + jce/gnu/javax/crypto/cipher/Twofish.java | 737 + jce/gnu/javax/crypto/cipher/WeakKeyException.java | 59 + jce/gnu/javax/crypto/jce/DiffieHellmanImpl.java | 218 + jce/gnu/javax/crypto/jce/GnuCrypto.java | 606 + jce/gnu/javax/crypto/jce/GnuSasl.java | 124 + jce/gnu/javax/crypto/jce/PBESecretKeyFactory.java | 83 + jce/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java | 218 + jce/gnu/javax/crypto/jce/cipher/AES128KeyWrapSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/AES192KeyWrapSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/AES256KeyWrapSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.java | 88 + jce/gnu/javax/crypto/jce/cipher/AESSpi.java | 92 + jce/gnu/javax/crypto/jce/cipher/ARCFourSpi.java | 183 + jce/gnu/javax/crypto/jce/cipher/AnubisSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/BlowfishSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/Cast5Spi.java | 54 + jce/gnu/javax/crypto/jce/cipher/CipherAdapter.java | 533 + jce/gnu/javax/crypto/jce/cipher/DESSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.java | 423 + jce/gnu/javax/crypto/jce/cipher/KhazadSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/NullCipherSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/PBE.java | 229 + jce/gnu/javax/crypto/jce/cipher/PBES2.java | 1379 + jce/gnu/javax/crypto/jce/cipher/RijndaelSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/SerpentSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/SquareSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/TripleDESKeyWrapSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/TripleDESSpi.java | 54 + jce/gnu/javax/crypto/jce/cipher/TwofishSpi.java | 54 + jce/gnu/javax/crypto/jce/key/AnubisKeyGeneratorImpl.java | 50 + jce/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.java | 47 + jce/gnu/javax/crypto/jce/key/BlowfishKeyGeneratorImpl.java | 50 + jce/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java | 47 + jce/gnu/javax/crypto/jce/key/Cast5KeyGeneratorImpl.java | 50 + jce/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.java | 47 + jce/gnu/javax/crypto/jce/key/DESKeyGeneratorImpl.java | 68 + jce/gnu/javax/crypto/jce/key/DESSecretKeyFactoryImpl.java | 82 + jce/gnu/javax/crypto/jce/key/DESedeSecretKeyFactoryImpl.java | 82 + jce/gnu/javax/crypto/jce/key/KhazadKeyGeneratorImpl.java | 50 + jce/gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.java | 47 + jce/gnu/javax/crypto/jce/key/RijndaelKeyGeneratorImpl.java | 50 + jce/gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.java | 47 + jce/gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.java | 87 + jce/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java | 110 + jce/gnu/javax/crypto/jce/key/SerpentKeyGeneratorImpl.java | 50 + jce/gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.java | 47 + jce/gnu/javax/crypto/jce/key/SquareKeyGeneratorImpl.java | 50 + jce/gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.java | 47 + jce/gnu/javax/crypto/jce/key/TripleDESKeyGeneratorImpl.java | 50 + jce/gnu/javax/crypto/jce/key/TwofishKeyGeneratorImpl.java | 50 + jce/gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.java | 47 + jce/gnu/javax/crypto/jce/keyring/GnuKeyring.java | 507 + jce/gnu/javax/crypto/jce/mac/HMacHavalSpi.java | 54 + jce/gnu/javax/crypto/jce/mac/HMacMD2Spi.java | 54 + jce/gnu/javax/crypto/jce/mac/HMacMD4Spi.java | 54 + jce/gnu/javax/crypto/jce/mac/HMacMD5Spi.java | 54 + jce/gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.java | 54 + jce/gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.java | 54 + jce/gnu/javax/crypto/jce/mac/HMacSHA160Spi.java | 54 + jce/gnu/javax/crypto/jce/mac/HMacSHA256Spi.java | 54 + jce/gnu/javax/crypto/jce/mac/HMacSHA384Spi.java | 54 + jce/gnu/javax/crypto/jce/mac/HMacSHA512Spi.java | 54 + jce/gnu/javax/crypto/jce/mac/HMacTigerSpi.java | 54 + jce/gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.java | 54 + jce/gnu/javax/crypto/jce/mac/MacAdapter.java | 136 + jce/gnu/javax/crypto/jce/mac/OMacAnubisImpl.java | 50 + jce/gnu/javax/crypto/jce/mac/OMacBlowfishImpl.java | 50 + jce/gnu/javax/crypto/jce/mac/OMacCast5Impl.java | 50 + jce/gnu/javax/crypto/jce/mac/OMacDESImpl.java | 50 + jce/gnu/javax/crypto/jce/mac/OMacImpl.java | 140 + jce/gnu/javax/crypto/jce/mac/OMacKhazadImpl.java | 50 + jce/gnu/javax/crypto/jce/mac/OMacRijndaelImpl.java | 50 + jce/gnu/javax/crypto/jce/mac/OMacSerpentImpl.java | 50 + jce/gnu/javax/crypto/jce/mac/OMacSquareImpl.java | 50 + jce/gnu/javax/crypto/jce/mac/OMacTripleDESImpl.java | 50 + jce/gnu/javax/crypto/jce/mac/OMacTwofishImpl.java | 50 + jce/gnu/javax/crypto/jce/mac/TMMH16Spi.java | 81 + jce/gnu/javax/crypto/jce/mac/UHash32Spi.java | 54 + jce/gnu/javax/crypto/jce/mac/UMac32Spi.java | 79 + jce/gnu/javax/crypto/jce/params/BlockCipherParameters.java | 149 + jce/gnu/javax/crypto/jce/params/DEREncodingException.java | 54 + jce/gnu/javax/crypto/jce/params/DERReader.java | 139 + jce/gnu/javax/crypto/jce/params/DERWriter.java | 143 + jce/gnu/javax/crypto/jce/prng/ARCFourRandomSpi.java | 101 + jce/gnu/javax/crypto/jce/prng/CSPRNGSpi.java | 96 + jce/gnu/javax/crypto/jce/prng/FortunaImpl.java | 87 + jce/gnu/javax/crypto/jce/prng/ICMRandomSpi.java | 217 + jce/gnu/javax/crypto/jce/prng/UMacRandomSpi.java | 168 + jce/gnu/javax/crypto/jce/sig/DHKeyFactory.java | 219 + jce/gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java | 93 + jce/gnu/javax/crypto/jce/sig/DHParameters.java | 220 + jce/gnu/javax/crypto/jce/sig/DHParametersGenerator.java | 152 + jce/gnu/javax/crypto/jce/spec/BlockCipherParameterSpec.java | 122 + jce/gnu/javax/crypto/jce/spec/TMMHParameterSpec.java | 117 + jce/gnu/javax/crypto/jce/spec/UMac32ParameterSpec.java | 73 + jce/gnu/javax/crypto/key/BaseKeyAgreementParty.java | 168 + jce/gnu/javax/crypto/key/GnuPBEKey.java | 96 + jce/gnu/javax/crypto/key/GnuSecretKey.java | 131 + jce/gnu/javax/crypto/key/IKeyAgreementParty.java | 100 + jce/gnu/javax/crypto/key/IncomingMessage.java | 318 + jce/gnu/javax/crypto/key/KeyAgreementException.java | 166 + jce/gnu/javax/crypto/key/KeyAgreementFactory.java | 143 + jce/gnu/javax/crypto/key/OutgoingMessage.java | 234 + jce/gnu/javax/crypto/key/dh/DHKeyPairPKCS8Codec.java | 240 + jce/gnu/javax/crypto/key/dh/DHKeyPairRawCodec.java | 336 + jce/gnu/javax/crypto/key/dh/DHKeyPairX509Codec.java | 255 + jce/gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.java | 119 + jce/gnu/javax/crypto/key/dh/DiffieHellmanReceiver.java | 117 + jce/gnu/javax/crypto/key/dh/DiffieHellmanSender.java | 126 + jce/gnu/javax/crypto/key/dh/ElGamalKeyAgreement.java | 115 + jce/gnu/javax/crypto/key/dh/ElGamalReceiver.java | 99 + jce/gnu/javax/crypto/key/dh/ElGamalSender.java | 112 + jce/gnu/javax/crypto/key/dh/GnuDHKey.java | 174 + jce/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java | 235 + jce/gnu/javax/crypto/key/dh/GnuDHPrivateKey.java | 200 + jce/gnu/javax/crypto/key/dh/GnuDHPublicKey.java | 196 + jce/gnu/javax/crypto/key/dh/RFC2631.java | 217 + jce/gnu/javax/crypto/key/srp6/SRP6Host.java | 161 + jce/gnu/javax/crypto/key/srp6/SRP6KeyAgreement.java | 141 + jce/gnu/javax/crypto/key/srp6/SRP6SaslClient.java | 90 + jce/gnu/javax/crypto/key/srp6/SRP6SaslServer.java | 90 + jce/gnu/javax/crypto/key/srp6/SRP6TLSClient.java | 155 + jce/gnu/javax/crypto/key/srp6/SRP6TLSServer.java | 177 + jce/gnu/javax/crypto/key/srp6/SRP6User.java | 163 + jce/gnu/javax/crypto/key/srp6/SRPAlgorithm.java | 131 + jce/gnu/javax/crypto/key/srp6/SRPKey.java | 147 + jce/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java | 282 + jce/gnu/javax/crypto/key/srp6/SRPKeyPairRawCodec.java | 334 + jce/gnu/javax/crypto/key/srp6/SRPPrivateKey.java | 227 + jce/gnu/javax/crypto/key/srp6/SRPPublicKey.java | 175 + jce/gnu/javax/crypto/keyring/AuthenticatedEntry.java | 176 + jce/gnu/javax/crypto/keyring/BaseKeyring.java | 158 + jce/gnu/javax/crypto/keyring/BinaryDataEntry.java | 111 + jce/gnu/javax/crypto/keyring/CertPathEntry.java | 112 + jce/gnu/javax/crypto/keyring/CertificateEntry.java | 128 + jce/gnu/javax/crypto/keyring/CompressedEntry.java | 93 + jce/gnu/javax/crypto/keyring/EncryptedEntry.java | 191 + jce/gnu/javax/crypto/keyring/Entry.java | 179 + jce/gnu/javax/crypto/keyring/EnvelopeEntry.java | 439 + jce/gnu/javax/crypto/keyring/GnuPrivateKeyring.java | 368 + jce/gnu/javax/crypto/keyring/GnuPublicKeyring.java | 151 + jce/gnu/javax/crypto/keyring/IKeyring.java | 162 + jce/gnu/javax/crypto/keyring/IPrivateKeyring.java | 144 + jce/gnu/javax/crypto/keyring/IPublicKeyring.java | 82 + jce/gnu/javax/crypto/keyring/MalformedKeyringException.java | 55 + jce/gnu/javax/crypto/keyring/MaskableEnvelopeEntry.java | 135 + jce/gnu/javax/crypto/keyring/MeteredInputStream.java | 127 + jce/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java | 286 + jce/gnu/javax/crypto/keyring/PasswordEncryptedEntry.java | 293 + jce/gnu/javax/crypto/keyring/PasswordProtectedEntry.java | 57 + jce/gnu/javax/crypto/keyring/PrimitiveEntry.java | 112 + jce/gnu/javax/crypto/keyring/PrivateKeyEntry.java | 194 + jce/gnu/javax/crypto/keyring/Properties.java | 203 + jce/gnu/javax/crypto/keyring/PublicKeyEntry.java | 162 + jce/gnu/javax/crypto/kwa/AESKeyWrap.java | 168 + jce/gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.java | 145 + jce/gnu/javax/crypto/kwa/IKeyWrappingAlgorithm.java | 160 + jce/gnu/javax/crypto/kwa/KeyUnwrappingException.java | 67 + jce/gnu/javax/crypto/kwa/KeyWrappingAlgorithmFactory.java | 110 + jce/gnu/javax/crypto/kwa/TripleDESKeyWrap.java | 292 + jce/gnu/javax/crypto/mac/BaseMac.java | 127 + jce/gnu/javax/crypto/mac/HMac.java | 263 + jce/gnu/javax/crypto/mac/HMacFactory.java | 111 + jce/gnu/javax/crypto/mac/IMac.java | 181 + jce/gnu/javax/crypto/mac/MacFactory.java | 130 + jce/gnu/javax/crypto/mac/MacInputStream.java | 124 + jce/gnu/javax/crypto/mac/MacOutputStream.java | 123 + jce/gnu/javax/crypto/mac/OMAC.java | 303 + jce/gnu/javax/crypto/mac/TMMH16.java | 339 + jce/gnu/javax/crypto/mac/UHash32.java | 758 + jce/gnu/javax/crypto/mac/UMac32.java | 418 + jce/gnu/javax/crypto/mode/BaseMode.java | 293 + jce/gnu/javax/crypto/mode/CBC.java | 123 + jce/gnu/javax/crypto/mode/CFB.java | 155 + jce/gnu/javax/crypto/mode/CTR.java | 168 + jce/gnu/javax/crypto/mode/EAX.java | 289 + jce/gnu/javax/crypto/mode/ECB.java | 121 + jce/gnu/javax/crypto/mode/IAuthenticatedMode.java | 56 + jce/gnu/javax/crypto/mode/ICM.java | 181 + jce/gnu/javax/crypto/mode/IMode.java | 123 + jce/gnu/javax/crypto/mode/ModeFactory.java | 151 + jce/gnu/javax/crypto/mode/OFB.java | 174 + jce/gnu/javax/crypto/pad/BasePad.java | 191 + jce/gnu/javax/crypto/pad/IPad.java | 127 + jce/gnu/javax/crypto/pad/ISO10126.java | 109 + jce/gnu/javax/crypto/pad/PKCS1_V1_5.java | 156 + jce/gnu/javax/crypto/pad/PKCS7.java | 111 + jce/gnu/javax/crypto/pad/PadFactory.java | 120 + jce/gnu/javax/crypto/pad/SSL3.java | 90 + jce/gnu/javax/crypto/pad/TBC.java | 118 + jce/gnu/javax/crypto/pad/TLS1.java | 91 + jce/gnu/javax/crypto/pad/WrongPaddingException.java | 48 + jce/gnu/javax/crypto/prng/ARCFour.java | 137 + jce/gnu/javax/crypto/prng/CSPRNG.java | 985 + jce/gnu/javax/crypto/prng/Fortuna.java | 349 + jce/gnu/javax/crypto/prng/ICMGenerator.java | 297 + jce/gnu/javax/crypto/prng/IPBE.java | 81 + jce/gnu/javax/crypto/prng/PBKDF2.java | 184 + jce/gnu/javax/crypto/prng/PRNGFactory.java | 115 + jce/gnu/javax/crypto/prng/UMacGenerator.java | 186 + jce/gnu/javax/crypto/sasl/AuthInfo.java | 129 + jce/gnu/javax/crypto/sasl/AuthInfoProviderFactory.java | 67 + jce/gnu/javax/crypto/sasl/ClientFactory.java | 168 + jce/gnu/javax/crypto/sasl/ClientMechanism.java | 293 + jce/gnu/javax/crypto/sasl/ConfidentialityException.java | 82 + jce/gnu/javax/crypto/sasl/IAuthInfoProvider.java | 116 + jce/gnu/javax/crypto/sasl/IAuthInfoProviderFactory.java | 55 + jce/gnu/javax/crypto/sasl/IllegalMechanismStateException.java | 84 + jce/gnu/javax/crypto/sasl/InputBuffer.java | 272 + jce/gnu/javax/crypto/sasl/IntegrityException.java | 83 + jce/gnu/javax/crypto/sasl/NoSuchMechanismException.java | 62 + jce/gnu/javax/crypto/sasl/NoSuchUserException.java | 67 + jce/gnu/javax/crypto/sasl/OutputBuffer.java | 198 + jce/gnu/javax/crypto/sasl/SaslEncodingException.java | 66 + jce/gnu/javax/crypto/sasl/SaslInputStream.java | 393 + jce/gnu/javax/crypto/sasl/SaslOutputStream.java | 175 + jce/gnu/javax/crypto/sasl/SaslUtil.java | 75 + jce/gnu/javax/crypto/sasl/ServerFactory.java | 158 + jce/gnu/javax/crypto/sasl/ServerMechanism.java | 294 + jce/gnu/javax/crypto/sasl/UserAlreadyExistsException.java | 70 + jce/gnu/javax/crypto/sasl/anonymous/AnonymousClient.java | 102 + jce/gnu/javax/crypto/sasl/anonymous/AnonymousServer.java | 90 + jce/gnu/javax/crypto/sasl/anonymous/AnonymousUtil.java | 83 + jce/gnu/javax/crypto/sasl/crammd5/CramMD5AuthInfoProvider.java | 166 + jce/gnu/javax/crypto/sasl/crammd5/CramMD5Client.java | 168 + jce/gnu/javax/crypto/sasl/crammd5/CramMD5Registry.java | 60 + jce/gnu/javax/crypto/sasl/crammd5/CramMD5Server.java | 158 + jce/gnu/javax/crypto/sasl/crammd5/CramMD5Util.java | 120 + jce/gnu/javax/crypto/sasl/crammd5/PasswordFile.java | 238 + jce/gnu/javax/crypto/sasl/plain/PasswordFile.java | 243 + jce/gnu/javax/crypto/sasl/plain/PlainAuthInfoProvider.java | 166 + jce/gnu/javax/crypto/sasl/plain/PlainClient.java | 154 + jce/gnu/javax/crypto/sasl/plain/PlainRegistry.java | 57 + jce/gnu/javax/crypto/sasl/plain/PlainServer.java | 155 + jce/gnu/javax/crypto/sasl/srp/CALG.java | 221 + jce/gnu/javax/crypto/sasl/srp/ClientStore.java | 155 + jce/gnu/javax/crypto/sasl/srp/IALG.java | 128 + jce/gnu/javax/crypto/sasl/srp/KDF.java | 140 + jce/gnu/javax/crypto/sasl/srp/PasswordFile.java | 625 + jce/gnu/javax/crypto/sasl/srp/SRP.java | 255 + jce/gnu/javax/crypto/sasl/srp/SRPAuthInfoProvider.java | 177 + jce/gnu/javax/crypto/sasl/srp/SRPClient.java | 952 + jce/gnu/javax/crypto/sasl/srp/SRPRegistry.java | 165 + jce/gnu/javax/crypto/sasl/srp/SRPServer.java | 840 + jce/gnu/javax/crypto/sasl/srp/SecurityContext.java | 140 + jce/gnu/javax/crypto/sasl/srp/ServerStore.java | 175 + jce/gnu/javax/crypto/sasl/srp/StoreEntry.java | 75 + jce/gnu/javax/security/auth/Password.java | 285 + jce/gnu/javax/security/auth/callback/AbstractCallbackHandler.java | 295 + jce/gnu/javax/security/auth/callback/CertificateCallback.java | 64 + jce/gnu/javax/security/auth/callback/ConsoleCallbackHandler.java | 299 + jce/gnu/javax/security/auth/callback/DefaultCallbackHandler.java | 109 + jce/gnu/javax/security/auth/callback/GnuCallbacks.java | 65 + jce/gnu/javax/security/auth/login/ConfigFileParser.java | 346 + jce/gnu/javax/security/auth/login/ConfigFileTokenizer.java | 244 + jce/gnu/javax/security/auth/login/GnuConfiguration.java | 466 + jce/javax/crypto/BadPaddingException.java | 79 + jce/javax/crypto/Cipher.java | 1154 + jce/javax/crypto/CipherInputStream.java | 368 + jce/javax/crypto/CipherOutputStream.java | 154 + jce/javax/crypto/CipherSpi.java | 445 + jce/javax/crypto/EncryptedPrivateKeyInfo.java | 317 + jce/javax/crypto/ExemptionMechanism.java | 274 + jce/javax/crypto/ExemptionMechanismException.java | 78 + jce/javax/crypto/ExemptionMechanismSpi.java | 149 + jce/javax/crypto/IllegalBlockSizeException.java | 71 + jce/javax/crypto/KeyAgreement.java | 378 + jce/javax/crypto/KeyAgreementSpi.java | 160 + jce/javax/crypto/KeyGenerator.java | 298 + jce/javax/crypto/KeyGeneratorSpi.java | 112 + jce/javax/crypto/Mac.java | 434 + jce/javax/crypto/MacSpi.java | 163 + jce/javax/crypto/NoSuchPaddingException.java | 71 + jce/javax/crypto/NullCipher.java | 62 + jce/javax/crypto/NullCipherImpl.java | 127 + jce/javax/crypto/SealedObject.java | 355 + jce/javax/crypto/SecretKey.java | 65 + jce/javax/crypto/SecretKeyFactory.java | 255 + jce/javax/crypto/SecretKeyFactorySpi.java | 108 + jce/javax/crypto/ShortBufferException.java | 70 + jce/javax/crypto/interfaces/DHKey.java | 61 + jce/javax/crypto/interfaces/DHPrivateKey.java | 69 + jce/javax/crypto/interfaces/DHPublicKey.java | 68 + jce/javax/crypto/interfaces/PBEKey.java | 90 + jce/javax/crypto/spec/DESKeySpec.java | 220 + jce/javax/crypto/spec/DESedeKeySpec.java | 151 + jce/javax/crypto/spec/DHGenParameterSpec.java | 100 + jce/javax/crypto/spec/DHParameterSpec.java | 135 + jce/javax/crypto/spec/DHPrivateKeySpec.java | 115 + jce/javax/crypto/spec/DHPublicKeySpec.java | 115 + jce/javax/crypto/spec/IvParameterSpec.java | 96 + jce/javax/crypto/spec/OAEPParameterSpec.java | 78 + jce/javax/crypto/spec/PBEKeySpec.java | 292 + jce/javax/crypto/spec/PBEParameterSpec.java | 100 + jce/javax/crypto/spec/PSource.java | 69 + jce/javax/crypto/spec/RC2ParameterSpec.java | 166 + jce/javax/crypto/spec/RC5ParameterSpec.java | 202 + jce/javax/crypto/spec/SecretKeySpec.java | 163 + jce/sun/security/internal/interfaces/TlsMasterSecret.java | 44 + jce/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java | 78 + jce/sun/security/internal/spec/TlsKeyMaterialSpec.java | 118 + jce/sun/security/internal/spec/TlsMasterSecretParameterSpec.java | 60 + jce/sun/security/internal/spec/TlsPrfParameterSpec.java | 58 + jce/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java | 69 + patches/icedtea-ant.patch | 106 - patches/icedtea-antialias.patch | 60 + patches/icedtea-assembler_amd64.patch | 16 + patches/icedtea-bytebuffer-compact.patch | 82 - patches/icedtea-bytecodeInterpreter.patch | 36 - patches/icedtea-bytecodeInterpreterWithChecks.patch | 18 - patches/icedtea-cacao-Compiler-gcc-gmk.patch | 46 + patches/icedtea-cacao-Defs-linux-gmk.patch | 13 + patches/icedtea-cacao-Platform-gmk.patch | 32 + patches/icedtea-cacao-Program-gmk.patch | 13 + patches/icedtea-cacao-docs-Makefile.patch | 30 + patches/icedtea-cacao-instrument-Makefile.patch | 13 + patches/icedtea-cacao-java-c.patch | 14 + patches/icedtea-cacao-jvm-cfg.patch | 87 + patches/icedtea-cacao.patch | 13 - patches/icedtea-certbundle.patch | 221 +- patches/icedtea-copy-plugs.patch | 142 +- patches/icedtea-corba.patch | 14 - patches/icedtea-core-build.patch | 334 - patches/icedtea-debuginfo.patch | 66 +- patches/icedtea-demos.patch | 32 +- patches/icedtea-ecj-bootstrap.patch | 366 + patches/icedtea-ecj.patch | 1025 - patches/icedtea-float-double-trailing-zeros.patch | 29 - patches/icedtea-gcc-4.3.patch | 84 - patches/icedtea-gcc-suffix.patch | 72 - patches/icedtea-generated.patch | 10 - patches/icedtea-graphics.patch | 187 +- patches/icedtea-gtkplaf.patch | 23 - patches/icedtea-headers.patch | 50 - patches/icedtea-hotspot-6b06-7b24.patch | 201186 ---------- patches/icedtea-hotspot7-build-fixes.patch | 64 - patches/icedtea-java.security.patch | 30 + patches/icedtea-javafiles.patch | 157 - patches/icedtea-lcms-leak.patch | 11 - patches/icedtea-lesstif-64.patch | 29 - patches/icedtea-lesstif_amd64.patch | 29 + patches/icedtea-lib64.patch | 15 - patches/icedtea-libpng.patch | 11 + patches/icedtea-libraries.patch | 25548 - patches/icedtea-license-headers.patch | 239 +- patches/icedtea-linker-options.patch | 48 - patches/icedtea-memory-limits.patch | 21 - patches/icedtea-netx-plugin.patch | 49 - patches/icedtea-paths.patch | 624 + patches/icedtea-plugin.patch | 1280 + patches/icedtea-ports.patch | 243 - patches/icedtea-print-lsb-release.patch | 48 - patches/icedtea-rmi_amd64.patch | 4 +- patches/icedtea-signature-iterator.patch | 44 - patches/icedtea-signed-types.patch | 24 - patches/icedtea-speed.patch | 40 +- patches/icedtea-ssl.patch | 61 +- patches/icedtea-static-libstdc++.patch | 33 - patches/icedtea-sunsrc.patch | 67 - patches/icedtea-test-atomic-operations.patch | 25 - patches/icedtea-text-relocations.patch | 2 +- patches/icedtea-timerqueue.patch | 18 - patches/icedtea-tools.patch | 32 +- patches/icedtea-use-system-tzdata.patch | 59 - patches/icedtea-version.patch | 74 +- patches/icedtea-webservices.patch | 1373 - patches/icedtea-zero-build.patch | 132 - patches/icedtea-zero.patch | 135 - platform_zero.in | 17 - ports/hotspot/build/linux/makefiles/zero.make | 41 - ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp | 87 - ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp | 70 - ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp | 55 - ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp | 157 - ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp | 278 - ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp | 32 - ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp | 25 - ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp | 307 - ports/hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp | 27 - ports/hotspot/src/cpu/zero/vm/copy_zero.hpp | 166 - ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 752 - ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp | 37 - ports/hotspot/src/cpu/zero/vm/debug_zero.cpp | 32 - ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp | 44 - ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp | 38 - ports/hotspot/src/cpu/zero/vm/dump_zero.cpp | 37 - ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp | 62 - ports/hotspot/src/cpu/zero/vm/frame_zero.cpp | 118 - ports/hotspot/src/cpu/zero/vm/frame_zero.hpp | 51 - ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp | 154 - ports/hotspot/src/cpu/zero/vm/globals_zero.hpp | 54 - ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp | 52 - ports/hotspot/src/cpu/zero/vm/icache_zero.cpp | 36 - ports/hotspot/src/cpu/zero/vm/icache_zero.hpp | 33 - ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp | 31 - ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp | 68 - ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp | 37 - ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 170 - ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp | 144 - ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp | 63 - ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp | 59 - ports/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp | 78 - ports/hotspot/src/cpu/zero/vm/javaStack_zero.hpp | 159 - ports/hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp | 67 - ports/hotspot/src/cpu/zero/vm/jniTypes_zero.hpp | 108 - ports/hotspot/src/cpu/zero/vm/jni_zero.h | 32 - ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp | 222 - ports/hotspot/src/cpu/zero/vm/registerMap_zero.hpp | 39 - ports/hotspot/src/cpu/zero/vm/register_zero.cpp | 39 - ports/hotspot/src/cpu/zero/vm/register_zero.hpp | 114 - ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp | 68 - ports/hotspot/src/cpu/zero/vm/relocInfo_zero.hpp | 33 - ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp | 116 - ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp | 169 - ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp | 254 - ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp | 31 - ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp | 50 - ports/hotspot/src/cpu/zero/vm/vmStructs_zero.hpp | 52 - ports/hotspot/src/cpu/zero/vm/vm_version_zero.hpp | 32 - ports/hotspot/src/cpu/zero/vm/vmreg_zero.cpp | 67 - ports/hotspot/src/cpu/zero/vm/vmreg_zero.hpp | 29 - ports/hotspot/src/cpu/zero/vm/vmreg_zero.inline.hpp | 32 - ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp | 47 - ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp | 160 - ports/hotspot/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp | 43 - ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp | 43 - ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp | 101 - ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 372 - ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp | 31 - ports/hotspot/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp | 32 - ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp | 42 - ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp | 32 - ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 100 - ports/hotspot/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp | 45 - ports/jdk/src/solaris/bin/alpha/jvm.cfg | 45 - ports/jdk/src/solaris/bin/arm/jvm.cfg | 45 - ports/jdk/src/solaris/bin/ergo_alpha.c | 58 - ports/jdk/src/solaris/bin/ergo_arm.c | 58 - ports/jdk/src/solaris/bin/ergo_ia64.c | 58 - ports/jdk/src/solaris/bin/ergo_mips.c | 58 - ports/jdk/src/solaris/bin/ergo_ppc.c | 58 - ports/jdk/src/solaris/bin/ergo_s390.c | 58 - ports/jdk/src/solaris/bin/mips/jvm.cfg | 45 - ports/jdk/src/solaris/bin/ppc/jvm.cfg | 45 - ports/jdk/src/solaris/bin/ppc64/jvm.cfg | 45 - ports/jdk/src/solaris/bin/s390/jvm.cfg | 45 - ports/jdk/src/solaris/bin/s390x/jvm.cfg | 45 - rt/com/sun/media/sound/AutoConnectSequencer.java | 50 + rt/com/sun/media/sound/DataPusher.java | 62 + rt/com/sun/media/sound/DirectAudioDevice.java | 45 + rt/com/sun/media/sound/DirectAudioDeviceProvider.java | 45 + rt/com/sun/media/sound/JDK13Services.java | 62 + rt/com/sun/media/sound/JavaSoundAudioClip.java | 68 + rt/com/sun/media/sound/MidiInDevice.java | 45 + rt/com/sun/media/sound/MidiInDeviceProvider.java | 45 + rt/com/sun/media/sound/MidiOutDevice.java | 44 + rt/com/sun/media/sound/MidiOutDeviceProvider.java | 45 + rt/com/sun/media/sound/MidiUtils.java | 59 + rt/com/sun/media/sound/MixerSequencer.java | 188 - rt/com/sun/media/sound/MixerSynth.java | 10 - rt/com/sun/media/sound/Platform.java | 45 + rt/com/sun/media/sound/PortMixer.java | 45 + rt/com/sun/media/sound/PortMixerProvider.java | 45 + rt/com/sun/media/sound/ReferenceCountingDevice.java | 57 + rt/com/sun/media/sound/Toolkit.java | 50 + rt/com/sun/script/javascript/ClassShutter.java | 43 + rt/com/sun/script/javascript/Context.java | 170 + rt/com/sun/script/javascript/ContextFactory.java | 60 + rt/com/sun/script/javascript/Function.java | 48 + rt/com/sun/script/javascript/ImporterTopLevel.java | 131 + rt/com/sun/script/javascript/JavaScriptException.java | 54 + rt/com/sun/script/javascript/LazilyLoadedCtor.java | 47 + rt/com/sun/script/javascript/NativeArray.java | 54 + rt/com/sun/script/javascript/NativeJavaClass.java | 44 + rt/com/sun/script/javascript/NativeJavaObject.java | 127 + rt/com/sun/script/javascript/RhinoException.java | 59 + rt/com/sun/script/javascript/Script.java | 48 + rt/com/sun/script/javascript/ScriptRuntime.java | 54 + rt/com/sun/script/javascript/Scriptable.java | 70 + rt/com/sun/script/javascript/ScriptableObject.java | 107 + rt/com/sun/script/javascript/Undefined.java | 42 + rt/com/sun/script/javascript/WrapFactory.java | 48 + rt/gnu/java/awt/BitMaskExtent.java | 79 + rt/gnu/java/awt/Buffers.java | 225 + rt/gnu/java/awt/CubicSegment.java | 184 + rt/gnu/java/awt/LineSegment.java | 118 + rt/gnu/java/awt/QuadSegment.java | 264 + rt/gnu/java/awt/Segment.java | 158 + rt/gnu/java/awt/color/CieXyzConverter.java | 73 + rt/gnu/java/awt/color/ClutProfileConverter.java | 152 + rt/gnu/java/awt/color/ColorLookUpTable.java | 429 + rt/gnu/java/awt/color/ColorSpaceConverter.java | 69 + rt/gnu/java/awt/color/GrayProfileConverter.java | 137 + rt/gnu/java/awt/color/GrayScaleConverter.java | 110 + rt/gnu/java/awt/color/LinearRGBConverter.java | 152 + rt/gnu/java/awt/color/ProfileHeader.java | 398 + rt/gnu/java/awt/color/PyccConverter.java | 72 + rt/gnu/java/awt/color/RgbProfileConverter.java | 244 + rt/gnu/java/awt/color/SrgbConverter.java | 152 + rt/gnu/java/awt/color/TagEntry.java | 121 + rt/gnu/java/awt/color/ToneReproductionCurve.java | 177 + rt/gnu/java/io/Base64InputStream.java | 220 + rt/gnu/java/security/provider/Gnu.java | 306 + rt/java/awt/color/CMMException.java | 63 + rt/java/awt/color/ColorSpace.java | 190 + rt/java/awt/color/ICC_ColorSpace.java | 314 + rt/java/awt/color/ICC_Profile.java | 1284 + rt/java/awt/color/ICC_ProfileGray.java | 133 + rt/java/awt/color/ICC_ProfileRGB.java | 227 + rt/java/awt/image/BandedSampleModel.java | 758 + rt/java/awt/image/ColorConvertOp.java | 537 + rt/java/awt/image/ComponentSampleModel.java | 762 + rt/java/awt/image/DataBuffer.java | 473 + rt/java/awt/image/DataBufferByte.java | 245 + rt/java/awt/image/DataBufferInt.java | 244 + rt/java/awt/image/DataBufferShort.java | 245 + rt/java/awt/image/DataBufferUShort.java | 246 + rt/java/awt/image/MultiPixelPackedSampleModel.java | 602 + rt/java/awt/image/Raster.java | 1152 + rt/java/awt/image/RenderedImage.java | 70 + rt/java/awt/image/SampleModel.java | 981 + rt/java/awt/image/SinglePixelPackedSampleModel.java | 597 + rt/java/awt/image/WritableRaster.java | 436 + rt/java/awt/image/WritableRenderedImage.java | 56 + rt/java/awt/image/renderable/ContextualRenderedImageFactory.java | 56 + rt/java/awt/image/renderable/RenderContext.java | 141 + rt/java/awt/image/renderable/RenderableImage.java | 62 + rt/java/awt/image/renderable/RenderableImageOp.java | 157 + rt/java/awt/image/renderable/RenderableImageProducer.java | 166 + rt/java/awt/image/renderable/RenderedImageFactory.java | 47 + rt/javax/jnlp/BasicService.java | 13 - rt/javax/jnlp/ClipboardService.java | 11 - rt/javax/jnlp/DownloadService.java | 25 - rt/javax/jnlp/DownloadServiceListener.java | 13 - rt/javax/jnlp/ExtensionInstallerService.java | 22 - rt/javax/jnlp/FileContents.java | 18 - rt/javax/jnlp/FileOpenService.java | 11 - rt/javax/jnlp/FileSaveService.java | 11 - rt/javax/jnlp/JNLPRandomAccessFile.java | 46 - rt/javax/jnlp/PersistenceService.java | 18 - rt/javax/jnlp/PrintService.java | 13 - rt/javax/jnlp/ServiceManager.java | 54 - rt/javax/jnlp/ServiceManagerStub.java | 11 - rt/javax/jnlp/UnavailableServiceException.java | 16 - rt/javax/script/Synchronizer.java | 49 + rt/net/sourceforge/jnlp/AppletDesc.java | 125 - rt/net/sourceforge/jnlp/ApplicationDesc.java | 76 - rt/net/sourceforge/jnlp/ComponentDesc.java | 43 - rt/net/sourceforge/jnlp/DefaultLaunchHandler.java | 116 - rt/net/sourceforge/jnlp/ExtensionDesc.java | 146 - rt/net/sourceforge/jnlp/IconDesc.java | 135 - rt/net/sourceforge/jnlp/InformationDesc.java | 241 - rt/net/sourceforge/jnlp/InstallerDesc.java | 54 - rt/net/sourceforge/jnlp/JARDesc.java | 131 - rt/net/sourceforge/jnlp/JNLPFile.java | 512 - rt/net/sourceforge/jnlp/JREDesc.java | 123 - rt/net/sourceforge/jnlp/LaunchException.java | 190 - rt/net/sourceforge/jnlp/LaunchHandler.java | 68 - rt/net/sourceforge/jnlp/Launcher.java | 583 - rt/net/sourceforge/jnlp/NetxPanel.java | 159 - rt/net/sourceforge/jnlp/PackageDesc.java | 105 - rt/net/sourceforge/jnlp/ParseException.java | 94 - rt/net/sourceforge/jnlp/Parser.java | 1101 - rt/net/sourceforge/jnlp/PluginBridge.java | 188 - rt/net/sourceforge/jnlp/PropertyDesc.java | 66 - rt/net/sourceforge/jnlp/ResourcesDesc.java | 231 - rt/net/sourceforge/jnlp/SecurityDesc.java | 173 - rt/net/sourceforge/jnlp/Version.java | 354 - rt/net/sourceforge/jnlp/cache/CacheEntry.java | 174 - rt/net/sourceforge/jnlp/cache/CacheUtil.java | 391 - rt/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java | 318 - rt/net/sourceforge/jnlp/cache/DownloadIndicator.java | 92 - rt/net/sourceforge/jnlp/cache/Resource.java | 259 - rt/net/sourceforge/jnlp/cache/ResourceTracker.java | 926 - rt/net/sourceforge/jnlp/cache/UpdatePolicy.java | 89 - rt/net/sourceforge/jnlp/cache/package.html | 28 - rt/net/sourceforge/jnlp/event/ApplicationEvent.java | 57 - rt/net/sourceforge/jnlp/event/ApplicationListener.java | 38 - rt/net/sourceforge/jnlp/event/DownloadEvent.java | 72 - rt/net/sourceforge/jnlp/event/DownloadListener.java | 51 - rt/net/sourceforge/jnlp/event/package.html | 28 - rt/net/sourceforge/jnlp/package.html | 30 - rt/net/sourceforge/jnlp/resources/Manifest.mf | 6 - rt/net/sourceforge/jnlp/resources/Messages.properties | 159 - rt/net/sourceforge/jnlp/resources/about.jnlp | 20 - rt/net/sourceforge/jnlp/resources/default.jnlp | 20 - rt/net/sourceforge/jnlp/resources/install.png | Bin rt/net/sourceforge/jnlp/resources/netx-icon.png | Bin rt/net/sourceforge/jnlp/runtime/AppThreadGroup.java | 68 - rt/net/sourceforge/jnlp/runtime/AppletAudioClip.java | 109 - rt/net/sourceforge/jnlp/runtime/AppletEnvironment.java | 343 - rt/net/sourceforge/jnlp/runtime/AppletInstance.java | 139 - rt/net/sourceforge/jnlp/runtime/ApplicationInstance.java | 248 - rt/net/sourceforge/jnlp/runtime/Boot.java | 415 - rt/net/sourceforge/jnlp/runtime/Boot13.java | 103 - rt/net/sourceforge/jnlp/runtime/InstallDialog.java | 169 - rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 781 - rt/net/sourceforge/jnlp/runtime/JNLPPolicy.java | 89 - rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 469 - rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 349 - rt/net/sourceforge/jnlp/runtime/package.html | 29 - rt/net/sourceforge/jnlp/security/AccessWarningPane.java | 199 - rt/net/sourceforge/jnlp/security/AppletWarningPane.java | 120 - rt/net/sourceforge/jnlp/security/CertWarningPane.java | 263 - rt/net/sourceforge/jnlp/security/CertsInfoPane.java | 357 - rt/net/sourceforge/jnlp/security/MoreInfoPane.java | 110 - rt/net/sourceforge/jnlp/security/SecurityDialogUI.java | 197 - rt/net/sourceforge/jnlp/security/SecurityUtil.java | 200 - rt/net/sourceforge/jnlp/security/SecurityWarningDialog.java | 389 - rt/net/sourceforge/jnlp/security/SingleCertInfoPane.java | 77 - rt/net/sourceforge/jnlp/security/viewer/CertificatePane.java | 358 - rt/net/sourceforge/jnlp/security/viewer/CertificateViewer.java | 148 - rt/net/sourceforge/jnlp/services/ServiceUtil.java | 200 - rt/net/sourceforge/jnlp/services/XBasicService.java | 174 - rt/net/sourceforge/jnlp/services/XClipboardService.java | 81 - rt/net/sourceforge/jnlp/services/XDownloadService.java | 181 - rt/net/sourceforge/jnlp/services/XExtensionInstallerService.java | 123 - rt/net/sourceforge/jnlp/services/XFileContents.java | 122 - rt/net/sourceforge/jnlp/services/XFileOpenService.java | 113 - rt/net/sourceforge/jnlp/services/XFileSaveService.java | 140 - rt/net/sourceforge/jnlp/services/XPersistenceService.java | 176 - rt/net/sourceforge/jnlp/services/XServiceManagerStub.java | 102 - rt/net/sourceforge/jnlp/services/package.html | 29 - rt/net/sourceforge/jnlp/tools/CharacterEncoder.java | 354 - rt/net/sourceforge/jnlp/tools/HexDumpEncoder.java | 120 - rt/net/sourceforge/jnlp/tools/JarRunner.java | 15 - rt/net/sourceforge/jnlp/tools/JarSigner.java | 515 - rt/net/sourceforge/jnlp/tools/JarSignerResources.java | 212 - rt/net/sourceforge/jnlp/tools/KeyStoreUtil.java | 69 - rt/net/sourceforge/jnlp/tools/KeyTool.java | 479 - rt/net/sourceforge/jnlp/util/PropertiesFile.java | 148 - rt/net/sourceforge/jnlp/util/Reflect.java | 148 - rt/net/sourceforge/jnlp/util/WeakList.java | 128 - rt/net/sourceforge/nanoxml/XMLElement.java | 1205 - rt/net/sourceforge/nanoxml/XMLParseException.java | 130 - rt/sun/dc/path/FastPathProducer.java | 56 + rt/sun/dc/path/PathConsumer.java | 60 + rt/sun/dc/path/PathException.java | 42 + rt/sun/dc/pr/PRException.java | 42 + rt/sun/dc/pr/PathDasher.java | 115 + rt/sun/dc/pr/PathStroker.java | 139 + rt/sun/dc/pr/Rasterizer.java | 212 + rt/sun/org/mozilla/javascript/internal/NativeJavaArray.java | 47 + rt/sun/org/mozilla/javascript/internal/Wrapper.java | 48 + tools-copy-files.txt | 77 + tools-copy/tools-corba-copy-files.txt | 6 - tools-copy/tools-jaxws-copy-files.txt | 101 - tools-copy/tools-jdk-copy-files.txt | 39 - tools-copy/tools-langtools-copy-files.txt | 51 - 1437 files changed, 122255 insertions(+), 300855 deletions(-) diffs (truncated from 441391 to 500 lines): diff -r 2b413b0a984f -r eea7630060cd .hgignore --- a/.hgignore Mon Mar 17 16:00:18 2008 +0100 +++ b/.hgignore Thu Aug 22 16:07:14 2013 +0100 @@ -5,21 +5,12 @@ autom4te.cache openjdk bootstrap -debian lib -tools -stamps Makefile config.log config.status javac javap -gcjwebplugin.so -extra-source-files.txt -rt-source-files.txt -hotspot-tools-source-files.txt -tools-source-files.txt -platform_zero rt/com/sun/jdi/AbsentInformationException.java rt/com/sun/jdi/Accessible.java rt/com/sun/jdi/ArrayReference.java @@ -36,43 +27,8 @@ rt/com/sun/jdi/ClassNotPreparedException.java rt/com/sun/jdi/ClassObjectReference.java rt/com/sun/jdi/ClassType.java -rt/com/sun/jdi/connect/AttachingConnector.java -rt/com/sun/jdi/connect/Connector.java -rt/com/sun/jdi/connect/IllegalConnectorArgumentsException.java -rt/com/sun/jdi/connect/LaunchingConnector.java -rt/com/sun/jdi/connect/ListeningConnector.java -rt/com/sun/jdi/connect/spi/ClosedConnectionException.java -rt/com/sun/jdi/connect/spi/Connection.java -rt/com/sun/jdi/connect/spi/TransportService.java -rt/com/sun/jdi/connect/Transport.java -rt/com/sun/jdi/connect/TransportTimeoutException.java -rt/com/sun/jdi/connect/VMStartException.java rt/com/sun/jdi/DoubleType.java rt/com/sun/jdi/DoubleValue.java -rt/com/sun/jdi/event/AccessWatchpointEvent.java -rt/com/sun/jdi/event/BreakpointEvent.java -rt/com/sun/jdi/event/ClassPrepareEvent.java -rt/com/sun/jdi/event/ClassUnloadEvent.java -rt/com/sun/jdi/event/EventIterator.java -rt/com/sun/jdi/event/Event.java -rt/com/sun/jdi/event/EventQueue.java -rt/com/sun/jdi/event/EventSet.java -rt/com/sun/jdi/event/ExceptionEvent.java -rt/com/sun/jdi/event/LocatableEvent.java -rt/com/sun/jdi/event/MethodEntryEvent.java -rt/com/sun/jdi/event/MethodExitEvent.java -rt/com/sun/jdi/event/ModificationWatchpointEvent.java -rt/com/sun/jdi/event/MonitorContendedEnteredEvent.java -rt/com/sun/jdi/event/MonitorContendedEnterEvent.java -rt/com/sun/jdi/event/MonitorWaitedEvent.java -rt/com/sun/jdi/event/MonitorWaitEvent.java -rt/com/sun/jdi/event/StepEvent.java -rt/com/sun/jdi/event/ThreadDeathEvent.java -rt/com/sun/jdi/event/ThreadStartEvent.java -rt/com/sun/jdi/event/VMDeathEvent.java -rt/com/sun/jdi/event/VMDisconnectEvent.java -rt/com/sun/jdi/event/VMStartEvent.java -rt/com/sun/jdi/event/WatchpointEvent.java rt/com/sun/jdi/Field.java rt/com/sun/jdi/FloatType.java rt/com/sun/jdi/FloatValue.java @@ -103,6 +59,58 @@ rt/com/sun/jdi/PrimitiveType.java rt/com/sun/jdi/PrimitiveValue.java rt/com/sun/jdi/ReferenceType.java +rt/com/sun/jdi/ShortType.java +rt/com/sun/jdi/ShortValue.java +rt/com/sun/jdi/StackFrame.java +rt/com/sun/jdi/StringReference.java +rt/com/sun/jdi/ThreadGroupReference.java +rt/com/sun/jdi/ThreadReference.java +rt/com/sun/jdi/Type.java +rt/com/sun/jdi/TypeComponent.java +rt/com/sun/jdi/VMCannotBeModifiedException.java +rt/com/sun/jdi/VMDisconnectedException.java +rt/com/sun/jdi/VMMismatchException.java +rt/com/sun/jdi/VMOutOfMemoryException.java +rt/com/sun/jdi/Value.java +rt/com/sun/jdi/VirtualMachine.java +rt/com/sun/jdi/VirtualMachineManager.java +rt/com/sun/jdi/VoidType.java +rt/com/sun/jdi/VoidValue.java +rt/com/sun/jdi/connect/AttachingConnector.java +rt/com/sun/jdi/connect/Connector.java +rt/com/sun/jdi/connect/IllegalConnectorArgumentsException.java +rt/com/sun/jdi/connect/LaunchingConnector.java +rt/com/sun/jdi/connect/ListeningConnector.java +rt/com/sun/jdi/connect/Transport.java +rt/com/sun/jdi/connect/TransportTimeoutException.java +rt/com/sun/jdi/connect/VMStartException.java +rt/com/sun/jdi/connect/spi/ClosedConnectionException.java +rt/com/sun/jdi/connect/spi/Connection.java +rt/com/sun/jdi/connect/spi/TransportService.java +rt/com/sun/jdi/event/AccessWatchpointEvent.java +rt/com/sun/jdi/event/BreakpointEvent.java +rt/com/sun/jdi/event/ClassPrepareEvent.java +rt/com/sun/jdi/event/ClassUnloadEvent.java +rt/com/sun/jdi/event/Event.java +rt/com/sun/jdi/event/EventIterator.java +rt/com/sun/jdi/event/EventQueue.java +rt/com/sun/jdi/event/EventSet.java +rt/com/sun/jdi/event/ExceptionEvent.java +rt/com/sun/jdi/event/LocatableEvent.java +rt/com/sun/jdi/event/MethodEntryEvent.java +rt/com/sun/jdi/event/MethodExitEvent.java +rt/com/sun/jdi/event/ModificationWatchpointEvent.java +rt/com/sun/jdi/event/MonitorContendedEnterEvent.java +rt/com/sun/jdi/event/MonitorContendedEnteredEvent.java +rt/com/sun/jdi/event/MonitorWaitEvent.java +rt/com/sun/jdi/event/MonitorWaitedEvent.java +rt/com/sun/jdi/event/StepEvent.java +rt/com/sun/jdi/event/ThreadDeathEvent.java +rt/com/sun/jdi/event/ThreadStartEvent.java +rt/com/sun/jdi/event/VMDeathEvent.java +rt/com/sun/jdi/event/VMDisconnectEvent.java +rt/com/sun/jdi/event/VMStartEvent.java +rt/com/sun/jdi/event/WatchpointEvent.java rt/com/sun/jdi/request/AccessWatchpointRequest.java rt/com/sun/jdi/request/BreakpointRequest.java rt/com/sun/jdi/request/ClassPrepareRequest.java @@ -115,32 +123,35 @@ rt/com/sun/jdi/request/MethodEntryRequest.java rt/com/sun/jdi/request/MethodExitRequest.java rt/com/sun/jdi/request/ModificationWatchpointRequest.java +rt/com/sun/jdi/request/MonitorContendedEnterRequest.java rt/com/sun/jdi/request/MonitorContendedEnteredRequest.java -rt/com/sun/jdi/request/MonitorContendedEnterRequest.java +rt/com/sun/jdi/request/MonitorWaitRequest.java rt/com/sun/jdi/request/MonitorWaitedRequest.java -rt/com/sun/jdi/request/MonitorWaitRequest.java rt/com/sun/jdi/request/StepRequest.java rt/com/sun/jdi/request/ThreadDeathRequest.java rt/com/sun/jdi/request/ThreadStartRequest.java rt/com/sun/jdi/request/VMDeathRequest.java rt/com/sun/jdi/request/WatchpointRequest.java -rt/com/sun/jdi/ShortType.java -rt/com/sun/jdi/ShortValue.java -rt/com/sun/jdi/StackFrame.java -rt/com/sun/jdi/StringReference.java -rt/com/sun/jdi/ThreadGroupReference.java -rt/com/sun/jdi/ThreadReference.java -rt/com/sun/jdi/TypeComponent.java -rt/com/sun/jdi/Type.java -rt/com/sun/jdi/Value.java -rt/com/sun/jdi/VirtualMachine.java -rt/com/sun/jdi/VirtualMachineManager.java -rt/com/sun/jdi/VMCannotBeModifiedException.java -rt/com/sun/jdi/VMDisconnectedException.java -rt/com/sun/jdi/VMMismatchException.java -rt/com/sun/jdi/VMOutOfMemoryException.java -rt/com/sun/jdi/VoidType.java -rt/com/sun/jdi/VoidValue.java +rt/com/sun/tools/jdi/LinkedHashMap.java +rt/java/util/Observer.java +rt/java/security/cert/CertPathValidator.java +rt/java/util/Timer.java +rt/javax/security/auth/callback/ChoiceCallback.java +rt/javax/security/auth/callback/ConfirmationCallback.java +rt/javax/security/auth/callback/LanguageCallback.java +rt/javax/security/auth/callback/NameCallback.java +rt/javax/security/auth/callback/TextInputCallback.java +rt/javax/security/auth/callback/TextOutputCallback.java +rt/javax/security/sasl/AuthenticationException.java +rt/javax/security/sasl/Sasl.java +rt/javax/security/sasl/SaslClient.java +rt/javax/security/sasl/SaslClientFactory.java +rt/javax/security/sasl/SaslException.java +rt/javax/security/sasl/SaslServer.java +rt/javax/security/sasl/SaslServerFactory.java +generated/gen-srcs.lst +rt/com/sun/jmx/snmp/agent/SnmpMibEntry.java +rt/com/sun/jmx/snmp/agent/SnmpMib.java rt/com/sun/jmx/snmp/agent/SnmpEntryOid.java rt/com/sun/jmx/snmp/agent/SnmpErrorHandlerAgent.java rt/com/sun/jmx/snmp/agent/SnmpGenericMetaServer.java @@ -148,14 +159,13 @@ rt/com/sun/jmx/snmp/agent/SnmpIndex.java rt/com/sun/jmx/snmp/agent/SnmpMibAgent.java rt/com/sun/jmx/snmp/agent/SnmpMibAgentMBean.java -rt/com/sun/jmx/snmp/agent/SnmpMibEntry.java +rt/com/sun/jmx/snmp/agent/SnmpMibEntry.javt rt/com/sun/jmx/snmp/agent/SnmpMibGroup.java rt/com/sun/jmx/snmp/agent/SnmpMibHandler.java -rt/com/sun/jmx/snmp/agent/SnmpMib.java rt/com/sun/jmx/snmp/agent/SnmpMibNode.java rt/com/sun/jmx/snmp/agent/SnmpMibOid.java +rt/com/sun/jmx/snmp/agent/SnmpMibRequest.java rt/com/sun/jmx/snmp/agent/SnmpMibRequestImpl.java -rt/com/sun/jmx/snmp/agent/SnmpMibRequest.java rt/com/sun/jmx/snmp/agent/SnmpMibSubRequest.java rt/com/sun/jmx/snmp/agent/SnmpMibTable.java rt/com/sun/jmx/snmp/agent/SnmpRequestTree.java @@ -166,21 +176,6 @@ rt/com/sun/jmx/snmp/agent/SnmpTableEntryNotification.java rt/com/sun/jmx/snmp/agent/SnmpTableSupport.java rt/com/sun/jmx/snmp/agent/SnmpUserDataFactory.java -rt/com/sun/jmx/snmp/daemon/SnmpInformRequest.java -rt/com/sun/jmx/snmp/daemon/SnmpSession.java -rt/com/sun/jmx/snmp/SnmpDataTypeEnums.java -rt/com/sun/jmx/snmp/SnmpDefinitions.java -rt/com/sun/jmx/snmp/SnmpOid.java -rt/com/sun/jmx/snmp/SnmpOidRecord.java -rt/com/sun/jmx/snmp/SnmpOidTable.java -rt/com/sun/jmx/snmp/SnmpOidTableSupport.java -rt/com/sun/jmx/snmp/SnmpParameters.java -rt/com/sun/jmx/snmp/SnmpPduPacket.java -rt/com/sun/jmx/snmp/SnmpPeer.java -rt/com/sun/jmx/snmp/SnmpSession.java -rt/com/sun/jmx/snmp/SnmpTimeticks.java -rt/com/sun/jmx/snmp/SnmpVarBind.java -rt/com/sun/jmx/snmp/SnmpVarBindList.java rt/com/sun/tools/jdi/AbstractLauncher.java rt/com/sun/tools/jdi/ArrayReferenceImpl.java rt/com/sun/tools/jdi/ArrayTypeImpl.java @@ -214,7 +209,6 @@ rt/com/sun/tools/jdi/JDWPException.java rt/com/sun/tools/jdi/JNITypeParser.java rt/com/sun/tools/jdi/LineInfo.java -rt/com/sun/tools/jdi/LinkedHashMap.java rt/com/sun/tools/jdi/LocalVariableImpl.java rt/com/sun/tools/jdi/LocationImpl.java rt/com/sun/tools/jdi/LockObject.java @@ -250,17 +244,59 @@ rt/com/sun/tools/jdi/ThreadReferenceImpl.java rt/com/sun/tools/jdi/TypeComponentImpl.java rt/com/sun/tools/jdi/TypeImpl.java +rt/com/sun/tools/jdi/VMAction.java +rt/com/sun/tools/jdi/VMListener.java +rt/com/sun/tools/jdi/VMModifiers.java +rt/com/sun/tools/jdi/VMState.java rt/com/sun/tools/jdi/ValueContainer.java rt/com/sun/tools/jdi/ValueImpl.java rt/com/sun/tools/jdi/VirtualMachineImpl.java rt/com/sun/tools/jdi/VirtualMachineManagerImpl.java rt/com/sun/tools/jdi/VirtualMachineManagerService.java -rt/com/sun/tools/jdi/VMAction.java -rt/com/sun/tools/jdi/VMListener.java -rt/com/sun/tools/jdi/VMModifiers.java -rt/com/sun/tools/jdi/VMState.java rt/com/sun/tools/jdi/VoidTypeImpl.java rt/com/sun/tools/jdi/VoidValueImpl.java +rt/java/security/cert/CRL.java +rt/java/security/cert/CRLException.java +rt/java/security/cert/CRLSelector.java +rt/java/security/cert/CertPath.java +rt/java/security/cert/CertPathBuilder.java +rt/java/security/cert/CertPathBuilderException.java +rt/java/security/cert/CertPathBuilderResult.java +rt/java/security/cert/CertPathBuilderSpi.java +rt/java/security/cert/CertPathHelperImpl.java +rt/java/security/cert/CertPathParameters.java +rt/java/security/cert/CertPathValidatorException.java +rt/java/security/cert/CertPathValidatorResult.java +rt/java/security/cert/CertPathValidatorSpi.java +rt/java/security/cert/CertSelector.java +rt/java/security/cert/CertStore.java +rt/java/security/cert/CertStoreException.java +rt/java/security/cert/CertStoreParameters.java +rt/java/security/cert/CertStoreSpi.java +rt/java/security/cert/Certificate.java +rt/java/security/cert/CertificateEncodingException.java +rt/java/security/cert/CertificateException.java +rt/java/security/cert/CertificateExpiredException.java +rt/java/security/cert/CertificateFactory.java +rt/java/security/cert/CertificateFactorySpi.java +rt/java/security/cert/CertificateNotYetValidException.java +rt/java/security/cert/CertificateParsingException.java +rt/java/security/cert/CollectionCertStoreParameters.java +rt/java/security/cert/LDAPCertStoreParameters.java +rt/java/security/cert/PKIXBuilderParameters.java +rt/java/security/cert/PKIXCertPathBuilderResult.java +rt/java/security/cert/PKIXCertPathChecker.java +rt/java/security/cert/PKIXCertPathValidatorResult.java +rt/java/security/cert/PKIXParameters.java +rt/java/security/cert/PolicyNode.java +rt/java/security/cert/PolicyQualifierInfo.java +rt/java/security/cert/TrustAnchor.java +rt/java/security/cert/X509CRL.java +rt/java/security/cert/X509CRLEntry.java +rt/java/security/cert/X509CRLSelector.java +rt/java/security/cert/X509CertSelector.java +rt/java/security/cert/X509Certificate.java +rt/java/security/cert/X509Extension.java rt/java/util/AbstractCollection.java rt/java/util/AbstractList.java rt/java/util/AbstractMap.java @@ -282,17 +318,17 @@ rt/java/util/Dictionary.java rt/java/util/DuplicateFormatFlagsException.java rt/java/util/EmptyStackException.java -rt/java/util/Enumeration.java rt/java/util/EnumMap.java rt/java/util/EnumSet.java +rt/java/util/Enumeration.java rt/java/util/EventListener.java rt/java/util/EventListenerProxy.java rt/java/util/EventObject.java rt/java/util/FormatFlagsConversionMismatchException.java +rt/java/util/Formattable.java rt/java/util/FormattableFlags.java -rt/java/util/Formattable.java +rt/java/util/Formatter.java rt/java/util/FormatterClosedException.java -rt/java/util/Formatter.java rt/java/util/GregorianCalendar.java rt/java/util/HashMap.java rt/java/util/HashSet.java @@ -312,11 +348,11 @@ rt/java/util/LinkedHashMap.java rt/java/util/LinkedHashSet.java rt/java/util/LinkedList.java +rt/java/util/List.java rt/java/util/ListIterator.java -rt/java/util/List.java rt/java/util/ListResourceBundle.java +rt/java/util/Locale.java rt/java/util/LocaleISOData.java -rt/java/util/Locale.java rt/java/util/Map.java rt/java/util/MissingFormatArgumentException.java rt/java/util/MissingFormatWidthException.java @@ -325,14 +361,13 @@ rt/java/util/NavigableSet.java rt/java/util/NoSuchElementException.java rt/java/util/Observable.java -rt/java/util/Observer.java rt/java/util/PriorityQueue.java rt/java/util/Properties.java rt/java/util/PropertyPermission.java rt/java/util/PropertyResourceBundle.java rt/java/util/Queue.java +rt/java/util/Random.java rt/java/util/RandomAccess.java -rt/java/util/Random.java rt/java/util/RegularEnumSet.java rt/java/util/ResourceBundle.java rt/java/util/Scanner.java @@ -344,83 +379,36 @@ rt/java/util/SortedSet.java rt/java/util/Stack.java rt/java/util/StringTokenizer.java -rt/java/util/Timer.java +rt/java/util/TimeZone.java rt/java/util/TimerTask.java -rt/java/util/TimeZone.java rt/java/util/TooManyListenersException.java rt/java/util/TreeMap.java rt/java/util/TreeSet.java +rt/java/util/UUID.java rt/java/util/UnknownFormatConversionException.java rt/java/util/UnknownFormatFlagsException.java -rt/java/util/UUID.java rt/java/util/Vector.java rt/java/util/WeakHashMap.java rt/java/util/XMLUtils.java -rt/java/rmi/AccessException.java -rt/java/rmi/AlreadyBoundException.java -rt/java/rmi/ConnectException.java -rt/java/rmi/ConnectIOException.java -rt/java/rmi/MarshalException.java -rt/java/rmi/MarshalledObject.java -rt/java/rmi/Naming.java -rt/java/rmi/NoSuchObjectException.java -rt/java/rmi/NotBoundException.java -rt/java/rmi/RMISecurityException.java -rt/java/rmi/RMISecurityManager.java -rt/java/rmi/Remote.java -rt/java/rmi/RemoteException.java -rt/java/rmi/ServerError.java -rt/java/rmi/ServerException.java -rt/java/rmi/ServerRuntimeException.java -rt/java/rmi/StubNotFoundException.java -rt/java/rmi/UnexpectedException.java -rt/java/rmi/UnknownHostException.java -rt/java/rmi/UnmarshalException.java -rt/sun/rmi/rmic/BatchEnvironment.java -rt/sun/rmi/rmic/Constants.java -rt/sun/rmi/rmic/Generator.java -rt/sun/rmi/rmic/IndentingWriter.java -rt/sun/rmi/rmic/Main.java -rt/sun/rmi/rmic/Names.java -rt/sun/rmi/rmic/RMIConstants.java -rt/sun/rmi/rmic/RMIGenerator.java -rt/sun/rmi/rmic/RemoteClass.java -rt/sun/rmi/rmic/Util.java -rt/javax/net/ssl/CertPathTrustManagerParameters.java -rt/javax/net/ssl/HandshakeCompletedEvent.java -rt/javax/net/ssl/HandshakeCompletedListener.java -rt/javax/net/ssl/HostnameVerifier.java -rt/javax/net/ssl/HttpsURLConnection.java -rt/javax/net/ssl/KeyManager.java -rt/javax/net/ssl/KeyManagerFactory.java -rt/javax/net/ssl/KeyManagerFactorySpi.java -rt/javax/net/ssl/KeyStoreBuilderParameters.java -rt/javax/net/ssl/ManagerFactoryParameters.java -rt/javax/net/ssl/SSLContext.java -rt/javax/net/ssl/SSLContextSpi.java -rt/javax/net/ssl/SSLEngine.java -rt/javax/net/ssl/SSLEngineResult.java -rt/javax/net/ssl/SSLException.java -rt/javax/net/ssl/SSLHandshakeException.java -rt/javax/net/ssl/SSLKeyException.java -rt/javax/net/ssl/SSLParameters.java -rt/javax/net/ssl/SSLPeerUnverifiedException.java -rt/javax/net/ssl/SSLPermission.java -rt/javax/net/ssl/SSLProtocolException.java -rt/javax/net/ssl/SSLServerSocket.java -rt/javax/net/ssl/SSLServerSocketFactory.java -rt/javax/net/ssl/SSLSession.java -rt/javax/net/ssl/SSLSessionBindingEvent.java -rt/javax/net/ssl/SSLSessionBindingListener.java -rt/javax/net/ssl/SSLSessionContext.java -rt/javax/net/ssl/SSLSocket.java -rt/javax/net/ssl/SSLSocketFactory.java -rt/javax/net/ssl/TrustManager.java -rt/javax/net/ssl/TrustManagerFactory.java -rt/javax/net/ssl/TrustManagerFactorySpi.java -rt/javax/net/ssl/X509ExtendedKeyManager.java -rt/javax/net/ssl/X509KeyManager.java -rt/javax/net/ssl/X509TrustManager.java -rt/java/io/ -rt/sun/awt -generated/sun/awt/X11/generator/sizer.32.orig +rt/javax/security/auth/AuthPermission.java +rt/javax/security/auth/DestroyFailedException.java +rt/javax/security/auth/Destroyable.java +rt/javax/security/auth/Policy.java +rt/javax/security/auth/PrivateCredentialPermission.java +rt/javax/security/auth/RefreshFailedException.java +rt/javax/security/auth/Refreshable.java +rt/javax/security/auth/Subject.java +rt/javax/security/auth/SubjectDomainCombiner.java +rt/javax/security/auth/callback/Callback.java +rt/javax/security/auth/callback/CallbackHandler.java +rt/javax/security/auth/callback/PasswordCallback.java +rt/javax/security/auth/callback/UnsupportedCallbackException.java +rt/javax/security/sasl/AuthorizeCallback.java +rt/javax/security/sasl/RealmCallback.java +rt/javax/security/sasl/RealmChoiceCallback.java +gcjwebplugin.so +jce-source-files.txt +rt-source-files.txt +tools-source-files.txt +tools/ +stamps/ diff -r 2b413b0a984f -r eea7630060cd .hgtags --- a/.hgtags Mon Mar 17 16:00:18 2008 +0100 +++ b/.hgtags Thu Aug 22 16:07:14 2013 +0100 @@ -2,7 +2,3 @@ b639d73581e34a5db114ed5addfd84b093d00254 icedtea-1.1 1ce086327b07f17892cc351719de6897819e32fa icedtea-1.2 8ea2619c21cfea2611b44879aab0f781ffd3fd50 icedtea-1.3 -cb78e0fccf14ed4a80b0ada2c98e4621479acbf5 icedtea-1.4 -5ca86e9ca40533c48ca3445a10fd3b058ef94885 icedtea-1.5 -bb3929528d3e9de0529da995c4b71975fd77fb5a icedtea-1.6 -38e6eb354632588f5ac8dbcd69229ebd031f57cb icedtea6-1.0 diff -r 2b413b0a984f -r eea7630060cd AUTHORS --- a/AUTHORS Mon Mar 17 16:00:18 2008 +0100 +++ b/AUTHORS Thu Aug 22 16:07:14 2013 +0100 @@ -5,18 +5,13 @@ Gary Benson Tania Bento Thomas Fitzsimmons -Matthew Flaschen Kyle Galloway Andrew Haley -Matthias Klose Francis Kung Casey Marshall Raif Naffah -Bernhard Rosenkr??nzer -Keith Seitz Joshua Sumali Christian Thalinger -Dalibor Topic Mark Wielaard This project also includes code from the following projects: diff -r 2b413b0a984f -r eea7630060cd ChangeLog --- a/ChangeLog Mon Mar 17 16:00:18 2008 +0100 +++ b/ChangeLog Thu Aug 22 16:07:14 2013 +0100 @@ -1,2441 +1,48 @@ -2008-03-17 Gary Benson +2007-10-11 Christan Thalinger - * patches/icedtea-static-libstdc++.patch: New file. + * README.cacao: Added b19. This commit is just to create a new + branch which is able to build IcedTea b19 with CACAO. -2008-03-17 Gary Benson +2007-09-18 Christan Thalinger From bugzilla-daemon at icedtea.classpath.org Thu Aug 22 12:18:01 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Aug 2013 19:18:01 +0000 Subject: [Bug 1528] Chrome and Firefox freeze loading .jar (due permissions fail?) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1528 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|dbhole 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/20130822/c6fa70f7/attachment.html From ptisnovs at icedtea.classpath.org Fri Aug 23 01:59:06 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 23 Aug 2013 08:59:06 +0000 Subject: /hg/rhino-tests: Added new test testAsSubclass into the test sui... Message-ID: changeset 925693e5b8eb in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=925693e5b8eb author: Pavel Tisnovsky date: Fri Aug 23 11:02:39 2013 +0200 Added new test testAsSubclass into the test suite BindingsClassTest. diffstat: ChangeLog | 5 + src/org/RhinoTests/BindingsClassTest.java | 158 ++++++++++++++++++++++++++++++ 2 files changed, 163 insertions(+), 0 deletions(-) diffs (180 lines): diff -r 0f16f7c5be85 -r 925693e5b8eb ChangeLog --- a/ChangeLog Thu Aug 22 16:05:57 2013 +0200 +++ b/ChangeLog Fri Aug 23 11:02:39 2013 +0200 @@ -1,3 +1,8 @@ +2013-08-23 Pavel Tisnovsky + + * src/org/RhinoTests/BindingsClassTest.java: + Added new test testAsSubclass into the test suite BindingsClassTest. + 2013-08-21 Pavel Tisnovsky * src/org/RhinoTests/AbstractScriptEngineClassTest.java: diff -r 0f16f7c5be85 -r 925693e5b8eb src/org/RhinoTests/BindingsClassTest.java --- a/src/org/RhinoTests/BindingsClassTest.java Thu Aug 22 16:05:57 2013 +0200 +++ b/src/org/RhinoTests/BindingsClassTest.java Fri Aug 23 11:02:39 2013 +0200 @@ -1145,6 +1145,164 @@ } /** + * Test for method javax.script.Bindings.getClass().asSubclass() + */ + protected void testAsSubclass() { + try { + this.bindingsClass.asSubclass(bindingsClass); + } + catch (Exception e) { + e.printStackTrace(); + throw new AssertionError(e.getMessage()); + } + + try { + this.bindingsClass.asSubclass(java.lang.Void.class); + throw new AssertionError("Class.asSubclass(java.lang.Void.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.asSubclass(java.lang.Number.class); + throw new AssertionError("Class.asSubclass(java.lang.Number.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.asSubclass(java.lang.Byte.class); + throw new AssertionError("Class.asSubclass(java.lang.Byte.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.asSubclass(java.lang.Double.class); + throw new AssertionError("Class.asSubclass(java.lang.Double.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.asSubclass(java.lang.Float.class); + throw new AssertionError("Class.asSubclass(java.lang.Float.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.asSubclass(java.lang.Integer.class); + throw new AssertionError("Class.asSubclass(java.lang.Integer.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.asSubclass(java.lang.Long.class); + throw new AssertionError("Class.asSubclass(java.lang.Long.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.asSubclass(java.lang.Short.class); + throw new AssertionError("Class.asSubclass(java.lang.Short.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.asSubclass(java.lang.String.class); + throw new AssertionError("Class.asSubclass(java.lang.String.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.asSubclass(java.lang.StringBuffer.class); + throw new AssertionError("Class.asSubclass(java.lang.StringBuffer.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.asSubclass(java.lang.StringBuilder.class); + throw new AssertionError("Class.asSubclass(java.lang.StringBuilder.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.asSubclass(java.awt.Color.class); + throw new AssertionError("Class.asSubclass(java.awt.Color.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.asSubclass(java.awt.Font.class); + throw new AssertionError("Class.asSubclass(java.awt.Font.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.asSubclass(java.awt.Image.class); + throw new AssertionError("Class.asSubclass(java.awt.Image.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.asSubclass(javax.swing.JPanel.class); + throw new AssertionError("Class.asSubclass(javax.swing.JPanel.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.asSubclass(javax.swing.JColorChooser.class); + throw new AssertionError("Class.asSubclass(javax.swing.JColorChooser.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.asSubclass(javax.swing.JScrollBar.class); + throw new AssertionError("Class.asSubclass(javax.swing.JScrollBar.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.asSubclass(javax.swing.JSlider.class); + throw new AssertionError("Class.asSubclass(javax.swing.JSlider.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + } + + /** * Test for instanceof operator applied to a class javax.script.Bindings */ @SuppressWarnings("cast") From ptisnovs at redhat.com Fri Aug 23 07:48:42 2013 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Fri, 23 Aug 2013 10:48:42 -0400 (EDT) Subject: [rfc][icedtea-web] Many C++-plugin unit tests that invoke Java In-Reply-To: <51FAB3AE.7040402@redhat.com> References: <51FAB3AE.7040402@redhat.com> Message-ID: <658090519.3964898.1377269322198.JavaMail.root@redhat.com> Hi Adam, both changes looks good, ok for head. Thank you, Pavel ----- Adam Domurad wrote: > Hi all. Recently I decided to try spawning the Java process during the > C++ unit tests to great success. This allows us to test much of the > NPAPI usage and the Java<->Javascript usage. > > I have painstakenly provided full method coverage (at least execution) > for JavaRequestProcessor, which provides reflection-oriented requests > from C++ to Java. As well I introduced a few other tests this enabled. > > Small refactoring goes first. > ChangeLog: > 2013-XX-XX Adam Domurad > > * plugin/icedteanp/IcedTeaNPPlugin.cc: Refactor plugin data > creation. > * plugin/icedteanp/IcedTeaNPPlugin.h: Same. > > > And the major patch: > ChangeLog: > 2013-XX-XX Adam Domurad > > Spawn Java side during C++ unit tests. Many new tests. > * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc > (hasPackage): Minor cleanup. > * plugin/icedteanp/IcedTeaNPPlugin.cc > (initialize_data_directory): New, extracted function. > (NP_Initialize): Calls extracted function. > * plugin/icedteanp/IcedTeaNPPlugin.h: Expose more functions for > testing purposes. > * tests/cpp-unit-tests/IcedTeaNPPluginTest.cc > (get_scriptable_package_object): Test binding of java package > (get_scriptable_java_object): Test binding of java object > * tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc > (NPIdentifierAsString): Update to create npidentifier properly. > * tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc > (getProperty): Test loading java.lang.Integer.MAX_VALUE from C++. > * tests/cpp-unit-tests/MemoryLeakDetector.h > (reset_global_state): Made public > * tests/cpp-unit-tests/checked_allocations.h > (SafeAllocator): New, typedef for allocator that avoids leak > detection. > * tests/cpp-unit-tests/browser_mock.cc > (browsermock_setup_functions): Renamed to > (browsermock_create_table). > (browsermock_create_table): Now returns browser table, additional > object release and identifier methods added. > * tests/cpp-unit-tests/browser_mock.h: Update for rename. > * tests/cpp-unit-tests/main.cc: Now clears state via > (reset_global_state) > * tests/cpp-unit-tests/IcedTeaJavaRequestProcessorTest.cc: New, > contains unit tests that cover all of JavaRequestProcessor's > methods. > * tests/cpp-unit-tests/browser_mock_npidentifier.cc: > Allocation-safe > npidentifier mocking, adheres to NPAPI spec. > * tests/cpp-unit-tests/browser_mock_npidentifier.h: Same. > > > Happy hacking, > -Adam From andrew at icedtea.classpath.org Fri Aug 23 08:13:49 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 23 Aug 2013 15:13:49 +0000 Subject: /hg/icedtea6-hg: 5 new changesets Message-ID: changeset e565715c45a7 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=e565715c45a7 author: Xerxes Ranby date: Wed Aug 14 17:20:44 2013 +0200 JamVM: JSR 335: Lambda Expressions; JSR 292: enable for OpenJDK 7/IcedTea 2; Updated to 2013-07-14 revision. 2013-08-14 Xerxes R?nby Robert Lougher JamVM - JSR 292: enable for OpenJDK 7/IcedTea 2 - JSR 335: invokeinterface check in method resolution - JSR 335: java.lang.invoke.MagicLambdaImpl - JSR 292: invokedynamic is 5 bytes - non-direct interp - JSR 292: invokedynamic is 5 bytes in length - Minor formatting change - Minor fixes: use perror for mmap failure - FreeClassData: fix comment - FreeClassData: adjust method count for Miranda methods - JSR 335: remove GC hack - JSR 335: implement "bridge" methods for Mirandas - JSR 335: handle multiple defaults and conflicts * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated JamVM to 2013-07-14 revision. (JAMVM_SHA256SUM): Updated. changeset a4e16f083f3b in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=a4e16f083f3b author: Andrew John Hughes date: Tue Aug 20 16:27:39 2013 +0100 Rebase HotSpot 23 support on version in 7u. 2013-08-20 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add patches from IcedTea's HotSpot 23 (mainly the ARM port work). Move some patches back to being applied on both versions of HotSpot. (ports): Install ARM port in all builds. (clean-ports): Likewise for uninstall. * hotspot.map: Use HotSpot 23 from the 7u tree. * patches/arm/cc_compile-01.patch, * patches/arm/cc_compile-02.patch, * patches/arm/cc_compile-03.patch, * patches/arm/cc_compile-04.patch, * patches/arm/cc_compile-05.patch, * patches/arm/cc_compile-06.patch, * patches/hotspot/hs23/7188168-fix_debug_binaries.patch, * patches/hotspot/hs23/aarch64.patch: Patches from IcedTea's 2.3.x HotSpot. * patches/hotspot/original/alpha-fixes.patch, * patches/hotspot/hs23/alpha-fixes.patch: Split from patches/alpha-fixes.patch. * patches/hotspot/hs23/arm-01-hsx22.patch, * patches/hotspot/hs23/arm-03-invokedynamic.patch, * patches/hotspot/hs23/arm-04-invokedynamic_jit.patch, * patches/hotspot/hs23/arm-05-invokedynamic_methodhandle.patch, * patches/hotspot/hs23/arm-06-no_o0.patch, * patches/hotspot/hs23/arm-07-cleanup.patch, * patches/hotspot/hs23/arm-08-cleanup.patch, * patches/hotspot/hs23/arm-09-jvmti.patch, * patches/hotspot/hs23/arm-10-memory_protect.patch, * patches/hotspot/hs23/arm-11-thumb2_jit.patch, * patches/hotspot/hs23/arm-12-ldrexd.patch, * patches/hotspot/hs23/arm-13-sp_adjustment.patch, * patches/hotspot/hs23/arm-14-stage1.patch, * patches/hotspot/hs23/arm-15-stage2.patch, * patches/hotspot/hs23/arm-16-dont_save_locals.patch, * patches/hotspot/hs23/arm-17-no_debug_code.patch, * patches/hotspot/hs23/arm-18-correct_call.patch, * patches/hotspot/hs23/arm-19-fix_jit_bug.patch, * patches/hotspot/hs23/arm-20-function_renaming.patch, * patches/hotspot/hs23/arm-21-fix_compareandswaplong.patch, * patches/hotspot/hs23/arm-22-fix_trashed_thread_ptr.patch, * patches/hotspot/hs23/arm-25-hsx23.patch: HotSpot 23 only ARM port work. * patches/hotspot/hs23/arm-hsdis.patch: HotSpot 23 version of hsdis patch. * patches/hotspot/original/arm.patch, * patches/hotspot/hs23/arm.patch, Split from patches/arm.patch. * patches/hotspot/hs23/drop_unlicensed_test.patch: Patches from IcedTea's 2.3.x HotSpot. * patches/hotspot/original/gcc-suffix.patch, * patches/hotspot/hs23/gcc-suffix.patch: Split from patches/gcc-suffix-hotspot.patch. * patches/hotspot/original/jtreg-test7020373-fix.patch, * patches/hotspot/hs23/jtreg-test7020373-fix.patch: Split from patches/jtreg-hotspot-Test7020373-fix.patch. * patches/hotspot/hs23/no_useless_debuginfo_files.patch, * patches/hotspot/hs23/pr1101-sparc_symbols.patch: From IcedTea 2.3.x HotSpot. * patches/hotspot/original/text-relocations.patch: * patches/hotspot/hs23/text-relocations.patch: Split from patches/text-relocations.patch. * patches/hotspot/hs23/type_fixes.patch: From IcedTea 2.3.x HotSpot. * patches/hotspot/original/update-bootclasspath.patch, * patches/hotspot/hs23/update-bootclasspath.patch: Split from patches/update-bootclasspath.patch. * patches/hotspot/original/version.patch, * patches/hotspot/hs23/version.patch: Split from patches/version-hotspot.patch. * patches/hotspot/hs23/zero_fixes.patch, * patches/hotspot/hs23/zero_hs22.patch: HotSpot 23 only Zero work. * patches/hotspot/original/7032696-7029152_broke_vm.patch: Backported from 7u. * patches/hotspot/original/7140985-hsdis_caller_options.patch: Upstream version of part of the arm-hsdis patch. * patches/hotspot/original/arm-hsdis.patch: Remove 7140985 fragment. * patches/pr1095-werror.patch: Apply to both HotSpots. changeset 09a1c728d5d1 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=09a1c728d5d1 author: Andrew John Hughes date: Thu Aug 22 16:30:29 2013 +0100 Merge changeset ad9fd882beed in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ad9fd882beed author: Andrew John Hughes date: Thu Aug 22 20:18:35 2013 +0100 Remove upstreamed patches. 2013-08-22 Andrew John Hughes * patches/fonts-rhel-version.patch, * patches/fonts-rhel.patch, * patches/object-factory-cl-internal.patch, * patches/openjdk/8009996-emitter_bean.patch, * patches/security/20130618/handle_npe.patch: Remove upstreamed patches. * Makefile.am: (SECURITY_PATCHES): Remove upstreamed patch. (ICEDTEA_PATCHES): Remove upstreamed patches. * patches/hotspot/original/7197906-handle_32_bit_shifts.patch: Restored as now used by the HotSpot 23 build. changeset b3fb887daac8 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b3fb887daac8 author: Andrew John Hughes date: Fri Aug 23 16:13:12 2013 +0100 Fix build with original upstream HotSpot. 2013-08-23 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Apply 7197906 on hs23 only. * patches/security/20130416/8004336.patch, * patches/security/20130416/8006309.patch, * patches/security/20130416/8009699.patch: Restore HotSpot security patches as not available in upstream HotSpot yet. * patches/hotspot/original/7197906-handle_32_bit_shifts.patch: Moved to... * patches/hotspot/hs23/7197906-handle_32_bit_shifts.patch: ...here. diffstat: ChangeLog | 368 + Makefile.am | 252 +- NEWS | 3 +- hotspot.map | 2 +- patches/alpha-fixes.patch | 21 - patches/arm.patch | 286 - patches/arm/cc_compile-01.patch | 23 + patches/arm/cc_compile-02.patch | 46 + patches/arm/cc_compile-03.patch | 21 + patches/arm/cc_compile-04.patch | 20 + patches/arm/cc_compile-05.patch | 29 + patches/arm/cc_compile-06.patch | 20 + patches/copy_memory.patch | 36 - patches/ecj/jcp-importsources.patch | 10 - patches/ecj/override.patch | 51 + patches/fonts-rhel-version.patch | 33 - patches/fonts-rhel.patch | 458 - patches/gcc-suffix-hotspot.patch | 31 - patches/hotspot/hs23/7188168-fix_debug_binaries.patch | 120 + patches/hotspot/hs23/7197906-handle_32_bit_shifts.patch | 33 + patches/hotspot/hs23/aarch64.patch | 42 + patches/hotspot/hs23/alpha-fixes.patch | 21 + patches/hotspot/hs23/arm-01-hsx22.patch | 189 + patches/hotspot/hs23/arm-03-invokedynamic.patch | 171 + patches/hotspot/hs23/arm-04-invokedynamic_jit.patch | 322 + patches/hotspot/hs23/arm-05-invokedynamic_methodhandle.patch | 40 + patches/hotspot/hs23/arm-06-no_o0.patch | 32 + patches/hotspot/hs23/arm-07-cleanup.patch | 153 + patches/hotspot/hs23/arm-08-cleanup.patch | 29 + patches/hotspot/hs23/arm-09-jvmti.patch | 256 + patches/hotspot/hs23/arm-10-memory_protect.patch | 247 + patches/hotspot/hs23/arm-11-thumb2_jit.patch | 10888 + patches/hotspot/hs23/arm-12-ldrexd.patch | 28 + patches/hotspot/hs23/arm-13-sp_adjustment.patch | 31 + patches/hotspot/hs23/arm-14-stage1.patch | 135 + patches/hotspot/hs23/arm-15-stage2.patch | 56 + patches/hotspot/hs23/arm-16-dont_save_locals.patch | 263 + patches/hotspot/hs23/arm-17-no_debug_code.patch | 206 + patches/hotspot/hs23/arm-18-correct_call.patch | 19 + patches/hotspot/hs23/arm-19-fix_jit_bug.patch | 59 + patches/hotspot/hs23/arm-20-function_renaming.patch | 377 + patches/hotspot/hs23/arm-21-fix_compareandswaplong.patch | 52 + patches/hotspot/hs23/arm-22-fix_trashed_thread_ptr.patch | 24 + patches/hotspot/hs23/arm-25-hsx23.patch | 53 + patches/hotspot/hs23/arm-hsdis.patch | 63 + patches/hotspot/hs23/arm.patch | 295 + patches/hotspot/hs23/drop_unlicensed_test.patch | 43 + patches/hotspot/hs23/gcc-suffix.patch | 35 + patches/hotspot/hs23/jtreg-test7020373-fix.patch | 187 + patches/hotspot/hs23/no_useless_debuginfo_files.patch | 211 + patches/hotspot/hs23/pr1101-sparc_symbols.patch | 57 + patches/hotspot/hs23/text-relocations.patch | 40 + patches/hotspot/hs23/type_fixes.patch | 192 + patches/hotspot/hs23/update-bootclasspath.patch | 13 + patches/hotspot/hs23/version.patch | 56 + patches/hotspot/hs23/zero_fixes.patch | 644 + patches/hotspot/hs23/zero_hs22.patch | 216 + patches/hotspot/original/7032696-7029152_broke_vm.patch | 52 + patches/hotspot/original/7140985-hsdis_caller_options.patch | 23 + patches/hotspot/original/7197906-handle_32_bit_shifts.patch | 33 - patches/hotspot/original/alpha-fixes.patch | 21 + patches/hotspot/original/arm-hsdis.patch | 10 - patches/hotspot/original/arm.patch | 286 + patches/hotspot/original/fix_get_stack_bounds_leak.patch | 12 - patches/hotspot/original/gcc-suffix.patch | 31 + patches/hotspot/original/jtreg-test7020373-fix.patch | 187 + patches/hotspot/original/text-relocations.patch | 63 + patches/hotspot/original/update-bootclasspath.patch | 13 + patches/hotspot/original/version.patch | 56 + patches/jtreg-hotspot-Test7020373-fix.patch | 187 - patches/object-factory-cl-internal.patch | 384 - patches/openjdk/5102804-memory_leak.patch | 429 - patches/openjdk/6469266-xmlsec_1.4.2.patch | 23876 - patches/openjdk/6501644-icu_sync.patch | 8066 - patches/openjdk/6669869-queries_per_appcontext.patch | 355 - 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-handle_renames.patch | 605 - patches/openjdk/6851834-restructure.patch | 26853 - patches/openjdk/6886358-layout_update.patch | 13847 - patches/openjdk/6888167-medialib_memory_leaks.patch | 134 - patches/openjdk/6961178-doclet_xml.patch | 1989 - patches/openjdk/6963811-deadlock_fix.patch | 42 - patches/openjdk/7006270-regressions.patch | 299 - patches/openjdk/7017324-kerning_crash.patch | 101 - patches/openjdk/7036559-concurrenthashmap_improvements.patch | 1436 - patches/openjdk/7064279-fixup.patch | 71 - patches/openjdk/7064279-resource_release.patch | 436 - patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch | 298 - patches/openjdk/7195301-no_instanceof_node.patch | 86 - patches/openjdk/8004302-soap_test_failure.patch | 75 - patches/openjdk/8004341-jck_dialog_failure.patch | 26 - patches/openjdk/8005615-failure_to_load_logger_implementation.patch | 542 - patches/openjdk/8007393.patch | 78 - patches/openjdk/8007611.patch | 24 - patches/openjdk/8009641-8007675_build_fix.patch | 49 - patches/openjdk/8009996-emitter_bean.patch | 27 - patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch | 449213 ------- patches/openjdk/jaxp144_05.patch | 595589 ---------- patches/pr1095-werror.patch | 64 + patches/security/20130201/6563318.patch | 36 - patches/security/20130201/6664509.patch | 1322 - patches/security/20130201/6776941.patch | 272 - patches/security/20130201/7141694.patch | 87 - patches/security/20130201/7173145.patch | 22 - patches/security/20130201/7186945.patch | 10819 - patches/security/20130201/7186948.patch | 20 - patches/security/20130201/7186952.patch | 127 - patches/security/20130201/7186954.patch | 81 - patches/security/20130201/7192392.patch | 695 - patches/security/20130201/7192393.patch | 60 - patches/security/20130201/7192977.patch | 444 - patches/security/20130201/7197546.patch | 479 - patches/security/20130201/7200491.patch | 49 - patches/security/20130201/7200500.patch | 60 - patches/security/20130201/7201064.patch | 125 - patches/security/20130201/7201066.patch | 66 - patches/security/20130201/7201068.patch | 83 - patches/security/20130201/7201070.patch | 31 - patches/security/20130201/7201071.patch | 553 - patches/security/20130201/8000210.patch | 104 - patches/security/20130201/8000537.patch | 334 - patches/security/20130201/8000540.patch | 187 - patches/security/20130201/8000631.patch | 3964 - patches/security/20130201/8001242.patch | 61 - patches/security/20130201/8001307.patch | 27 - patches/security/20130201/8001972.patch | 438 - patches/security/20130201/8002325.patch | 59 - patches/security/20130219/8006446.patch | 395 - patches/security/20130219/8006777.patch | 1036 - patches/security/20130219/8007688.patch | 130 - patches/security/20130304/8007014.patch | 477 - patches/security/20130304/8007675.patch | 416 - patches/security/20130416/6657673-factory_finder.patch | 54 - patches/security/20130416/6657673-fixup.patch | 229 - patches/security/20130416/6657673.patch | 9494 - patches/security/20130416/7200507.patch | 230 - patches/security/20130416/8000724.patch | 1368 - patches/security/20130416/8001031.patch | 5457 - patches/security/20130416/8001040.patch | 113 - patches/security/20130416/8001322.patch | 61 - patches/security/20130416/8001329.patch | 32 - patches/security/20130416/8003335.patch | 63 - patches/security/20130416/8003445.patch | 77 - patches/security/20130416/8003543.patch | 236 - patches/security/20130416/8004261.patch | 142 - patches/security/20130416/8004986.patch | 374 - patches/security/20130416/8005432.patch | 518 - patches/security/20130416/8005943.patch | 202 - patches/security/20130416/8006435.patch | 76 - patches/security/20130416/8006790.patch | 166 - patches/security/20130416/8006795.patch | 35 - patches/security/20130416/8007406.patch | 31 - patches/security/20130416/8007617.patch | 376 - patches/security/20130416/8007667.patch | 579 - patches/security/20130416/8007918.patch | 357 - patches/security/20130416/8009063.patch | 67 - patches/security/20130416/8009305.patch | 68 - patches/security/20130416/8009814.patch | 27 - patches/security/20130416/8009857.patch | 66 - patches/security/20130618/6741606-apache_santuario.patch | 8110 - 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-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 | 6937 - 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/8009235-improve_tsa_data_handling.patch | 80 - 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/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 - patches/text-relocations.patch | 63 - patches/update-bootclasspath.patch | 13 - patches/version-hotspot.patch | 56 - 228 files changed, 17340 insertions(+), 1205212 deletions(-) diffs (truncated from 1223675 to 500 lines): diff -r ae086ffdfa67 -r b3fb887daac8 ChangeLog --- a/ChangeLog Wed Aug 07 13:03:24 2013 +0100 +++ b/ChangeLog Fri Aug 23 16:13:12 2013 +0100 @@ -1,9 +1,171 @@ +2013-08-23 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Apply 7197906 on hs23 only. + * patches/security/20130416/8004336.patch, + * patches/security/20130416/8006309.patch, + * patches/security/20130416/8009699.patch: + Restore HotSpot security patches as not available + in upstream HotSpot yet. + * patches/hotspot/original/7197906-handle_32_bit_shifts.patch: + Moved to... + * patches/hotspot/hs23/7197906-handle_32_bit_shifts.patch: + ...here. + +2013-08-22 Andrew John Hughes + + * patches/fonts-rhel-version.patch, + * patches/fonts-rhel.patch, + * patches/object-factory-cl-internal.patch, + * patches/openjdk/8009996-emitter_bean.patch, + * patches/security/20130618/handle_npe.patch: + Remove upstreamed patches. + * Makefile.am: + (SECURITY_PATCHES): Remove upstreamed patch. + (ICEDTEA_PATCHES): Remove upstreamed patches. + * patches/hotspot/original/7197906-handle_32_bit_shifts.patch: + Restored as now used by the HotSpot 23 build. + +2013-08-20 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add patches from IcedTea's + HotSpot 23 (mainly the ARM port work). Move + some patches back to being applied on both + versions of HotSpot. + (ports): Install ARM port in all builds. + (clean-ports): Likewise for uninstall. + * hotspot.map: Use HotSpot 23 from the 7u + tree. + * patches/arm/cc_compile-01.patch, + * patches/arm/cc_compile-02.patch, + * patches/arm/cc_compile-03.patch, + * patches/arm/cc_compile-04.patch, + * patches/arm/cc_compile-05.patch, + * patches/arm/cc_compile-06.patch, + * patches/hotspot/hs23/7188168-fix_debug_binaries.patch, + * patches/hotspot/hs23/aarch64.patch: + Patches from IcedTea's 2.3.x HotSpot. + * patches/hotspot/original/alpha-fixes.patch, + * patches/hotspot/hs23/alpha-fixes.patch: + Split from patches/alpha-fixes.patch. + * patches/hotspot/hs23/arm-01-hsx22.patch, + * patches/hotspot/hs23/arm-03-invokedynamic.patch, + * patches/hotspot/hs23/arm-04-invokedynamic_jit.patch, + * patches/hotspot/hs23/arm-05-invokedynamic_methodhandle.patch, + * patches/hotspot/hs23/arm-06-no_o0.patch, + * patches/hotspot/hs23/arm-07-cleanup.patch, + * patches/hotspot/hs23/arm-08-cleanup.patch, + * patches/hotspot/hs23/arm-09-jvmti.patch, + * patches/hotspot/hs23/arm-10-memory_protect.patch, + * patches/hotspot/hs23/arm-11-thumb2_jit.patch, + * patches/hotspot/hs23/arm-12-ldrexd.patch, + * patches/hotspot/hs23/arm-13-sp_adjustment.patch, + * patches/hotspot/hs23/arm-14-stage1.patch, + * patches/hotspot/hs23/arm-15-stage2.patch, + * patches/hotspot/hs23/arm-16-dont_save_locals.patch, + * patches/hotspot/hs23/arm-17-no_debug_code.patch, + * patches/hotspot/hs23/arm-18-correct_call.patch, + * patches/hotspot/hs23/arm-19-fix_jit_bug.patch, + * patches/hotspot/hs23/arm-20-function_renaming.patch, + * patches/hotspot/hs23/arm-21-fix_compareandswaplong.patch, + * patches/hotspot/hs23/arm-22-fix_trashed_thread_ptr.patch, + * patches/hotspot/hs23/arm-25-hsx23.patch: + HotSpot 23 only ARM port work. + * patches/hotspot/hs23/arm-hsdis.patch: + HotSpot 23 version of hsdis patch. + * patches/hotspot/original/arm.patch, + * patches/hotspot/hs23/arm.patch, + Split from patches/arm.patch. + * patches/hotspot/hs23/drop_unlicensed_test.patch: + Patches from IcedTea's 2.3.x HotSpot. + * patches/hotspot/original/gcc-suffix.patch, + * patches/hotspot/hs23/gcc-suffix.patch: + Split from patches/gcc-suffix-hotspot.patch. + * patches/hotspot/original/jtreg-test7020373-fix.patch, + * patches/hotspot/hs23/jtreg-test7020373-fix.patch: + Split from patches/jtreg-hotspot-Test7020373-fix.patch. + * patches/hotspot/hs23/no_useless_debuginfo_files.patch, + * patches/hotspot/hs23/pr1101-sparc_symbols.patch: + From IcedTea 2.3.x HotSpot. + * patches/hotspot/original/text-relocations.patch: + * patches/hotspot/hs23/text-relocations.patch: + Split from patches/text-relocations.patch. + * patches/hotspot/hs23/type_fixes.patch: + From IcedTea 2.3.x HotSpot. + * patches/hotspot/original/update-bootclasspath.patch, + * patches/hotspot/hs23/update-bootclasspath.patch: + Split from patches/update-bootclasspath.patch. + * patches/hotspot/original/version.patch, + * patches/hotspot/hs23/version.patch: + Split from patches/version-hotspot.patch. + * patches/hotspot/hs23/zero_fixes.patch, + * patches/hotspot/hs23/zero_hs22.patch: + HotSpot 23 only Zero work. + * patches/hotspot/original/7032696-7029152_broke_vm.patch: + Backported from 7u. + * patches/hotspot/original/7140985-hsdis_caller_options.patch: + Upstream version of part of the arm-hsdis patch. + * patches/hotspot/original/arm-hsdis.patch: + Remove 7140985 fragment. + * patches/pr1095-werror.patch: Apply to both HotSpots. + +2013-08-14 Xerxes R??nby + Robert Lougher + + JamVM + - JSR 292: enable for OpenJDK 7/IcedTea 2 + - JSR 335: invokeinterface check in method resolution + - JSR 335: java.lang.invoke.MagicLambdaImpl + - JSR 292: invokedynamic is 5 bytes - non-direct interp + - JSR 292: invokedynamic is 5 bytes in length + - Minor formatting change + - Minor fixes: use perror for mmap failure + - FreeClassData: fix comment + - FreeClassData: adjust method count for Miranda methods + - JSR 335: remove GC hack + - JSR 335: implement "bridge" methods for Mirandas + - JSR 335: handle multiple defaults and conflicts + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2013-07-14 revision. + (JAMVM_SHA256SUM): Updated. + 2013-08-07 Andrew John Hughes + * 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-handle_renames.patch, + * patches/openjdk/6851834-restructure.patch, + * patches/openjdk/6961178-doclet_xml.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_generics.patch, + * patches/security/20130618/langtools_merge-01.patch, + * patches/security/20130618/langtools_merge-02.patch, + * patches/security/20130618/langtools_merge-03.patch: + Removed. + * Makefile.am: + (ICEDTEA_PATCHES): Remove upstreamed patches. + +2013-08-07 Andrew John Hughes + * hotspot.map: Bring in 2.3.12 tag. 2013-08-06 Andrew John Hughes + * patches/security/20130618/8000642-better_transportation_handling.patch, + * patches/security/20130618/8001032-restrict_object_access-corba.patch: + Removed. + * Makefile.am: + (ICEDTEA_PATCHES): Remove upstreamed patches. + +2013-08-06 Andrew John Hughes + * 8013196-TimeZone_getDefault_throws_exception.patch: Renamed to... * 8013196-timezone_getdefault_throws_exception.patch: @@ -27,6 +189,117 @@ * hotspot.map: Bring in hs23 changes to ARM32 port, syncing with 2.3.12 tag. +2013-08-02 Andrew John Hughes + + * patches/openjdk/6469266-xmlsec_1.4.2.patch, + * patches/openjdk/6888167-medialib_memory_leaks.patch, + * patches/openjdk/7195301-no_instanceof_node.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-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-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/8009235-improve_tsa_data_handling.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/javac_issue.patch, + * Makefile.am: + Remove unused patches. + * Makefile.am: + (SECURITY_PATCHES): Remove upstreamed security + patches. + +2013-07-31 Andrew John Hughes + + * patches/ecj/jcp-importsources.patch, + * patches/openjdk/5102804-memory_leak.patch, + * patches/openjdk/6501644-icu_sync.patch, + * patches/openjdk/6669869-queries_per_appcontext.patch, + * patches/openjdk/6886358-layout_update.patch, + * patches/openjdk/6963811-deadlock_fix.patch, + * patches/openjdk/7017324-kerning_crash.patch, + * patches/openjdk/7064279-fixup.patch, + * patches/openjdk/7064279-resource_release.patch, + * patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch, + * patches/security/20130416/6657673-factory_finder.patch, + * patches/security/20130416/6657673-fixup.patch, + * patches/security/20130416/6657673.patch, + * patches/security/20130416/7200507.patch, + * patches/security/20130416/8000724.patch, + * patches/security/20130416/8001031.patch, + * patches/security/20130416/8001040.patch, + * patches/security/20130416/8001322.patch, + * patches/security/20130416/8001329.patch, + * patches/security/20130416/8003335.patch, + * patches/security/20130416/8003445.patch, + * patches/security/20130416/8003543.patch, + * patches/security/20130416/8004261.patch, + * patches/security/20130416/8004336.patch, + * patches/security/20130416/8004986.patch, + * patches/security/20130416/8005432.patch, + * patches/security/20130416/8005943.patch, + * patches/security/20130416/8006309.patch, + * patches/security/20130416/8006435.patch, + * patches/security/20130416/8006790.patch, + * patches/security/20130416/8006795.patch, + * patches/security/20130416/8007406.patch, + * patches/security/20130416/8007617.patch, + * patches/security/20130416/8007667.patch, + * patches/security/20130416/8007918.patch, + * patches/security/20130416/8009063.patch, + * patches/security/20130416/8009305.patch, + * patches/security/20130416/8009699.patch, + * patches/security/20130416/8009814.patch, + * patches/security/20130416/8009857.patch: + Remove unused patches. + * Makefile.am: + (SECURITY_PATCHES): Remove upstreamed security + patches. + 2013-07-22 Andrew John Hughes * Makefile.am: @@ -87,6 +360,13 @@ 2013-07-11 Andrew John Hughes + * patches/openjdk/7036559-concurrenthashmap_improvements.patch: + Remove upstreamed patch. + * Makefile.am: + (ICEDTEA_PATCHES): Drop upstreamed patches. + +2013-07-11 Andrew John Hughes + * NEWS: Add 1.11.12 and 1.12.6 release notes. @@ -382,6 +662,15 @@ * patches/security/20130618/langtools_merge-03.patch: 2013/06/18 security patches. +2013-05-31 Andrew John Hughes + + * patches/copy_memory.patch, + * patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch: + Drop upstreamed patches. + * Makefile.am: + (DROP_PATCHES): Remove JAXP patch. + (ICEDTEA_PATCHES): Remove OpenJDK6-4 patch. + 2013-05-28 Xerxes R??nby PR1188: ASM Interpreter and Thumb2 JIT javac miscompile @@ -447,6 +736,18 @@ * patches/jtreg-TextLayoutBoundsChecks.patch: Fixed wrong JTreg test name in @run annotation. +2013-05-17 Andrew John Hughes + + * patches/hotspot/original/7197906-handle_32_bit_shifts.patch, + * patches/hotspot/original/fix_get_stack_bounds_leak.patch, + * patches/openjdk/8004302-soap_test_failure.patch, + * patches/openjdk/jaxp144_05.patch: + Removed as available upstream. + * Makefile.am: Remove patches. + * patches/security/20130416/6657673.patch, + * patches/security/20130416/8005432.patch: + Regenerated against upstream. + 2013-05-17 Pavel Tisnovsky * patches/componentOrientationTests.patch: @@ -464,6 +765,12 @@ * Makefile.am: Renamed three patches to be more consistent with other JTreg-related patches. +2013-05-15 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Remove reference to removed + patch patches/openjdk/8009641-8007675_build_fix.patch. + 2013-05-15 Pavel Tisnovsky * Makefile.am: @@ -840,6 +1147,62 @@ * patches/jvmtiEnv.patch: Moved to... * patches/hotspot/original/jvmtiEnv.patch: here. +2013-03-19 Andrew John Hughes + + * patches/openjdk/8004341-jck_dialog_failure.patch, + * patches/openjdk/8005615-failure_to_load_logger_implementation.patch, + * patches/openjdk/8007393.patch, + * patches/openjdk/8007611.patch, + * patches/openjdk/8009641-8007675_build_fix.patch, + * patches/security/20130201/6563318.patch, + * patches/security/20130201/6664509.patch, + * patches/security/20130201/6776941.patch, + * patches/security/20130201/7141694.patch, + * patches/security/20130201/7173145.patch, + * patches/security/20130201/7186945.patch, + * patches/security/20130201/7186948.patch, + * patches/security/20130201/7186952.patch, + * patches/security/20130201/7186954.patch, + * patches/security/20130201/7192392.patch, + * patches/security/20130201/7192393.patch, + * patches/security/20130201/7192977.patch, + * patches/security/20130201/7197546.patch, + * patches/security/20130201/7200491.patch, + * patches/security/20130201/7200500.patch, + * patches/security/20130201/7201064.patch, + * patches/security/20130201/7201066.patch, + * patches/security/20130201/7201068.patch, + * patches/security/20130201/7201070.patch, + * patches/security/20130201/7201071.patch, + * patches/security/20130201/8000210.patch, + * patches/security/20130201/8000537.patch, + * patches/security/20130201/8000540.patch, + * patches/security/20130201/8000631.patch, + * patches/security/20130201/8001235.patch, + * patches/security/20130201/8001242.patch, + * patches/security/20130201/8001307.patch, + * patches/security/20130201/8001972.patch, + * patches/security/20130201/8002325.patch, + * patches/security/20130219/8006446.patch, + * patches/security/20130219/8006777.patch, + * patches/security/20130219/8007688.patch, + * patches/security/20130304/8007014.patch, + * patches/security/20130304/8007675.patch: + Remove patches available upstream. + * Makefile.am: + (JAXP_DROP_ZIP): Update to jaxp144_05.zip + with latest security fix included. + (JAXP_DROP_SHA256SUM): Likewise. + (SECURITY_PATCHES): Remove ones available + upstream (all from 2013/02/01, 2013/02/19 + and 2013/03/04). + (ICEDTEA_PATCHES): Remove patches for + 8005615, 8004341, 8007393 & 8007611 + available upstream. + * patches/ecj/override.patch: + Add new case introduced by upstream version + of security patches (sigh...) + 2013-03-18 Andrew John Hughes * Makefile.am: @@ -1441,6 +1804,11 @@ 2012-10-31 Andrew John Hughes + * Makefile.am: + (OPENJDK_VERSION): Bump to next release, b28. + +2012-10-31 Andrew John Hughes + * generated/com/sun/corba/se/impl/logging/ActivationSystemException.java, * generated/com/sun/corba/se/impl/logging/IORSystemException.java, * generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java, diff -r ae086ffdfa67 -r b3fb887daac8 Makefile.am --- a/Makefile.am Wed Aug 07 13:03:24 2013 +0100 +++ b/Makefile.am Fri Aug 23 16:13:12 2013 +0100 @@ -2,7 +2,7 @@ OPENJDK_DATE = 26_oct_2012 OPENJDK_SHA256SUM = 044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0 -OPENJDK_VERSION = b27 +OPENJDK_VERSION = b28 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ CACAO_VERSION = 68fe50ac34ec @@ -11,8 +11,8 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz -JAMVM_VERSION = 7c8dceb90880616b7dd670f257961a1f5f371ec3 -JAMVM_SHA256SUM = 1584d8599bfd799a71baac0694bb3ed9b9fcd14a8548234b24266571e0acfc97 +JAMVM_VERSION = 1a58072f8339270f9372c273d82a00790e04375d +JAMVM_SHA256SUM = b6dafea4924a2772877597b07a59108ac5f95d6ec85fbb0bb2ea80653cdaaaaf JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz @@ -278,164 +278,13 @@ ICEDTEA_FSG_PATCHES = -DROP_PATCHES = \ - patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch \ - patches/openjdk/jaxp144_05.patch +DROP_PATCHES = SECURITY_PATCHES = \ - patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \ - patches/security/20130201/7201068.patch \ - patches/security/20130201/6563318.patch \ - patches/security/20130201/6664509.patch \ - patches/security/20130201/6776941.patch \ - patches/security/20130201/7141694.patch \ - patches/security/20130201/7173145.patch \ - patches/security/20130201/7186945.patch \ - patches/security/20130201/7186948.patch \ - patches/security/20130201/7186952.patch \ - patches/security/20130201/7186954.patch \ - patches/security/20130201/7192392.patch \ - patches/security/20130201/7192393.patch \ - patches/security/20130201/7192977.patch \ - patches/security/20130201/7197546.patch \ - patches/security/20130201/7200491.patch \ - patches/security/20130201/7200500.patch \ - patches/security/20130201/7201064.patch \ - patches/security/20130201/7201066.patch \ - patches/security/20130201/7201070.patch \ - patches/security/20130201/7201071.patch \ - patches/security/20130201/8000210.patch \ - patches/security/20130201/8000537.patch \ - patches/security/20130201/8000540.patch \ - patches/security/20130201/8000631.patch \ - patches/security/20130201/8001242.patch \ - patches/security/20130201/8001972.patch \ - patches/security/20130201/8002325.patch \ - patches/security/20130219/8006446.patch \ - patches/security/20130219/8006777.patch \ - patches/security/20130219/8007688.patch \ - patches/security/20130304/8007014.patch \ - patches/security/20130304/8007675.patch \ - patches/openjdk/8009641-8007675_build_fix.patch \ - patches/openjdk/7036559-concurrenthashmap_improvements.patch \ - patches/security/20130416/8009063.patch \ - patches/openjdk/8004302-soap_test_failure.patch \ From ptisnovs at redhat.com Fri Aug 23 07:53:32 2013 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Fri, 23 Aug 2013 10:53:32 -0400 (EDT) Subject: [rfc][icedtea-web] Make 'getvalue' nonblocking to reduce hanging chance & improve responsivity In-Reply-To: <51FAB5A3.3060701@redhat.com> References: <51B2226B.7080100@redhat.com> <51FAB5A3.3060701@redhat.com> Message-ID: <703168002.3967058.1377269612518.JavaMail.root@redhat.com> Hi Adam, in overall - this change looks ok. Have you tried additional tests you mentioned in the original message? > > I have done testing on the patch and it looks OK, but I will still test > > it more. Cheers, Pavel ----- Adam Domurad wrote: > On 06/07/2013 02:11 PM, Adam Domurad wrote: > > 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 > > Ping ? > -Adam From adomurad at icedtea.classpath.org Fri Aug 23 13:11:35 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Fri, 23 Aug 2013 20:11:35 +0000 Subject: /hg/icedtea-web: Refactor plugin data creation. Message-ID: changeset 7885b846e290 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=7885b846e290 author: Adam Domurad date: Fri Aug 23 16:03:49 2013 -0400 Refactor plugin data creation. diffstat: ChangeLog | 5 + plugin/icedteanp/IcedTeaNPPlugin.cc | 112 ++++++++++++----------------------- plugin/icedteanp/IcedTeaNPPlugin.h | 27 ++++++- 3 files changed, 64 insertions(+), 80 deletions(-) diffs (272 lines): diff -r 0fbf6f4ac546 -r 7885b846e290 ChangeLog --- a/ChangeLog Mon Aug 19 13:01:03 2013 -0400 +++ b/ChangeLog Fri Aug 23 16:03:49 2013 -0400 @@ -1,3 +1,8 @@ +2013-08-23 Adam Domurad + + * plugin/icedteanp/IcedTeaNPPlugin.cc: Refactor plugin data creation. + * plugin/icedteanp/IcedTeaNPPlugin.h: Same. + 2013-08-19 Adam Domurad * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Evaluate diff -r 0fbf6f4ac546 -r 7885b846e290 plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Aug 19 13:01:03 2013 -0400 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Fri Aug 23 16:03:49 2013 -0400 @@ -47,6 +47,7 @@ #include #include #include +#include //IcedTea-plugin includes #include "IcedTeaPluginUtils.h" @@ -183,12 +184,16 @@ // Sends messages to Java over the bus JavaMessageSender* java_req_proc; +// Queue processing threads +static pthread_t plugin_request_processor_thread1; +static pthread_t plugin_request_processor_thread2; +static pthread_t plugin_request_processor_thread3; // Static instance helper functions. // Have the browser allocate a new ITNPPluginData structure. -static void plugin_data_new (ITNPPluginData** data); +static ITNPPluginData* plugin_data_new (); // Retrieve the current document's documentbase. -static gchar* plugin_get_documentbase (NPP instance); +static std::string plugin_get_documentbase (NPP instance); // Callback used to monitor input pipe status. static gboolean plugin_in_pipe_callback (GIOChannel* source, GIOCondition condition, @@ -337,30 +342,18 @@ PLUGIN_DEBUG("Got variant %p\n", &member_ptr); - - NPError np_error = NPERR_NO_ERROR; - ITNPPluginData* data = NULL; - - gchar* documentbase = NULL; - gchar* read_message = NULL; - gchar* cookie_info = NULL; - - NPObject* npPluginObj = NULL; - if (!instance) - { + { PLUGIN_ERROR ("Browser-provided instance pointer is NULL."); - np_error = NPERR_INVALID_INSTANCE_ERROR; - goto cleanup_done; - } + return NPERR_INVALID_INSTANCE_ERROR; + } // data - plugin_data_new (&data); + ITNPPluginData* data = plugin_data_new (); if (data == NULL) - { + { PLUGIN_ERROR ("Failed to allocate plugin data."); - np_error = NPERR_OUT_OF_MEMORY_ERROR; - goto cleanup_done; + return NPERR_OUT_OF_MEMORY_ERROR; } // start the jvm if needed @@ -386,22 +379,21 @@ g_mutex_lock (data->appletviewer_mutex); + std::string documentbase = plugin_get_documentbase (instance); // Documentbase retrieval. - documentbase = plugin_get_documentbase (instance); - if (documentbase && argc != 0) - { + if (argc != 0) + { // Send parameters to appletviewer. std::string params_string = plugin_parameters_string(argc, argn, argv); - data->parameters_string = g_strdup_printf("tag %s %s", documentbase, params_string.c_str()); + data->parameters_string = g_strdup_printf("tag %s %s", documentbase.c_str(), params_string.c_str()); data->is_applet_instance = true; - } - - if (argc == 0) - { + } + else + { data->is_applet_instance = false; - } + } g_mutex_unlock (data->appletviewer_mutex); @@ -418,12 +410,6 @@ instance->pdata = data; - cleanup_done: - g_free (read_message); - read_message = NULL; - g_free (documentbase); - documentbase = NULL; - // store an identifier for this plugin PLUGIN_DEBUG("Mapping id %d and instance %p\n", instance_counter, instance); g_hash_table_insert(instance_to_id_map, instance, GINT_TO_POINTER(instance_counter)); @@ -432,7 +418,7 @@ PLUGIN_DEBUG ("ITNP_New return\n"); - return np_error; + return NPERR_NO_ERROR; } // Starts the JVM if it is not already running @@ -936,19 +922,21 @@ // HELPER FUNCTIONS -static void -plugin_data_new (ITNPPluginData** data) +static ITNPPluginData* +plugin_data_new () { PLUGIN_DEBUG ("plugin_data_new\n"); - *data = (ITNPPluginData*) - (*browser_functions.memalloc) (sizeof (struct ITNPPluginData)); + ITNPPluginData* data = (ITNPPluginData*)browser_functions.memalloc(sizeof (struct ITNPPluginData)); - // appletviewer_alive is false until the applet viewer is spawned. - if (*data) - memset (*data, 0, sizeof (struct ITNPPluginData)); + if (data) + { + // Call constructor on allocated data + new (data) ITNPPluginData(); + } + PLUGIN_DEBUG ("plugin_data_new return\n"); - PLUGIN_DEBUG ("plugin_data_new return\n"); + return data; } @@ -957,14 +945,11 @@ // documentbase. This function relies on browser-private data so it // will only work when the plugin is loaded in a Mozilla-based // browser. -static gchar* +static std::string plugin_get_documentbase (NPP instance) { PLUGIN_DEBUG ("plugin_get_documentbase\n"); - char const* documentbase = NULL; - gchar* documentbase_copy = NULL; - // FIXME: This method is not ideal, but there are no known NPAPI call // for this. See thread for more information: // http://www.mail-archive.com/chromium-dev at googlegroups.com/msg04844.html @@ -984,16 +969,15 @@ href_id, &href); std::string href_str = IcedTeaPluginUtilities::NPVariantAsString(href); - documentbase_copy = g_strdup (href_str.c_str()); // Release references. browser_functions.releasevariantvalue(&href); browser_functions.releasevariantvalue(&location); - cleanup_done: + PLUGIN_DEBUG ("plugin_get_documentbase return\n"); - PLUGIN_DEBUG("plugin_get_documentbase returning: %s\n", documentbase_copy); + PLUGIN_DEBUG("plugin_get_documentbase returning: %s\n", href_str.c_str()); - return documentbase_copy; + return href_str; } // plugin_in_pipe_callback is called when data is available on the @@ -1740,30 +1724,10 @@ g_hash_table_remove(id_to_instance_map, id_ptr); } - tofree->window_handle = NULL; - tofree->window_height = 0; - tofree->window_width = 0; + /* Explicitly call destructor */ + tofree->~ITNPPluginData(); - // cleanup_appletviewer_mutex: - g_mutex_free (tofree->appletviewer_mutex); - tofree->appletviewer_mutex = NULL; - - // cleanup_instance_string: - g_free (tofree->instance_id); - tofree->instance_id = NULL; - - // cleanup applet tag - g_free (tofree->parameters_string); - tofree->parameters_string = NULL; - - g_free(tofree->source); - tofree->source = NULL; - - // cleanup_data: - // Eliminate back-pointer to plugin instance. - tofree->owner = NULL; (*browser_functions.memfree) (tofree); - tofree = NULL; PLUGIN_DEBUG ("plugin_data_destroy return\n"); } diff -r 0fbf6f4ac546 -r 7885b846e290 plugin/icedteanp/IcedTeaNPPlugin.h --- a/plugin/icedteanp/IcedTeaNPPlugin.h Mon Aug 19 13:01:03 2013 -0400 +++ b/plugin/icedteanp/IcedTeaNPPlugin.h Fri Aug 23 16:03:49 2013 -0400 @@ -74,16 +74,31 @@ // The last plugin window height sent to us by the browser. guint32 window_height; // The source location for this instance - gchar* source; + std::string source; // If this is an actual applet instance, or a dummy instance for static calls bool is_applet_instance; + + ITNPPluginData() { + instance_id = NULL; + parameters_string = NULL; + appletviewer_mutex = NULL; + owner = (NPP)NULL; + window_handle = NULL; + window_width = 0; + window_height = 0; + is_applet_instance = false; + } + ~ITNPPluginData() { + if (appletviewer_mutex) { + g_mutex_free (appletviewer_mutex); + } + // cleanup_instance_string: + g_free (instance_id); + // cleanup applet tag + g_free (parameters_string); + } }; -// Queue processing threads -static pthread_t plugin_request_processor_thread1; -static pthread_t plugin_request_processor_thread2; -static pthread_t plugin_request_processor_thread3; - // Condition on which the queue processor waits extern pthread_cond_t cond_message_available; From adomurad at icedtea.classpath.org Fri Aug 23 13:35:47 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Fri, 23 Aug 2013 20:35:47 +0000 Subject: /hg/icedtea-web: Spawn Java side during C++ unit tests. Many new... Message-ID: changeset 94ebabfba6ab in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=94ebabfba6ab author: Adam Domurad date: Fri Aug 23 16:35:37 2013 -0400 Spawn Java side during C++ unit tests. Many new tests. diffstat: ChangeLog | 34 + plugin/icedteanp/IcedTeaJavaRequestProcessor.cc | 7 +- plugin/icedteanp/IcedTeaNPPlugin.cc | 118 +- plugin/icedteanp/IcedTeaNPPlugin.h | 9 + tests/cpp-unit-tests/IcedTeaJavaRequestProcessorTest.cc | 416 ++++++++++++++ tests/cpp-unit-tests/IcedTeaNPPluginTest.cc | 32 +- tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc | 4 +- tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc | 33 + tests/cpp-unit-tests/MemoryLeakDetector.h | 2 +- tests/cpp-unit-tests/browser_mock.cc | 56 +- tests/cpp-unit-tests/browser_mock.h | 4 +- tests/cpp-unit-tests/browser_mock_npidentifier.cc | 117 +++ tests/cpp-unit-tests/browser_mock_npidentifier.h | 57 + tests/cpp-unit-tests/checked_allocations.h | 6 +- tests/cpp-unit-tests/main.cc | 27 +- 15 files changed, 835 insertions(+), 87 deletions(-) diffs (truncated from 1207 to 500 lines): diff -r 7885b846e290 -r 94ebabfba6ab ChangeLog --- a/ChangeLog Fri Aug 23 16:03:49 2013 -0400 +++ b/ChangeLog Fri Aug 23 16:35:37 2013 -0400 @@ -1,3 +1,37 @@ +2013-08-23 Adam Domurad + + Spawn Java side during C++ unit tests. Many new tests. + * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc + (hasPackage): Minor cleanup. + * plugin/icedteanp/IcedTeaNPPlugin.cc + (initialize_data_directory): New, extracted function. + (NP_Initialize): Calls extracted function. + * plugin/icedteanp/IcedTeaNPPlugin.h: Expose more functions for + testing purposes. + * tests/cpp-unit-tests/IcedTeaNPPluginTest.cc + (get_scriptable_package_object): Test binding of java package + (get_scriptable_java_object): Test binding of java object + * tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc + (NPIdentifierAsString): Update to create npidentifier properly. + * tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc + (getProperty): Test loading java.lang.Integer.MAX_VALUE from C++. + * tests/cpp-unit-tests/MemoryLeakDetector.h + (reset_global_state): Made public + * tests/cpp-unit-tests/checked_allocations.h + (SafeAllocator): New, typedef for allocator that avoids leak detection. + * tests/cpp-unit-tests/browser_mock.cc + (browsermock_setup_functions): Renamed to (browsermock_create_table). + (browsermock_create_table): Now returns browser table, additional + object release and identifier methods added. + * tests/cpp-unit-tests/browser_mock.h: Update for rename. + * tests/cpp-unit-tests/main.cc: Now clears state via + (reset_global_state) + * tests/cpp-unit-tests/IcedTeaJavaRequestProcessorTest.cc: New, + contains unit tests that cover all of JavaRequestProcessor's methods. + * tests/cpp-unit-tests/browser_mock_npidentifier.cc: Allocation-safe + npidentifier mocking, adheres to NPAPI spec. + * tests/cpp-unit-tests/browser_mock_npidentifier.h: Same. + 2013-08-23 Adam Domurad * plugin/icedteanp/IcedTeaNPPlugin.cc: Refactor plugin data creation. diff -r 7885b846e290 -r 94ebabfba6ab plugin/icedteanp/IcedTeaJavaRequestProcessor.cc --- a/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc Fri Aug 23 16:03:49 2013 -0400 +++ b/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc Fri Aug 23 16:35:37 2013 -0400 @@ -1279,7 +1279,6 @@ { JavaResultData* java_result; JavaRequestProcessor* java_request = new JavaRequestProcessor(); - std::string message = std::string(); std::string plugin_instance_id_str = std::string(); IcedTeaPluginUtilities::itoa(plugin_instance_id, &plugin_instance_id_str); @@ -1288,11 +1287,9 @@ this->instance = 0; // context is always 0 (needed for java-side backwards compat.) this->reference = IcedTeaPluginUtilities::getReference(); + std::string message; IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &message); - message.append(" HasPackage "); - message.append(plugin_instance_id_str); - message.append(" "); - message.append(java_result->return_string->c_str()); + message += " HasPackage " + plugin_instance_id_str + " " + *java_result->return_string; postAndWaitForResponse(message); diff -r 7885b846e290 -r 94ebabfba6ab plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Fri Aug 23 16:03:49 2013 -0400 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Fri Aug 23 16:35:37 2013 -0400 @@ -190,8 +190,6 @@ static pthread_t plugin_request_processor_thread3; // Static instance helper functions. -// Have the browser allocate a new ITNPPluginData structure. -static ITNPPluginData* plugin_data_new (); // Retrieve the current document's documentbase. static std::string plugin_get_documentbase (NPP instance); // Callback used to monitor input pipe status. @@ -202,16 +200,12 @@ static gboolean plugin_out_pipe_callback (GIOChannel* source, GIOCondition condition, gpointer plugin_data); -static NPError plugin_start_appletviewer (ITNPPluginData* data); std::string plugin_parameters_string (int argc, char* argn[], char* argv[]); static void plugin_stop_appletviewer (); -// Uninitialize ITNPPluginData structure -static void plugin_data_destroy (NPP instance); NPError get_cookie_info(const char* siteAddr, char** cookieString, uint32_t* len); NPError get_proxy_info(const char* siteAddr, char** proxy, uint32_t* len); void consume_message(gchar* message); -void start_jvm_if_needed(); static void appletviewer_monitor(GPid pid, gint status, gpointer data); void plugin_send_initialization_message(char* instance, gulong handle, int width, int height, @@ -922,7 +916,7 @@ // HELPER FUNCTIONS -static ITNPPluginData* +ITNPPluginData* plugin_data_new () { PLUGIN_DEBUG ("plugin_data_new\n"); @@ -1366,7 +1360,7 @@ return error; } -static NPError +NPError plugin_start_appletviewer (ITNPPluginData* data) { PLUGIN_DEBUG ("plugin_start_appletviewer\n"); @@ -1707,7 +1701,7 @@ PLUGIN_DEBUG ("appletviewer_monitor return\n"); } -static void +void plugin_data_destroy (NPP instance) { PLUGIN_DEBUG ("plugin_data_destroy\n"); @@ -1792,6 +1786,61 @@ return true; } +// Make sure the plugin data directory exists, creating it if necessary. +NPError +initialize_data_directory() +{ + const char* tmpdir_env = getenv("TMPDIR"); + if (tmpdir_env != NULL && g_file_test (tmpdir_env, + (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) + { + data_directory = tmpdir_env; + } + else if (g_file_test (P_tmpdir, + (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) + { + data_directory = P_tmpdir; + } + else + { + // If TMPDIR and P_tmpdir do not exist, try /tmp directly + data_directory = "/tmp"; + } + + data_directory += "/icedteaplugin-"; + if (getenv("USER") != NULL) + data_directory += getenv("USER"); + + // Now create a icedteaplugin subdir + if (!g_file_test (data_directory.c_str(), + (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) + { + int file_error = 0; + + file_error = g_mkdir (data_directory.c_str(), 0700); + if (file_error != 0) + { + PLUGIN_ERROR_THREE ("Failed to create data directory", + data_directory.c_str(), + strerror (errno)); + return NPERR_GENERIC_ERROR; + } + } + + + // If data directory doesn't exist by this point, bail + if (!g_file_test (data_directory.c_str(), + (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) + { + PLUGIN_ERROR_THREE ("Temp directory does not exist: ", + data_directory.c_str(), + strerror (errno)); + return NPERR_GENERIC_ERROR; + } + + return NPERR_NO_ERROR; +} + // FACTORY FUNCTIONS // Provides the browser with pointers to the plugin functions that we @@ -1860,56 +1909,7 @@ NPError np_error = NPERR_NO_ERROR; - // Make sure the plugin data directory exists, creating it if - // necessary. - - const char* tmpdir_env = getenv("TMPDIR"); - if (tmpdir_env != NULL && g_file_test (tmpdir_env, - (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) - { - data_directory = tmpdir_env; - } - else if (g_file_test (P_tmpdir, - (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) - { - data_directory = P_tmpdir; - } - else - { - // If TMPDIR and P_tmpdir do not exist, try /tmp directly - data_directory = "/tmp"; - } - - data_directory += "/icedteaplugin-"; - if (getenv("USER") != NULL) - data_directory += getenv("USER"); - - // Now create a icedteaplugin subdir - if (!g_file_test (data_directory.c_str(), - (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) - { - int file_error = 0; - - file_error = g_mkdir (data_directory.c_str(), 0700); - if (file_error != 0) - { - PLUGIN_ERROR_THREE ("Failed to create data directory", - data_directory.c_str(), - strerror (errno)); - return NPERR_GENERIC_ERROR; - } - } - - - // If data directory doesn't exist by this point, bail - if (!g_file_test (data_directory.c_str(), - (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) - { - PLUGIN_ERROR_THREE ("Temp directory does not exist: ", - data_directory.c_str(), - strerror (errno)); - return NPERR_GENERIC_ERROR; - } + initialize_data_directory(); // Set appletviewer_executable. PLUGIN_DEBUG("Executing java at %s\n", get_plugin_executable().c_str()); diff -r 7885b846e290 -r 94ebabfba6ab plugin/icedteanp/IcedTeaNPPlugin.h --- a/plugin/icedteanp/IcedTeaNPPlugin.h Fri Aug 23 16:03:49 2013 -0400 +++ b/plugin/icedteanp/IcedTeaNPPlugin.h Fri Aug 23 16:35:37 2013 -0400 @@ -99,6 +99,13 @@ } }; +// Have the browser allocate a new ITNPPluginData structure. +ITNPPluginData* plugin_data_new (); +void plugin_data_destroy (NPP instance); + +NPError initialize_data_directory(); +void start_jvm_if_needed(); + // Condition on which the queue processor waits extern pthread_cond_t cond_message_available; @@ -144,4 +151,6 @@ /* Creates a new scriptable plugin object and returns it */ NPObject* allocate_scriptable_object(NPP npp, NPClass *aClass); +NPError plugin_start_appletviewer (ITNPPluginData* data); + #endif /* __ICEDTEANPPLUGIN_H__ */ diff -r 7885b846e290 -r 94ebabfba6ab tests/cpp-unit-tests/IcedTeaJavaRequestProcessorTest.cc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/cpp-unit-tests/IcedTeaJavaRequestProcessorTest.cc Fri Aug 23 16:35:37 2013 -0400 @@ -0,0 +1,416 @@ +/* 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. */ + +#include + +#include +#include + +#include + +#include + +#include "MemoryLeakDetector.h" + +#include "IcedTeaJavaRequestProcessor.h" + +/****************************************************************************** + * Simple helper methods to keep the tests clean. * + ******************************************************************************/ + +static const char* TEST_SOURCE = "[System]"; + +static std::string checked_return(JavaResultData* result) { + CHECK(!result->error_occurred); + return *result->return_string; +} + +// Packages + +static bool jrp_has_package(std::string package_name) { + JavaRequestProcessor processor; + JavaResultData* result = processor.hasPackage(0, package_name); + CHECK(!result->error_occurred); + return (result->return_identifier != 0); +} + +// Classes + +static std::string jrp_find_class(std::string name) { + return checked_return( + JavaRequestProcessor().findClass(0, name) + ); +} + +// Object creation + +static std::string jrp_new_object_with_constructor(std::string class_id, + std::string method_id, + std::vector args = std::vector()) { + return checked_return( + JavaRequestProcessor().newObjectWithConstructor(TEST_SOURCE, + class_id, method_id, args) + ); +} + +static std::string jrp_new_array(std::string class_id, std::string len) { + return checked_return( + JavaRequestProcessor().newArray(class_id, len) + ); +} + +static std::string jrp_new_string(std::string str) { + return checked_return( + JavaRequestProcessor().newString(str) + ); +} + +static std::string jrp_new_object(std::string class_id, + std::vector args = std::vector()) { + return checked_return( + JavaRequestProcessor().newObject(TEST_SOURCE, class_id, args) + ); +} + +static std::string jrp_get_value(std::string object_id) { + return checked_return( + JavaRequestProcessor().getValue(object_id) + ); +} + +// Inheritance + +static bool jrp_is_instance_of(std::string object_id, std::string class_id) { + JavaRequestProcessor processor; + JavaResultData* result = processor.isInstanceOf(object_id, class_id); + + CHECK(!result->error_occurred); + return (result->return_identifier != 0); +} + + +// Java methods operations. + +static std::string jrp_get_method_id(std::string class_id, + std::string method_name, + std::vector args = std::vector()) { + return checked_return( + JavaRequestProcessor().getMethodID(class_id, + browser_functions.getstringidentifier(method_name.c_str()), args) + ); +} + +static std::string jrp_get_static_method_id(std::string class_id, + std::string method_name, + std::vector args = std::vector()) { + return checked_return( + JavaRequestProcessor().getStaticMethodID(class_id, + browser_functions.getstringidentifier(method_name.c_str()), args) + ); +} + +static std::string jrp_call_method(std::string object_id, + std::string method_name, std::vector args = std::vector()) { + return checked_return( + JavaRequestProcessor().callMethod(TEST_SOURCE, object_id, + method_name, args) + ); +} + +static std::string jrp_call_static_method(std::string class_id, + std::string method_name, std::vector args = std::vector()) { + return checked_return( + JavaRequestProcessor().callStaticMethod(TEST_SOURCE, class_id, + method_name, args) + ); +} + +static std::string jrp_get_string(std::string object_id) { + return checked_return( + JavaRequestProcessor().getString(object_id) + ); +} + +static std::string jrp_get_class_id(std::string object_id) { + return checked_return( + JavaRequestProcessor().getClassID(object_id) + ); +} + + +// Java field operations. + +static std::string jrp_get_field(std::string object_id, + std::string field_name) { + return checked_return( + JavaRequestProcessor().getField(TEST_SOURCE, + jrp_get_class_id(object_id), object_id, field_name) + ); +} + +static std::string jrp_get_field_id(std::string class_id, + std::string field_name) { + return checked_return( + JavaRequestProcessor().getFieldID(class_id, field_name) + ); +} + +static std::string jrp_get_static_field_id(std::string class_id, + std::string field_name) { + return checked_return( + JavaRequestProcessor().getStaticFieldID(class_id, field_name) + ); +} + +static std::string jrp_get_static_field(std::string class_id, + std::string field_name) { + return checked_return( + JavaRequestProcessor().getStaticField(TEST_SOURCE, class_id, field_name) + ); +} + +static std::string jrp_set_field(std::string object_id, std::string field_name, + std::string value_id) { + return checked_return( + JavaRequestProcessor().setField(TEST_SOURCE, + jrp_get_class_id(object_id), object_id, field_name, value_id) + ); +} + +static std::string jrp_set_static_field(std::string class_id, std::string field_name, + std::string value_id) { + return checked_return( + JavaRequestProcessor().setStaticField(TEST_SOURCE, class_id, field_name, value_id) + ); +} + +// Java array operations. + +static std::string jrp_set_slot(std::string object_id, std::string index, + std::string value_id) { + return checked_return( + JavaRequestProcessor().setSlot(object_id, index, value_id) + ); +} + +static std::string jrp_get_slot(std::string object_id, std::string index) { + return checked_return( From gitne at excite.co.jp Sun Aug 25 04:29:14 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Sun, 25 Aug 2013 20:29:14 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtyZmNdW2ljZWR0ZWEtd2ViXSBDYWNoZSB2aWV3ZXIgY2xlYW51cA==?= Message-ID: <201308251129.r7PBTECt008152@mail-web01.excite.co.jp> Ping? Anybody? "Jacob Wisor" wrote: > Hello, > > * Added closing of cache viewer by ESC key > * Added proper dis-/enabling of cache viewer's buttons > * Added busy mouse cursor indicator when populating the cache viewer > > Everything is done on purpose on the AWT thread as before. Although I am personally not in favour of anonymous classes, I have tried to stick to the prevalent coding style. > > Unfortunatelly, I was unable to test the cache viewer's behavior because I do not know how to put synthetic cache entries into the cache. Can anyone help me with that? What does a the cache look like when filled with resources? Is there any index file that keeps track of the cache? > > Regards, > Jacob From gitne at excite.co.jp Sun Aug 25 04:30:46 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Sun, 25 Aug 2013 20:30:46 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtyZmNdW2ljZWR0ZWEtd2ViXSBUZW1wb3JhcnkgZmlsZXMgbG9jYXRpb24gY2hvb3NlciBjbGVhbnVw?= Message-ID: <201308251130.r7PBUkV4008232@mail-web01.excite.co.jp> Ping? "Jacob Wisor" wrote: > Hello, > > * Made temporary files location JFileChooser open at the currently specified location > * Made temporary files location JFileChooser display a helpful title > * Removed misleading "All Files" file filter from JFileChooser > * Added new message to resources for JFileChooser's choose button > * Fixed a few inconsistent messages in resource files > > @Jiri > Please add a cs translation for the new "TIFPFileChooserChooseButton" message. > > Regards, > Jacob From bugzilla-daemon at icedtea.classpath.org Sun Aug 25 11:45:34 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 25 Aug 2013 18:45:34 +0000 Subject: [Bug 1530] New: Fails to find code or object attributes in valid tags Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1530 Bug ID: 1530 Summary: Fails to find code or object attributes in valid tags Classification: Unclassified Product: IcedTea-Web Version: 1.3.2 Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P3 Component: Plugin Assignee: dbhole at redhat.com Reporter: sindal at gmail.com CC: unassigned at icedtea.classpath.org Tested with http://www.java.com/en/download/testjava.jsp and my bank's website. Both give a similar error, and this one is what I get from the first link. I get the same error in chromium and iceweasel. If you need additional debug infomation just say ;) java version "1.7.0_21" OpenJDK Runtime Environment (IcedTea 2.3.9) (7u21-2.3.9-5) OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) net.sourceforge.jnlp.PluginParameterException: Applet tag must specify a 'code' or 'object' attribute. at net.sourceforge.jnlp.PluginParameters.(PluginParameters.java:61) at sun.applet.PluginParameterParser.parse(PluginParameterParser.java:92) at sun.applet.PluginAppletViewer.handleInitializationMessage(PluginAppletViewer.java:472) at sun.applet.PluginAppletViewer.handleMessage(PluginAppletViewer.java:521) at sun.applet.PluginStreamHandler.handleMessage(PluginStreamHandler.java:231) at sun.applet.PluginMessageHandlerWorker.run(PluginMessageHandlerWorker.java:93) net.sourceforge.jnlp.PluginParameterException: Applet tag must specify a 'code' or 'object' attribute. at net.sourceforge.jnlp.PluginParameters.(PluginParameters.java:61) at sun.applet.PluginParameterParser.parse(PluginParameterParser.java:92) at sun.applet.PluginAppletViewer.handleInitializationMessage(PluginAppletViewer.java:472) at sun.applet.PluginAppletViewer.handleMessage(PluginAppletViewer.java:521) at sun.applet.PluginStreamHandler.handleMessage(PluginStreamHandler.java:231) at sun.applet.PluginMessageHandlerWorker.run(PluginMessageHandlerWorker.java:93) java.lang.RuntimeException: Failed to handle message: handle 39850140 width 500 height 280 tag http://www.java.com/en/download/testjava.jsp for instance 1 at sun.applet.PluginAppletViewer.handleMessage(PluginAppletViewer.java:557) at sun.applet.PluginStreamHandler.handleMessage(PluginStreamHandler.java:231) at sun.applet.PluginMessageHandlerWorker.run(PluginMessageHandlerWorker.java:93) Caused by: net.sourceforge.jnlp.PluginParameterException: Applet tag must specify a 'code' or 'object' attribute. at net.sourceforge.jnlp.PluginParameters.(PluginParameters.java:61) at sun.applet.PluginParameterParser.parse(PluginParameterParser.java:92) at sun.applet.PluginAppletViewer.handleInitializationMessage(PluginAppletViewer.java:472) at sun.applet.PluginAppletViewer.handleMessage(PluginAppletViewer.java:521) ... 2 more java.lang.RuntimeException: Failed to handle message: handle 39850165 width 500 height 280 tag http://www.java.com/en/download/testjava.jsp for instance 2 at sun.applet.PluginAppletViewer.handleMessage(PluginAppletViewer.java:557) at sun.applet.PluginStreamHandler.handleMessage(PluginStreamHandler.java:231) at sun.applet.PluginMessageHandlerWorker.run(PluginMessageHandlerWorker.java:93) Caused by: net.sourceforge.jnlp.PluginParameterException: Applet tag must specify a 'code' or 'object' attribute. at net.sourceforge.jnlp.PluginParameters.(PluginParameters.java:61) at sun.applet.PluginParameterParser.parse(PluginParameterParser.java:92) at sun.applet.PluginAppletViewer.handleInitializationMessage(PluginAppletViewer.java:472) at sun.applet.PluginAppletViewer.handleMessage(PluginAppletViewer.java:521) ... 2 more More version info: ||/ Name Version Architecture Description +++-=====================================-=============================-============-=============================================================================== ii icedtea-7-jre-jamvm:amd64 7u21-2.3.9-5 amd64 Alternative JVM for OpenJDK, using JamVM ii icedtea-7-plugin:amd64 1.3.2-1 amd64 web browser plugin based on OpenJDK and IcedTea to execute Java applets ii icedtea-netx:amd64 1.3.2-1 amd64 NetX - implementation of the Java Network Launching Protocol (JNLP) ii icedtea-netx-common 1.4-3~deb7u1 all NetX - implementation of the Java Network Launching Protocol (JNLP) ii iceweasel 17.0.8esr-2 amd64 Web browser based on Firefox rc openjdk-6-jre-headless:amd64 6b27-1.12.6-1~deb7u1 amd64 OpenJDK Java runtime, using Hotspot JIT (headless) ii openjdk-7-jdk:amd64 7u21-2.3.9-5 amd64 OpenJDK Development Kit (JDK) ii openjdk-7-jre:amd64 7u21-2.3.9-5 amd64 OpenJDK Java runtime, using Hotspot JIT ii openjdk-7-jre-headless:amd64 7u21-2.3.9-5 amd64 OpenJDK Java runtime, using Hotspot JIT (headless) ii openjdk-7-jre-lib 7u21-2.3.9-5 all OpenJDK Java runtime (architecture independent libraries) -- 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/20130825/0621cd3e/attachment.html From ptisnovs at icedtea.classpath.org Mon Aug 26 01:51:55 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 26 Aug 2013 08:51:55 +0000 Subject: /hg/rhino-tests: Added new test testAsSubclass into the test sui... Message-ID: changeset 642a8c8781e6 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=642a8c8781e6 author: Pavel Tisnovsky date: Mon Aug 26 10:55:36 2013 +0200 Added new test testAsSubclass into the test suite CompilableClassTest. diffstat: ChangeLog | 5 + src/org/RhinoTests/CompilableClassTest.java | 158 ++++++++++++++++++++++++++++ 2 files changed, 163 insertions(+), 0 deletions(-) diffs (180 lines): diff -r 925693e5b8eb -r 642a8c8781e6 ChangeLog --- a/ChangeLog Fri Aug 23 11:02:39 2013 +0200 +++ b/ChangeLog Mon Aug 26 10:55:36 2013 +0200 @@ -1,3 +1,8 @@ +2013-08-26 Pavel Tisnovsky + + * src/org/RhinoTests/CompilableClassTest.java: + Added new test testAsSubclass into the test suite CompilableClassTest. + 2013-08-23 Pavel Tisnovsky * src/org/RhinoTests/BindingsClassTest.java: diff -r 925693e5b8eb -r 642a8c8781e6 src/org/RhinoTests/CompilableClassTest.java --- a/src/org/RhinoTests/CompilableClassTest.java Fri Aug 23 11:02:39 2013 +0200 +++ b/src/org/RhinoTests/CompilableClassTest.java Mon Aug 26 10:55:36 2013 +0200 @@ -1048,6 +1048,164 @@ } /** + * Test for method javax.script.Compilable.getClass().asSubclass() + */ + protected void testAsSubclass() { + try { + this.compilableClass.asSubclass(compilableClass); + } + catch (Exception e) { + e.printStackTrace(); + throw new AssertionError(e.getMessage()); + } + + try { + this.compilableClass.asSubclass(java.lang.Void.class); + throw new AssertionError("Class.asSubclass(java.lang.Void.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.asSubclass(java.lang.Number.class); + throw new AssertionError("Class.asSubclass(java.lang.Number.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.asSubclass(java.lang.Byte.class); + throw new AssertionError("Class.asSubclass(java.lang.Byte.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.asSubclass(java.lang.Double.class); + throw new AssertionError("Class.asSubclass(java.lang.Double.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.asSubclass(java.lang.Float.class); + throw new AssertionError("Class.asSubclass(java.lang.Float.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.asSubclass(java.lang.Integer.class); + throw new AssertionError("Class.asSubclass(java.lang.Integer.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.asSubclass(java.lang.Long.class); + throw new AssertionError("Class.asSubclass(java.lang.Long.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.asSubclass(java.lang.Short.class); + throw new AssertionError("Class.asSubclass(java.lang.Short.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.asSubclass(java.lang.String.class); + throw new AssertionError("Class.asSubclass(java.lang.String.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.asSubclass(java.lang.StringBuffer.class); + throw new AssertionError("Class.asSubclass(java.lang.StringBuffer.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.asSubclass(java.lang.StringBuilder.class); + throw new AssertionError("Class.asSubclass(java.lang.StringBuilder.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.asSubclass(java.awt.Color.class); + throw new AssertionError("Class.asSubclass(java.awt.Color.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.asSubclass(java.awt.Font.class); + throw new AssertionError("Class.asSubclass(java.awt.Font.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.asSubclass(java.awt.Image.class); + throw new AssertionError("Class.asSubclass(java.awt.Image.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.asSubclass(javax.swing.JPanel.class); + throw new AssertionError("Class.asSubclass(javax.swing.JPanel.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.asSubclass(javax.swing.JColorChooser.class); + throw new AssertionError("Class.asSubclass(javax.swing.JColorChooser.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.asSubclass(javax.swing.JScrollBar.class); + throw new AssertionError("Class.asSubclass(javax.swing.JScrollBar.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.asSubclass(javax.swing.JSlider.class); + throw new AssertionError("Class.asSubclass(javax.swing.JSlider.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + } + + /** * Test for instanceof operator applied to a class javax.script.Compilable */ @SuppressWarnings("cast") From ptisnovs at icedtea.classpath.org Mon Aug 26 02:06:28 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 26 Aug 2013 09:06:28 +0000 Subject: /hg/gfx-test: 2 new changesets Message-ID: changeset 00df687df579 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=00df687df579 author: Pavel Tisnovsky date: Fri Aug 23 11:04:17 2013 +0200 Two tests added into BitBltAffineIdentityTransformOp test suite. changeset ed7536f1482a in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=ed7536f1482a author: Pavel Tisnovsky date: Mon Aug 26 11:10:09 2013 +0200 Six tests added into BitBltAffineQuadrantRotateTransformOp test suite. diffstat: ChangeLog | 10 + src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java | 28 +++ src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java | 85 ++++++++++ 3 files changed, 123 insertions(+), 0 deletions(-) diffs (150 lines): diff -r e1e29ae7737b -r ed7536f1482a ChangeLog --- a/ChangeLog Thu Aug 22 13:11:55 2013 +0200 +++ b/ChangeLog Mon Aug 26 11:10:09 2013 +0200 @@ -1,3 +1,13 @@ +2013-08-26 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java: + Six tests added into BitBltAffineQuadrantRotateTransformOp test suite. + +2013-08-23 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java: + Two tests added into BitBltAffineIdentityTransformOp test suite. + 2013-08-22 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r e1e29ae7737b -r ed7536f1482a src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java --- a/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java Thu Aug 22 13:11:55 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java Mon Aug 26 11:10:09 2013 +0200 @@ -324,6 +324,34 @@ } /** + * 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 testBitBltEmptyBufferedImageType4ByteABGRPreIdentifyTranspormationOp5(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGRPre(image, graphics2d, IdentifyTranspormationOp5); + } + + /** + * 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 testBitBltEmptyBufferedImageType4ByteABGRPreIdentifyTranspormationOp6(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType4ByteABGRPre(image, graphics2d, IdentifyTranspormationOp6); + } + + /** * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. * * @param image diff -r e1e29ae7737b -r ed7536f1482a src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java --- a/src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java Thu Aug 22 13:11:55 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java Mon Aug 26 11:10:09 2013 +0200 @@ -108,6 +108,91 @@ } } + + /** + * 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 testBitBltCheckerBufferedImageType3ByteBGRRotateTransformation0Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, RotateTransformationNearest1Op[0]); + } + + /** + * 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 testBitBltCheckerBufferedImageType3ByteBGRRotateTransformation1Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, RotateTransformationNearest1Op[1]); + } + + /** + * 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 testBitBltCheckerBufferedImageType3ByteBGRRotateTransformation2Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, RotateTransformationNearest1Op[2]); + } + + /** + * 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 testBitBltCheckerBufferedImageType3ByteBGRRotateTransformation3Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, RotateTransformationNearest1Op[3]); + } + + /** + * 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 testBitBltCheckerBufferedImageType3ByteBGRRotateTransformation4Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, RotateTransformationNearest1Op[4]); + } + + /** + * 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 testBitBltCheckerBufferedImageType3ByteBGRRotateTransformation5Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, RotateTransformationNearest1Op[5]); + } + /** * Entry point to the test suite. * From bugzilla-daemon at icedtea.classpath.org Mon Aug 26 06:24:23 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 26 Aug 2013 13:24:23 +0000 Subject: [Bug 1530] Fails to find code or object attributes in valid tags In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1530 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|dbhole 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/20130826/2c6da60b/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Aug 26 10:56:02 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 26 Aug 2013 17:56:02 +0000 Subject: [Bug 1530] Fails to find code or object attributes in valid tags In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1530 --- Comment #1 from Andrew Azores --- Hi, Which OS/version are you running? I'll see if I can reproduce this. It looks like you're using IcedTea-Web version 1.3 though, so it might be that this bug has already been fixed. I was not able to reproduce this using ITW 1.3, 1.4, or mercurial HEAD in Fedora 19. -- 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/20130826/c8ef8168/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Aug 26 11:12:21 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 26 Aug 2013 18:12:21 +0000 Subject: [Bug 1530] Fails to find code or object attributes in valid tags In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1530 --- Comment #2 from sindal at gmail.com --- Debian testing, never the fast with the upgrades ;) I'll just take a look if the is a more recent version in unstable or experimental -- 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/20130826/ef3c79be/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Aug 26 11:19:57 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 26 Aug 2013 18:19:57 +0000 Subject: [Bug 1530] Fails to find code or object attributes in valid tags In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1530 --- Comment #3 from Andrew Azores --- I had a hunch :) you should be able to get 1.4 from the unstable repos. Let me know if the problem still persists. -- 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/20130826/6373e52f/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Aug 26 11:23:21 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 26 Aug 2013 18:23:21 +0000 Subject: [Bug 1530] Fails to find code or object attributes in valid tags In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1530 sindal at gmail.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #4 from sindal at gmail.com --- Okay I tested it with downloading these packages from unstable icedtea-7-plugin_1.4-3_amd64.deb icedtea-netx_1.4-3_amd64.deb icedtea-netx-common_1.4-3_all.deb and manually installing those with dpkg -i This solved the problem. I'll mark this bug as invalid - might be a duplicate of something tho ;) -- 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/20130826/67be0365/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Aug 26 11:46:51 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 26 Aug 2013 18:46:51 +0000 Subject: [Bug 1530] Fails to find code or object attributes in valid tags In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1530 Andrew Azores changed: What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |REOPENED Resolution|INVALID |--- --- Comment #5 from Andrew Azores --- Hm - I'm actually not sure what happened here. The PluginParameters class that threw the exception was actually first introduced after the release of 1.3 and does not appear to have been backported, so it only exists in the 1.4 and HEAD repos. Sounds like something weird went on with the packaging here. If "1.3" is what's available to testing (and stable?) and it's broken on something as simple as the test page on java.com, it's probably still worth fixing. I'm going to reopen this and dig deeper. -- 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/20130826/abaa8e21/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Aug 26 12:06:03 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 26 Aug 2013 19:06:03 +0000 Subject: [Bug 1528] Chrome and Firefox freeze loading .jar (due permissions fail?) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1528 --- Comment #1 from Andrew Azores --- Hi, Would you be able to tell me which webpage this is occurring on? -- 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/20130826/11bea917/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Aug 26 12:08:58 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 26 Aug 2013 19:08:58 +0000 Subject: [Bug 1513] Applet fails to load In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1513 --- Comment #2 from Andrew Azores --- multime200, do you have instructions for steps I could take to reproduce this for myself? -- 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/20130826/3422d220/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Aug 26 12:10:45 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 26 Aug 2013 19:10:45 +0000 Subject: [Bug 1507] Opening a VPN episode (Citrix). Serious fatal error window pop-up. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1507 --- Comment #6 from Andrew Azores --- I haven't forgotten about this report, don't worry. This is just difficult to trace without having a method to reproduce it myself. There's another report that just came in which I suspect might be a duplicate of this one, but I am not sure (ID 1528). 1513 is also similar. -- 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/20130826/9d187335/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Aug 26 12:12:00 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 26 Aug 2013 19:12:00 +0000 Subject: [Bug 1530] Fails to find code or object attributes in valid tags In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1530 --- Comment #6 from sindal at gmail.com --- just tried an "apt-get source icedtea-netx" and "rgrep PluginPara icedtea-web-1.3.2/" ... it did indeed give no results. Let me know if you need me to make some additional tests. -- 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/20130826/fbfad05a/attachment.html From aazores at redhat.com Mon Aug 26 12:49:20 2013 From: aazores at redhat.com (Andrew Azores) Date: Mon, 26 Aug 2013 15:49:20 -0400 Subject: [rfc][icedtea-web] Very small SecurityDialog refactor Message-ID: <521BB140.80203@redhat.com> Changelog: * /netx/net/sourceforge/jnlp/security/SecurityDialogs.java: refactored return statements following getUserResponse(message) calls Not much to explain here really. Some of the if-else going on was a bit unnecessary since the return value is boolean as well, and checking if the reference is null before using the instanceof operator is also not needed as "null instanceof Foo" is defined as false anyway. Thanks, -- Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: SecurityDialog_refactor.patch Type: text/x-patch Size: 2200 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130826/da2babe5/SecurityDialog_refactor.patch From aazores at redhat.com Mon Aug 26 13:03:01 2013 From: aazores at redhat.com (Andrew Azores) Date: Mon, 26 Aug 2013 16:03:01 -0400 Subject: [rfc][icedtea-web] Temporary files location chooser cleanup In-Reply-To: <201308251130.r7PBUkV4008232@mail-web01.excite.co.jp> References: <201308251130.r7PBUkV4008232@mail-web01.excite.co.jp> Message-ID: <521BB475.3030403@redhat.com> On 08/25/2013 07:30 AM, Jacob Wisor wrote: > Ping? > > "Jacob Wisor" wrote: >> Hello, >> >> * Made temporary files location JFileChooser open at the currently specified location >> * Made temporary files location JFileChooser display a helpful title >> * Removed misleading "All Files" file filter from JFileChooser >> * Added new message to resources for JFileChooser's choose button >> * Fixed a few inconsistent messages in resource files >> >> @Jiri >> Please add a cs translation for the new "TIFPFileChooserChooseButton" message. >> >> Regards, >> Jacob Personally I don't really like the "Choose" label on the button, I would prefer if it was left as "Open". It just seems more standard for a file browser popup. But I'm not really opposed to the change if you insist on it. Everything else looks good to me. Thanks, -- Andrew A From aazores at redhat.com Mon Aug 26 13:07:21 2013 From: aazores at redhat.com (Andrew Azores) Date: Mon, 26 Aug 2013 16:07:21 -0400 Subject: [rfc][icedtea-web] Cache viewer cleanup In-Reply-To: <201308251129.r7PBTECt008152@mail-web01.excite.co.jp> References: <201308251129.r7PBTECt008152@mail-web01.excite.co.jp> Message-ID: <521BB579.2010004@redhat.com> On 08/25/2013 07:29 AM, Jacob Wisor wrote: > Ping? Anybody? > > "Jacob Wisor" wrote: >> Hello, >> >> * Added closing of cache viewer by ESC key >> * Added proper dis-/enabling of cache viewer's buttons >> * Added busy mouse cursor indicator when populating the cache viewer >> >> Everything is done on purpose on the AWT thread as before. Although I am personally not in favour of anonymous classes, I have tried to stick to the prevalent coding style. >> >> Unfortunatelly, I was unable to test the cache viewer's behavior because I do not know how to put synthetic cache entries into the cache. Can anyone help me with that? What does a the cache look like when filled with resources? Is there any index file that keeps track of the cache? >> >> Regards, >> Jacob Check your editor settings please, you seem to be mixing tabs + spaces (mostly using tabs). I can try to give this a proper review later on but I don't really know enough about the caching system either to be honest. Thanks, -- Andrew A From gitne at excite.co.jp Mon Aug 26 16:04:45 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Tue, 27 Aug 2013 08:04:45 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtyZmNdW2ljZWR0ZWEtd2ViXSBUZW1wb3JhcnkgZmlsZXMgbG9jYXRpb24gY2hvb3NlciBjbGVhbnVw?= Message-ID: <201308262304.r7QN4jKN016515@mail-web01.excite.co.jp> "Andrew Azores" wrote: > On 08/25/2013 07:30 AM, Jacob Wisor wrote: > > Ping? > > > > "Jacob Wisor" wrote: > >> Hello, > >> > >> * Made temporary files location JFileChooser open at the currently specified location > >> * Made temporary files location JFileChooser display a helpful title > >> * Removed misleading "All Files" file filter from JFileChooser > >> * Added new message to resources for JFileChooser's choose button > >> * Fixed a few inconsistent messages in resource files > >> > >> @Jiri > >> Please add a cs translation for the new "TIFPFileChooserChooseButton" message. > >> > >> Regards, > >> Jacob > > Personally I don't really like the "Choose" label on the button, I would > prefer if it was left as "Open". It just seems more standard for a file > browser popup. But I'm not really opposed to the change if you insist on > it. Everything else looks good to me. I would also rather leave JFileChooser's default "Open" button unchanged, but the swing framework does not use the native system's own open file dialog that is usually localized. As for now, OpenJDK supports 5 languages only, hence for languages that are supported by IcedTea-Web but not by OpenJDK the user is going to see an oddly outstanding English open file dialog in an otherwise fully localized user-experience. Furthermore, the action that is ought to be done is not openning a file or directory but actually selecting or choosing a directory, so changing the button's text to "Choose" - even in English - seems reasonable. I do not insist to keep it the proposed way, but imho there are sufficient reasons to do it. Thank you for reviewing. Jacob From ptisnovs at icedtea.classpath.org Tue Aug 27 01:28:46 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 27 Aug 2013 08:28:46 +0000 Subject: /hg/gfx-test: Six new tests added into BitBltAffineIdentityTrans... Message-ID: changeset 30f1f5aa9fa1 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=30f1f5aa9fa1 author: Pavel Tisnovsky date: Tue Aug 27 10:32:28 2013 +0200 Six new tests added into BitBltAffineIdentityTransformOp test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java | 140 ++++++++++ 2 files changed, 145 insertions(+), 0 deletions(-) diffs (162 lines): diff -r ed7536f1482a -r 30f1f5aa9fa1 ChangeLog --- a/ChangeLog Mon Aug 26 11:10:09 2013 +0200 +++ b/ChangeLog Tue Aug 27 10:32:28 2013 +0200 @@ -1,3 +1,8 @@ +2013-08-27 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java: + Six new tests added into BitBltAffineIdentityTransformOp test suite. + 2013-08-26 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java: diff -r ed7536f1482a -r 30f1f5aa9fa1 src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java --- a/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java Mon Aug 26 11:10:09 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java Tue Aug 27 10:32:28 2013 +0200 @@ -352,6 +352,146 @@ } /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageTypeByteBinaryIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteBinary(image, graphics2d, IdentifyTranspormationOp1); + } + + /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageTypeByteBinaryIdentifyTranspormationOp2(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteBinary(image, graphics2d, IdentifyTranspormationOp2); + } + + /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageTypeByteBinaryIdentifyTranspormationOp3(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteBinary(image, graphics2d, IdentifyTranspormationOp3); + } + + /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageTypeByteBinaryIdentifyTranspormationOp4(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteBinary(image, graphics2d, IdentifyTranspormationOp4); + } + + /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageTypeByteBinaryIdentifyTranspormationOp5(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteBinary(image, graphics2d, IdentifyTranspormationOp5); + } + + /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageTypeByteBinaryIdentifyTranspormationOp6(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteBinary(image, graphics2d, IdentifyTranspormationOp6); + } + + /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageTypeByteIndexedIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, IdentifyTranspormationOp1); + } + + /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageTypeByteIndexedIdentifyTranspormationOp2(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, IdentifyTranspormationOp2); + } + + /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageTypeByteIndexedIdentifyTranspormationOp3(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, IdentifyTranspormationOp3); + } + + /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageTypeByteIndexedIdentifyTranspormationOp4(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, IdentifyTranspormationOp4); + } + + /** * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. * * @param image From ptisnovs at icedtea.classpath.org Tue Aug 27 01:36:23 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 27 Aug 2013 08:36:23 +0000 Subject: /hg/rhino-tests: Added new test testAsSubclass into the test sui... Message-ID: changeset fe428022f9a2 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=fe428022f9a2 author: Pavel Tisnovsky date: Tue Aug 27 10:40:05 2013 +0200 Added new test testAsSubclass into the test suite CompilableClassTest. diffstat: ChangeLog | 5 + src/org/RhinoTests/CompiledScriptClassTest.java | 166 ++++++++++++++++++++++++ 2 files changed, 171 insertions(+), 0 deletions(-) diffs (188 lines): diff -r 642a8c8781e6 -r fe428022f9a2 ChangeLog --- a/ChangeLog Mon Aug 26 10:55:36 2013 +0200 +++ b/ChangeLog Tue Aug 27 10:40:05 2013 +0200 @@ -1,3 +1,8 @@ +2013-08-27 Pavel Tisnovsky + + * src/org/RhinoTests/CompiledScriptClassTest.java: + Added new test testAsSubclass into the test suite CompilableClassTest. + 2013-08-26 Pavel Tisnovsky * src/org/RhinoTests/CompilableClassTest.java: diff -r 642a8c8781e6 -r fe428022f9a2 src/org/RhinoTests/CompiledScriptClassTest.java --- a/src/org/RhinoTests/CompiledScriptClassTest.java Mon Aug 26 10:55:36 2013 +0200 +++ b/src/org/RhinoTests/CompiledScriptClassTest.java Tue Aug 27 10:40:05 2013 +0200 @@ -1209,6 +1209,172 @@ } /** + * Test for method javax.script.CompiledScript.getClass().asSubclass() + */ + protected void testAsSubclass() { + try { + this.compiledScriptClass.asSubclass(compiledScriptClass); + } + catch (Exception e) { + e.printStackTrace(); + throw new AssertionError(e.getMessage()); + } + + try { + this.compiledScriptClass.asSubclass(Object.class); + } + catch (Exception e) { + e.printStackTrace(); + throw new AssertionError(e.getMessage()); + } + + try { + this.compiledScriptClass.asSubclass(java.lang.Void.class); + throw new AssertionError("Class.asSubclass(java.lang.Void.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compiledScriptClass.asSubclass(java.lang.Number.class); + throw new AssertionError("Class.asSubclass(java.lang.Number.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compiledScriptClass.asSubclass(java.lang.Byte.class); + throw new AssertionError("Class.asSubclass(java.lang.Byte.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compiledScriptClass.asSubclass(java.lang.Double.class); + throw new AssertionError("Class.asSubclass(java.lang.Double.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compiledScriptClass.asSubclass(java.lang.Float.class); + throw new AssertionError("Class.asSubclass(java.lang.Float.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compiledScriptClass.asSubclass(java.lang.Integer.class); + throw new AssertionError("Class.asSubclass(java.lang.Integer.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compiledScriptClass.asSubclass(java.lang.Long.class); + throw new AssertionError("Class.asSubclass(java.lang.Long.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compiledScriptClass.asSubclass(java.lang.Short.class); + throw new AssertionError("Class.asSubclass(java.lang.Short.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compiledScriptClass.asSubclass(java.lang.String.class); + throw new AssertionError("Class.asSubclass(java.lang.String.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compiledScriptClass.asSubclass(java.lang.StringBuffer.class); + throw new AssertionError("Class.asSubclass(java.lang.StringBuffer.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compiledScriptClass.asSubclass(java.lang.StringBuilder.class); + throw new AssertionError("Class.asSubclass(java.lang.StringBuilder.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compiledScriptClass.asSubclass(java.awt.Color.class); + throw new AssertionError("Class.asSubclass(java.awt.Color.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compiledScriptClass.asSubclass(java.awt.Font.class); + throw new AssertionError("Class.asSubclass(java.awt.Font.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compiledScriptClass.asSubclass(java.awt.Image.class); + throw new AssertionError("Class.asSubclass(java.awt.Image.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compiledScriptClass.asSubclass(javax.swing.JPanel.class); + throw new AssertionError("Class.asSubclass(javax.swing.JPanel.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compiledScriptClass.asSubclass(javax.swing.JColorChooser.class); + throw new AssertionError("Class.asSubclass(javax.swing.JColorChooser.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compiledScriptClass.asSubclass(javax.swing.JScrollBar.class); + throw new AssertionError("Class.asSubclass(javax.swing.JScrollBar.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compiledScriptClass.asSubclass(javax.swing.JSlider.class); + throw new AssertionError("Class.asSubclass(javax.swing.JSlider.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + } + + /** * Test for instanceof operator applied to a class javax.script.CompiledScript */ @SuppressWarnings("cast") From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 07:24:51 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 14:24:51 +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 Adam Domurad changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|adomurad 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/20130827/2abdb4fa/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 07:25:27 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 14:25:27 +0000 Subject: [Bug 1029] Error in web access to HP procurve switches In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1029 Adam Domurad changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|adomurad 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/20130827/2a003232/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 07:25:39 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 14:25:39 +0000 Subject: [Bug 1102] Javaws gives mixed signage warning with headless In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1102 Adam Domurad changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|adomurad 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/20130827/9999cc6a/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 07:25:50 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 14:25:50 +0000 Subject: [Bug 1116] Plugin still includes classpaths specified in jar manifests when running locally In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1116 Adam Domurad changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|adomurad 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/20130827/84e6caf4/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 07:26:04 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 14:26:04 +0000 Subject: [Bug 1142] Repeated prompts for approval are displayed for certificates that have been previously approved during current runtime In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1142 Adam Domurad changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|adomurad 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/20130827/2e25cfb9/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 07:27:08 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 14:27:08 +0000 Subject: [Bug 1205] Plugin crashes with java.lang.NullPointerException with AUSkey software In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1205 Adam Domurad changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|adomurad 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/20130827/7ab10701/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 07:27:31 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 14:27:31 +0000 Subject: [Bug 1251] getResource failures on swing EDT caused by AppContext having wrong classloader In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1251 Adam Domurad changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|adomurad 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/20130827/9c041fe2/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 07:27:43 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 14:27:43 +0000 Subject: [Bug 1253] JNLP applets run on Swing EDT thread In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1253 Adam Domurad changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|adomurad 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/20130827/ce6f0279/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 07:28:18 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 14:28:18 +0000 Subject: [Bug 1271] icedtea-web does not handle 'javascript:' protocol URLs In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1271 Adam Domurad changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #4 from Adam Domurad --- This is now fixed in 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/20130827/7af98646/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 07:29:32 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 14:29:32 +0000 Subject: [Bug 1112] Main class from signed jar's INDEX.LIST fails to load In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1112 Adam Domurad changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|adomurad 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/20130827/3b60180a/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 07:29:35 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 14:29:35 +0000 Subject: [Bug 1096] ITW shouldn't let time-stamped signatures expire In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1096 Adam Domurad changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|adomurad 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/20130827/0831b461/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 07:29:40 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 14:29:40 +0000 Subject: [Bug 1016] IcedTea-web sandboxes all jars in mixed unsigned jars + signed jars applets In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1016 Adam Domurad changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|adomurad 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/20130827/795ed66a/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 07:29:49 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 14:29:49 +0000 Subject: [Bug 1513] Applet fails to load In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1513 Adam Domurad changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|adomurad 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/20130827/3b0ee606/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 07:29:56 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 14:29:56 +0000 Subject: [Bug 1298] LiveConnect - problem setting array elements (applet variables) from JS In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1298 Adam Domurad changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|adomurad 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/20130827/458a78ec/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 07:29:54 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 14:29:54 +0000 Subject: [Bug 1492] icedtea-web does not work with openjdk-7.25.15 on FreeBSD 9.1-STABLE In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1492 Adam Domurad changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|adomurad 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/20130827/646bf6e9/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 08:57:40 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 15:57:40 +0000 Subject: [Bug 1492] icedtea-web does not work with openjdk-7.25.15 on FreeBSD 9.1-STABLE In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1492 --- Comment #7 from Andrew Azores --- Hi Richard, Could you give more detail on how exactly I can reproduce these errors? I have the ProRealTime JNLP file and can launch it, but I don't really know what to do next. -- 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/20130827/108d3387/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 12:29:51 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 19:29:51 +0000 Subject: [Bug 1531] New: Idk Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1531 Bug ID: 1531 Summary: Idk Classification: Unclassified Product: IcedTea Version: 7-1.0 Hardware: 64-bit OS: Linux Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: daizelgames at gmail.com CC: unassigned at icedtea.classpath.org # SIGSEGV (0xb) at pc=0x00007f651e65b664, pid=25961, tid=140037755926272 # # JRE version: 7.0_03-b21 # Java VM: OpenJDK 64-Bit Server VM (22.0-b10 mixed mode linux-amd64 compressed oops) # Derivative: IcedTea7 2.1.1 # Distribution: Debian GNU/Linux unstable (sid), package 7~u3-2.1.1-1 # Problematic frame: # V [libjvm.so+0x3b2664] Par_MarkFromRootsClosure::scan_oops_in_oop(HeapWord*)+0x2d4 # # 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/games/minecraft/openmod/hs_err_pid25961.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 -- 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/20130827/0fde488a/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 13:47:35 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 20:47:35 +0000 Subject: [Bug 625] Regression in NetX when dealing with nested jars In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=625 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- 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/20130827/7c60ecfa/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 13:47:47 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 20:47:47 +0000 Subject: [Bug 740] JavaFx applications fail to start In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=740 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- 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/20130827/eb3f22e4/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 13:48:04 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 20:48:04 +0000 Subject: [Bug 741] Fails to create a shortcut if the resource is local In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=741 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- 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/20130827/8d72c40a/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 13:48:18 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 20:48:18 +0000 Subject: [Bug 764] icedtea 1.8.9 fails to build in CachedJarFileCallback.java In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=764 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- 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/20130827/bdc139f1/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 13:49:13 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 20:49:13 +0000 Subject: [Bug 839] Minecraft classic fails to start due to a jnlp issue In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=839 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- 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/20130827/7e21d6d6/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 13:49:20 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 20:49:20 +0000 Subject: [Bug 842] LWJGL applets do not work on ubuntu/firefox/icedtea In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=842 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- 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/20130827/28b42d79/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 13:49:26 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 20:49:26 +0000 Subject: [Bug 846] Plugin tries to use a SOCKS proxy even if there is none configured In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=846 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- 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/20130827/49461da1/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 13:49:33 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 20:49:33 +0000 Subject: [Bug 878] Handle HTTP error 511 Network Authentication Required (standard secure proxy authentification/captive portal detection) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=878 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- 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/20130827/0629b614/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 13:49:40 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 20:49:40 +0000 Subject: [Bug 890] Regressions caused by trying to shut down the swing EDT In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=890 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- 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/20130827/b976bd61/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 13:49:48 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 20:49:48 +0000 Subject: [Bug 897] Can't list and uninstall applications In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=897 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- 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/20130827/93f0c5ef/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 13:50:01 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 20:50:01 +0000 Subject: [Bug 1010] accessEventQueue exception when displaying a modal dialog in the event queue In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1010 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- 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/20130827/17aedf5e/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 27 16:25:36 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Aug 2013 23:25:36 +0000 Subject: [Bug 1507] Opening a VPN episode (Citrix). Serious fatal error window pop-up. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1507 --- Comment #7 from Steve --- I get this with Konqueror: [quote]Internal Error The Web site is experiencing technical difficulties. We apologize for any inconvenience. The internal error may only be temporary. Try reconnecting and, if the problem persists, contact your system administrator.[/quote] With Chromium I get the same Iced Tea Web error. I have an alternate Linux distro (SolusOS 1.3) that I haven't used in a while. I was able to log in to this VPN under that OS. I could go back and check it again if that might present a clue. Is there anything else I could do? -- 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/20130827/0fc4b0b5/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Aug 28 00:40:37 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 28 Aug 2013 07:40:37 +0000 Subject: [Bug 1532] New: Some windows don't get mouse clicks under certain WMs Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1532 Bug ID: 1532 Summary: Some windows don't get mouse clicks under certain WMs Classification: Unclassified Product: IcedTea Version: 2.4.1 Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: andrey.vihrov at gmail.com CC: unassigned at icedtea.classpath.org I use an application named "TopCoder Arena". The application has a main window that is never closed and several additional windows. When certain secondary windows are opened, they don't seem to get mouse click events. Instead, the mouse clicks "go through" and the main application window, which remains underneath, receives them. Effectively, the new window's controls can't be used with the mouse; however, keyboard input still works. OpenJDK version is: java version "1.7.0_40" OpenJDK Runtime Environment (IcedTea 2.4.1) (ArchLinux build 7.u40_2.4.1-3-x86_64) I have also verified that Oracle's Java, version 7.25, has the same problem. It appears that this is window manager-related. I have reproduced this issue with * xfwm4 4.10.1 (part of Xfce) * fluxbox 1.3.5 * openbox 3.5.2 In xfwm4, I tried disabling ICCCM and compositing, but it didn't make a difference. However, the problem disappears with twm 1.0.7. My X.org version is 1.14.2. Unfortunately, the only way known to me to reproduce the bug is to launch the said application. It requires a user account, which can be created free of charge at http://community.topcoder.com/tc . Steps to reproduce: * Use one of the window managers mentioned above, except twm * Go to http://community.topcoder.com/tc and click on the "O(n)" icon, or run the application directly: https://community.topcoder.com/contest/arena/ContestAppletProd.jnlp * Log in to the application * A main window appears; find and click the "Leader Board" button * Try to scroll the table or use the dropdown list with the mouse: it doesn't work -- 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/20130828/90ee2b05/attachment.html From ptisnovs at icedtea.classpath.org Wed Aug 28 02:14:49 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 28 Aug 2013 09:14:49 +0000 Subject: /hg/gfx-test: Another eight new tests added into BitBltAffineIde... Message-ID: changeset 109b82453520 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=109b82453520 author: Pavel Tisnovsky date: Wed Aug 28 11:18:18 2013 +0200 Another eight new tests added into BitBltAffineIdentityTransformOp test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java | 112 ++++++++++ 2 files changed, 117 insertions(+), 0 deletions(-) diffs (134 lines): diff -r 30f1f5aa9fa1 -r 109b82453520 ChangeLog --- a/ChangeLog Tue Aug 27 10:32:28 2013 +0200 +++ b/ChangeLog Wed Aug 28 11:18:18 2013 +0200 @@ -1,3 +1,8 @@ +2013-08-28 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java: + Another eight new tests added into BitBltAffineIdentityTransformOp test suite. + 2013-08-27 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java: diff -r 30f1f5aa9fa1 -r 109b82453520 src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java --- a/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java Tue Aug 27 10:32:28 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java Wed Aug 28 11:18:18 2013 +0200 @@ -492,6 +492,118 @@ } /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageTypeByteIndexedIdentifyTranspormationOp5(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, IdentifyTranspormationOp5); + } + + /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageTypeByteIndexedIdentifyTranspormationOp6(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteIndexed(image, graphics2d, IdentifyTranspormationOp6); + } + + /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageTypeByteGrayIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteGray(image, graphics2d, IdentifyTranspormationOp1); + } + + /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageTypeByteGrayIdentifyTranspormationOp2(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteGray(image, graphics2d, IdentifyTranspormationOp2); + } + + /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageTypeByteGrayIdentifyTranspormationOp3(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteGray(image, graphics2d, IdentifyTranspormationOp3); + } + + /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageTypeByteGrayIdentifyTranspormationOp4(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteGray(image, graphics2d, IdentifyTranspormationOp4); + } + + /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageTypeByteGrayIdentifyTranspormationOp5(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteGray(image, graphics2d, IdentifyTranspormationOp5); + } + + /** + * Test basic BitBlt operation for empty 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 testBitBltEmptyBufferedImageTypeByteGrayIdentifyTranspormationOp6(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeByteGray(image, graphics2d, IdentifyTranspormationOp6); + } + + /** * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. * * @param image From ptisnovs at icedtea.classpath.org Wed Aug 28 02:17:53 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 28 Aug 2013 09:17:53 +0000 Subject: /hg/rhino-tests: Added new test testAsSubclass into the test sui... Message-ID: changeset fbd5a6ff705f in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=fbd5a6ff705f author: Pavel Tisnovsky date: Wed Aug 28 11:21:38 2013 +0200 Added new test testAsSubclass into the test suite SimpleScriptContextClassTest. diffstat: ChangeLog | 7 +- src/org/RhinoTests/SimpleScriptContextClassTest.java | 166 +++++++++++++++++++ 2 files changed, 172 insertions(+), 1 deletions(-) diffs (193 lines): diff -r fe428022f9a2 -r fbd5a6ff705f ChangeLog --- a/ChangeLog Tue Aug 27 10:40:05 2013 +0200 +++ b/ChangeLog Wed Aug 28 11:21:38 2013 +0200 @@ -1,7 +1,12 @@ +2013-08-28 Pavel Tisnovsky + + * src/org/RhinoTests/SimpleScriptContextClassTest.java: + Added new test testAsSubclass into the test suite SimpleScriptContextClassTest. + 2013-08-27 Pavel Tisnovsky * src/org/RhinoTests/CompiledScriptClassTest.java: - Added new test testAsSubclass into the test suite CompilableClassTest. + Added new test testAsSubclass into the test suite CompiledScriptClassTest. 2013-08-26 Pavel Tisnovsky diff -r fe428022f9a2 -r fbd5a6ff705f src/org/RhinoTests/SimpleScriptContextClassTest.java --- a/src/org/RhinoTests/SimpleScriptContextClassTest.java Tue Aug 27 10:40:05 2013 +0200 +++ b/src/org/RhinoTests/SimpleScriptContextClassTest.java Wed Aug 28 11:21:38 2013 +0200 @@ -1328,6 +1328,172 @@ } /** + * Test for method javax.script.SimpleScriptContext.getClass().asSubclass() + */ + protected void testAsSubclass() { + try { + this.simpleScriptContextClass.asSubclass(simpleScriptContextClass); + } + catch (Exception e) { + e.printStackTrace(); + throw new AssertionError(e.getMessage()); + } + + try { + this.simpleScriptContextClass.asSubclass(Object.class); + } + catch (Exception e) { + e.printStackTrace(); + throw new AssertionError(e.getMessage()); + } + + try { + this.simpleScriptContextClass.asSubclass(java.lang.Void.class); + throw new AssertionError("Class.asSubclass(java.lang.Void.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.asSubclass(java.lang.Number.class); + throw new AssertionError("Class.asSubclass(java.lang.Number.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.asSubclass(java.lang.Byte.class); + throw new AssertionError("Class.asSubclass(java.lang.Byte.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.asSubclass(java.lang.Double.class); + throw new AssertionError("Class.asSubclass(java.lang.Double.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.asSubclass(java.lang.Float.class); + throw new AssertionError("Class.asSubclass(java.lang.Float.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.asSubclass(java.lang.Integer.class); + throw new AssertionError("Class.asSubclass(java.lang.Integer.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.asSubclass(java.lang.Long.class); + throw new AssertionError("Class.asSubclass(java.lang.Long.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.asSubclass(java.lang.Short.class); + throw new AssertionError("Class.asSubclass(java.lang.Short.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.asSubclass(java.lang.String.class); + throw new AssertionError("Class.asSubclass(java.lang.String.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.asSubclass(java.lang.StringBuffer.class); + throw new AssertionError("Class.asSubclass(java.lang.StringBuffer.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.asSubclass(java.lang.StringBuilder.class); + throw new AssertionError("Class.asSubclass(java.lang.StringBuilder.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.asSubclass(java.awt.Color.class); + throw new AssertionError("Class.asSubclass(java.awt.Color.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.asSubclass(java.awt.Font.class); + throw new AssertionError("Class.asSubclass(java.awt.Font.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.asSubclass(java.awt.Image.class); + throw new AssertionError("Class.asSubclass(java.awt.Image.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.asSubclass(javax.swing.JPanel.class); + throw new AssertionError("Class.asSubclass(javax.swing.JPanel.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.asSubclass(javax.swing.JColorChooser.class); + throw new AssertionError("Class.asSubclass(javax.swing.JColorChooser.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.asSubclass(javax.swing.JScrollBar.class); + throw new AssertionError("Class.asSubclass(javax.swing.JScrollBar.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.asSubclass(javax.swing.JSlider.class); + throw new AssertionError("Class.asSubclass(javax.swing.JSlider.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + } + + /** * Test for instanceof operator applied to a class javax.script.SimpleScriptContext */ @SuppressWarnings("cast") From gitne at excite.co.jp Wed Aug 28 03:48:44 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Wed, 28 Aug 2013 19:48:44 +0900 Subject: =?ISO-2022-JP?B?W3JmY11baWNlZHRlYS13ZWJdIENlcnRpZmljYXRlIHZpZXdlciBjbGVhbnVw?= Message-ID: <201308281048.r7SAmipV004560@mail-web02.excite.co.jp> * Replaced old insufficient certificate viewer's action buttons handling with proper handling * Made System-level certificates managable if current user has write access to a KeyStore (usually only root or admin) * Added informative tool tip to disabled buttons when certificates are unmanagable * Made certificate table uneditable * Made certificate info table uneditable * Made certificate info's descriptive JTextField have the same font size as its info table for better readability * Added certificate file filters with Windows/Linux preference * Added auto-suggested certificate file names when exporting * Added automatically generated mnemonics * Made labels link to corresponding JComponents * Added a border to certificate type label for better readability * Uniformed border sizes * Added removing of multiple certificates at once * Turned some only once occuring fields into static * Added proper exception handling when setting system look & feel, hence removed superfluous "throws Exception" from method signatures Happy reviewing! Jacob From gitne at excite.co.jp Wed Aug 28 04:08:32 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Wed, 28 Aug 2013 20:08:32 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtyZmNdW2ljZWR0ZWEtd2ViXSBDZXJ0aWZpY2F0ZSB2aWV3ZXIgY2xlYW51cA==?= Message-ID: <201308281108.r7SB8W4D022056@mail-web03.excite.co.jp> "Jacob Wisor" wrote: > * Replaced old insufficient certificate viewer's action buttons handling with proper handling > * Made System-level certificates managable if current user has write access to a KeyStore (usually only root or admin) > * Added informative tool tip to disabled buttons when certificates are unmanagable > * Made certificate table uneditable > * Made certificate info table uneditable > * Made certificate info's descriptive JTextField have the same font size as its info table for better readability > * Added certificate file filters with Windows/Linux preference > * Added auto-suggested certificate file names when exporting > * Added automatically generated mnemonics > * Made labels link to corresponding JComponents > * Added a border to certificate type label for better readability > * Uniformed border sizes > * Added removing of multiple certificates at once > * Turned some only once occuring fields into static > * Added proper exception handling when setting system look & feel, hence removed superfluous "throws Exception" from method signatures > > Happy reviewing! > > Jacob Sorry, web mailer did not pick up the attachment again :( From gitne at excite.co.jp Wed Aug 28 04:17:38 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Wed, 28 Aug 2013 20:17:38 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtyZmNdW2ljZWR0ZWEtd2ViXSBDZXJ0aWZpY2F0ZSB2aWV3ZXIgY2xlYW51cCAoM3JkIGF0dGVtcHQp?= Message-ID: <201308281117.r7SBHcqx006455@mail-web02.excite.co.jp> "Jacob Wisor" wrote: > * Replaced old insufficient certificate viewer's action buttons handling with proper handling > * Made System-level certificates managable if current user has write access to a KeyStore (usually only root or admin) > * Added informative tool tip to disabled buttons when certificates are unmanagable > * Made certificate table uneditable > * Made certificate info table uneditable > * Made certificate info's descriptive JTextField have the same font size as its info table for better readability > * Added certificate file filters with Windows/Linux preference > * Added auto-suggested certificate file names when exporting > * Added automatically generated mnemonics > * Made labels link to corresponding JComponents > * Added a border to certificate type label for better readability > * Uniformed border sizes > * Added removing of multiple certificates at once > * Turned some only once occuring fields into static > * Added proper exception handling when setting system look & feel, hence removed superfluous "throws Exception" from method signatures > > Happy reviewing! > > Jacob Okay, this time using IE... From gitne at excite.co.jp Wed Aug 28 06:18:24 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Wed, 28 Aug 2013 22:18:24 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtyZmNdW2ljZWR0ZWEtd2ViXSBDZXJ0aWZpY2F0ZSB2aWV3ZXIgY2xlYW51cA==?= Message-ID: <201308281318.r7SDIO7l030773@mail-web03.excite.co.jp> "Jacob Wisor" wrote: > * Replaced old insufficient certificate viewer's action buttons handling with proper handling > * Made System-level certificates managable if current user has write access to a KeyStore (usually only root or admin) > * Added informative tool tip to disabled buttons when certificates are unmanagable > * Made certificate table uneditable > * Made certificate info table uneditable > * Made certificate info's descriptive JTextField have the same font size as its info table for better readability > * Added certificate file filters with Windows/Linux preference > * Added auto-suggested certificate file names when exporting > * Added automatically generated mnemonics > * Made labels link to corresponding JComponents > * Added a border to certificate type label for better readability > * Uniformed border sizes > * Added removing of multiple certificates at once > * Turned some only once occuring fields into static > * Added proper exception handling when setting system look & feel, hence removed superfluous "throws Exception" from method signatures > > Happy reviewing! > > Jacob Pasting in this time. diff -r 94ebabfba6ab netx/net/sourceforge/jnlp/resources/Messages.properties --- a/netx/net/sourceforge/jnlp/resources/Messages.properties +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties @@ -275,6 +276,9 @@ SValidity=Validity # Certificate Viewer +CVCannotImport=You can not import certificates of this type because {0} +CVCannotRemove=You can not remove certificates of this type because {0} +CVCause=
  • you are not logged in as an administrator,
  • you have no file system write permission to the keystore file,
  • the keystore file is inaccesible via network,
  • the keystore file is write protected by file system attributes,
  • you do not have a FilePermission("write"), or
  • the keystore file is otherwise physically inaccesible.
CVCertificateViewer=Certificates CVCertificateType=Certificate Type CVDetails=Details diff -r 94ebabfba6ab netx/net/sourceforge/jnlp/resources/Messages_de.properties --- a/netx/net/sourceforge/jnlp/resources/Messages_de.properties +++ b/netx/net/sourceforge/jnlp/resources/Messages_de.properties @@ -269,6 +271,9 @@ SValidity=Gu00fcltigkeit # Certificate Viewer +CVCannotImport=Es ku00f6nnen keine Zertifikate dieses Typs importiert werden, da {0} +CVCannotRemove=Es ku00f6nnen keine Zertifikate dieses Typs entfernt werden, da {0} +CVCause=
  • das aktuell verwendete Benutzerkonto kein Administratorkonto ist,
  • das aktuell verwendete Benutzerkonto keine Schreibberechtigung fu00fcr die Schlu00fcsselspeicherdatei hat,
  • die Schlu00fcsselspeicherdatei ist u00fcber das Netzwerk unerreichbar,
  • die Schlu00fcsselspeicherdatei ist durch Dateisystemattribute schreibgeschu00fctzt,
  • das aktuell verwendete Benutzerkonto keine FilePermission("write") besitzt oder
  • die Schlu00fcsselspeicherdatei auf sonstige physikalische Weise nicht verfu00fcgbar ist.
CVCertificateViewer=Zertifikate CVCertificateType=Zertifikattyp CVDetails=Details diff -r 94ebabfba6ab netx/net/sourceforge/jnlp/resources/Messages_pl.properties --- a/netx/net/sourceforge/jnlp/resources/Messages_pl.properties +++ b/netx/net/sourceforge/jnlp/resources/Messages_pl.properties @@ -269,6 +271,9 @@ SValidity=Wau017cnou015bu0107 # Certificate Viewer +CVCannotImport=Nie mou017cna importowau0107 certyfikatu00f3w tego typu poniewau017c {0} +CVCannotRemove=Nie mou017cna usunu0105u0107 certyfikatu00f3w tego typu poniewau017c {0} +CVCause=
  • nie jesteu015b zalogowany jako administrator,
  • nie posiadasz uprawnienia zapisu systemu plikowego do pliku bazy kluczy,
  • plik bazy kluczy jest niedostu0119pny w sieci,
  • atrybuty systemu plikowego chroniu0105 plik bazy kluczy przed zapisem,
  • nie posiadasz FilePermission("write") lub
  • plik bazy kluczy jest fizycznie niedostu0119pny.
CVCertificateViewer=Certyfikaty CVCertificateType=Typ certyfikatu CVDetails=Szczegu00f3u0142y diff -r 94ebabfba6ab netx/net/sourceforge/jnlp/security/CertsInfoPane.java --- a/netx/net/sourceforge/jnlp/security/CertsInfoPane.java +++ b/netx/net/sourceforge/jnlp/security/CertsInfoPane.java @@ -56,6 +56,8 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreeSelectionModel; +import net.sourceforge.jnlp.util.UI.NonEditableTableModel; + /** * Provides the panel for the Certificate Info dialog. This dialog displays data from * X509Certificate(s) used in jar signing. @@ -72,7 +74,7 @@ private ListSelectionModel listSelectionModel; private ListSelectionModel tableSelectionModel; protected String[] certNames; - private String[] columnNames = { R("Field"), R("Value") }; + private static final String[] columnNames = { R("Field"), R("Value") }; protected ArrayList certsData; public CertsInfoPane(SecurityDialog x, CertVerifier certVerifier) { @@ -150,11 +152,11 @@ try { MessageDigest digest = MessageDigest.getInstance("MD5"); digest.update(c.getEncoded()); - md5Hash = makeFingerprint(digest.digest()); + md5Hash = CertsInfoPane.makeFingerprint(digest.digest()); digest = MessageDigest.getInstance("SHA-1"); digest.update(c.getEncoded()); - sha1Hash = makeFingerprint(digest.digest()); + sha1Hash = CertsInfoPane.makeFingerprint(digest.digest()); } catch (Exception e) { //fail quietly } @@ -189,8 +191,8 @@ JScrollPane listPane = new JScrollPane(tree); //Table of field-value pairs - DefaultTableModel tableModel = new DefaultTableModel(certsData.get(0), - columnNames); + NonEditableTableModel tableModel = new NonEditableTableModel(this.certsData.get(0), + CertsInfoPane.columnNames); table = new JTable(tableModel); table.getTableHeader().setReorderingAllowed(false); tableSelectionModel = table.getSelectionModel(); @@ -202,6 +204,7 @@ //Text area to display the larger values output = new JTextArea(); output.setEditable(false); + output.setFont(new Font(Font.MONOSPACED, Font.PLAIN, this.table.getFont().getSize())); JScrollPane outputPane = new JScrollPane(output, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); @@ -275,11 +278,9 @@ if (node == null) return; if (node.isRoot()) { - table.setModel(new DefaultTableModel(certsData.get(0), - columnNames)); + table.setModel(new NonEditableTableModel(certsData.get(0), CertsInfoPane.columnNames)); } else if (node.isLeaf()) { - table.setModel(new DefaultTableModel(certsData.get(1), - columnNames)); + table.setModel(new NonEditableTableModel(certsData.get(1), CertsInfoPane.columnNames)); } } } @@ -296,8 +297,8 @@ for (int i = minIndex; i <= maxIndex; i++) { if (lsm.isSelectedIndex(i)) { - table.setModel(new DefaultTableModel(certsData.get(i), - columnNames)); + table.setModel(new NonEditableTableModel(certsData.get(i), + CertsInfoPane.columnNames)); } } } @@ -326,7 +327,7 @@ * Makes a human readable hash fingerprint. * For example: 11:22:33:44:AA:BB:CC:DD:EE:FF. */ - private String makeFingerprint(byte[] hash) { + private static final String makeFingerprint(byte[] hash) { String fingerprint = ""; for (int i = 0; i < hash.length; i++) { if (!fingerprint.equals("")) diff -r 94ebabfba6ab netx/net/sourceforge/jnlp/security/KeyStores.java --- a/netx/net/sourceforge/jnlp/security/KeyStores.java +++ b/netx/net/sourceforge/jnlp/security/KeyStores.java @@ -39,6 +39,7 @@ import java.io.File; import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.security.AllPermission; @@ -64,12 +65,12 @@ /* this gets turned into user-readable strings, see toUserReadableString */ - public enum Level { + public static enum Level { USER, SYSTEM, } - public enum Type { + public static enum Type { CERTS, JSSE_CERTS, CA_CERTS, @@ -302,6 +303,37 @@ } /** + * Checks whether the specified system-level or user-level {@link KeyStore} + * is writable. + * @param level + * @return {@code true} if the specified {@code KeyStore} is writable, + * {@code false} otherwise + * @see KeyStores.Level + */ + public static final boolean isKeyStoreWriteable(KeyStores.Level level, KeyStores.Type type) { + if (level == null) throw new IllegalArgumentException("level == " + level); + if (type == null) throw new IllegalArgumentException("type == " + type); + + FileOutputStream fileOutputStream = null; + + try { + fileOutputStream = new FileOutputStream(KeyStores.getKeyStoreLocation(level, type), true); + } catch (final FileNotFoundException fileNotFoundException) { + fileOutputStream = null; + } catch (final SecurityException securityException) { + fileOutputStream = null; + } finally { + if (fileOutputStream != null) try { + fileOutputStream.close(); + } catch (final IOException ioException) { + // Don't bother, fileOutputStream is probably closed anyway + } + } + + return fileOutputStream != null; + } + + /** * Returns a String that can be used as a translation key to create a * user-visible representation of this KeyStore. Creates a string by * concatenating a level and type, converting everything to Title Case and diff -r 94ebabfba6ab netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java --- a/netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java +++ b/netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java @@ -45,7 +45,6 @@ import java.awt.GridLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.KeyEvent; import java.io.File; import java.io.FileOutputStream; import java.io.OutputStream; @@ -56,6 +55,7 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.List; +import java.util.Map; import javax.swing.BorderFactory; import javax.swing.JButton; @@ -70,16 +70,22 @@ import javax.swing.JScrollPane; import javax.swing.JTabbedPane; import javax.swing.JTable; +import javax.swing.ListSelectionModel; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import javax.swing.table.DefaultTableModel; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import javax.swing.filechooser.FileNameExtensionFilter; +import net.sourceforge.jnlp.runtime.JNLPRuntime; import net.sourceforge.jnlp.security.CertificateUtils; import net.sourceforge.jnlp.security.KeyStores; import net.sourceforge.jnlp.security.SecurityUtil; import net.sourceforge.jnlp.security.SecurityDialog; import net.sourceforge.jnlp.security.KeyStores.Level; import net.sourceforge.jnlp.util.FileUtils; +import net.sourceforge.jnlp.util.UI; +import net.sourceforge.jnlp.util.UI.NonEditableTableModel; public class CertificatePane extends JPanel { @@ -94,9 +100,14 @@ * "Issued To" and "Issued By" string pairs for certs. */ private String[][] issuedToAndBy = null; - private final String[] columnNames = { R("CVIssuedTo"), R("CVIssuedBy") }; + private final static String[] columnNames = { R("CVIssuedTo"), R("CVIssuedBy") }; + private final static String CER_EXTENSION = "cer", + CRT_EXTENSION = "crt", + PFX_EXTENSION = "pfx", + P12_EXTENSION = "p12", + PKCS12 = "PKCS #12"; - private final CertificateType[] certificateTypes = new CertificateType[] { + private final static CertificateType[] certificateTypes = new CertificateType[] { new CertificateType(KeyStores.Type.CA_CERTS), new CertificateType(KeyStores.Type.JSSE_CA_CERTS), new CertificateType(KeyStores.Type.CERTS), @@ -108,12 +119,13 @@ private final JTable userTable; private final JTable systemTable; private JComboBox certificateTypeCombo; + private final JButton importButton, + exportButton, + removeButton, + detailButton; private KeyStores.Type currentKeyStoreType; private KeyStores.Level currentKeyStoreLevel; - /** JComponents that should be disbled for system store */ - private final List disableForSystem; - private JDialog parent; private JComponent defaultFocusComponent = null; @@ -122,6 +134,19 @@ * the user. This KeyStore corresponds to that. */ private KeyStore keyStore = null; + /** + * Indicates whether the currently selected {@link KeyStore} is writeable. The + * current selection is based on the combination of {@link CertificatePane#tabbedPane} + * and {@link CertificatePane#certificateTypeCombo}.
+ * Sub-classes of {@code CertificatePane} altering the behavior of those + * {@code JComponent}s cannot rely on the accuracy or validity of this field. + * @see KeyStores#isKeyStoreWriteable(KeyStores.Level,KeyStores.Type) + * @see CertificatePane#tabbedPane + * @see CertificatePane#certificateTypeCombo + * @see CertificatePane.TabChangeListener#stateChanged(ChangeEvent) + * @see CertificatePane.CertificateTypeListener#actionPerformed(ActionEvent) + */ + protected boolean isKeyStoreWriteable; public CertificatePane(JDialog parent) { super(); @@ -129,7 +154,10 @@ userTable = new JTable(null); systemTable = new JTable(null); - disableForSystem = new ArrayList(); + this.importButton = new JButton(); + this.exportButton = new JButton(); + this.removeButton = new JButton(); + this.detailButton = new JButton(); addComponents(); @@ -139,6 +167,9 @@ } else { currentKeyStoreLevel = Level.SYSTEM; } + this.importButton.setEnabled(this.isKeyStoreWriteable = + KeyStores.isKeyStoreWriteable(this.currentKeyStoreLevel, + this.currentKeyStoreType)); repopulateTables(); } @@ -163,9 +194,11 @@ certificateTypePanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); JLabel certificateTypeLabel = new JLabel(R("CVCertificateType")); + certificateTypeLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5)); certificateTypeCombo = new JComboBox(certificateTypes); certificateTypeCombo.addActionListener(new CertificateTypeListener()); + certificateTypeLabel.setLabelFor(this.certificateTypeCombo); certificateTypePanel.add(certificateTypeLabel, BorderLayout.LINE_START); certificateTypePanel.add(certificateTypeCombo, BorderLayout.CENTER); @@ -173,20 +206,24 @@ JPanel tablePanel = new JPanel(new BorderLayout()); // User Table - DefaultTableModel userTableModel = new DefaultTableModel(issuedToAndBy, columnNames); - userTable.setModel(userTableModel); + userTable.setModel(new NonEditableTableModel(issuedToAndBy, CertificatePane.columnNames)); userTable.getTableHeader().setReorderingAllowed(false); userTable.setFillsViewportHeight(true); + final CertificatePane.CertificateListSelectionListener certificateListSelectionListener; + userTable.getSelectionModel().setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); + userTable.getSelectionModel().addListSelectionListener(certificateListSelectionListener = + new CertificatePane.CertificateListSelectionListener()); JScrollPane userTablePane = new JScrollPane(userTable); userTablePane.setPreferredSize(TABLE_DIMENSION); userTablePane.setSize(TABLE_DIMENSION); userTablePane.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); // System Table - DefaultTableModel systemTableModel = new DefaultTableModel(issuedToAndBy, columnNames); - systemTable.setModel(systemTableModel); + systemTable.setModel(new NonEditableTableModel(issuedToAndBy, CertificatePane.columnNames)); systemTable.getTableHeader().setReorderingAllowed(false); systemTable.setFillsViewportHeight(true); + systemTable.getSelectionModel().setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); + systemTable.getSelectionModel().addListSelectionListener(certificateListSelectionListener); JScrollPane systemTablePane = new JScrollPane(systemTable); systemTablePane.setPreferredSize(TABLE_DIMENSION); systemTablePane.setSize(TABLE_DIMENSION); @@ -199,35 +236,50 @@ JPanel buttonPanel = new JPanel(new FlowLayout()); - String[] buttonNames = { R("CVImport"), R("CVExport"), R("CVRemove"), R("CVDetails") }; - char[] buttonMnemonics = { KeyEvent.VK_I, - KeyEvent.VK_E, - KeyEvent.VK_M, - KeyEvent.VK_D }; - ActionListener[] listeners = { new ImportButtonListener(), - new ExportButtonListener(), - new RemoveButtonListener(), - new DetailsButtonListener() }; - JButton button; + final String[] controlTexts = { + R("CVCertificateType"), + R("CVImport"), + R("CVExport"), + R("CVRemove"), + R("CVDetails"), + R("ButClose") + }; + final Map mnemonicsMap = UI.generateMnemonics(controlTexts); + certificateTypeLabel.setDisplayedMnemonic(mnemonicsMap.get(R("CVCertificateType"))); //get the max width int maxWidth = 0; - for (int i = 0; i < buttonNames.length; i++) { - button = new JButton(buttonNames[i]); + for (int i = 1; i < 5; i++) { + JButton button = new JButton(controlTexts[i]); maxWidth = Math.max(maxWidth, button.getMinimumSize().width); } - for (int i = 0; i < buttonNames.length; i++) { - button = new JButton(buttonNames[i]); - button.setMnemonic(buttonMnemonics[i]); - button.addActionListener(listeners[i]); - button.setSize(maxWidth, button.getSize().height); - // import and remove buttons - if (i == 0 || i == 2) { - disableForSystem.add(button); - } - buttonPanel.add(button); - } + this.importButton.setText(controlTexts[1]); + this.importButton.setMnemonic(mnemonicsMap.get(controlTexts[1])); + this.importButton.addActionListener(new CertificatePane.ImportButtonListener()); + this.importButton.setSize(maxWidth, this.importButton.getSize().height); + buttonPanel.add(this.importButton); + + this.exportButton.setText(controlTexts[2]); + this.exportButton.setMnemonic(mnemonicsMap.get(controlTexts[2])); + this.exportButton.addActionListener(new CertificatePane.ExportButtonListener()); + this.exportButton.setSize(maxWidth, this.exportButton.getSize().height); + this.exportButton.setEnabled(false); + buttonPanel.add(this.exportButton); + + this.removeButton.setText(controlTexts[3]); + this.removeButton.setMnemonic(mnemonicsMap.get(controlTexts[3])); + this.removeButton.addActionListener(new CertificatePane.RemoveButtonListener()); + this.removeButton.setSize(maxWidth, this.removeButton.getSize().height); + this.removeButton.setEnabled(false); + buttonPanel.add(this.removeButton); + + this.detailButton.setText(controlTexts[4]); + this.detailButton.setMnemonic(mnemonicsMap.get(controlTexts[4])); + this.detailButton.addActionListener(new CertificatePane.DetailsButtonListener()); + this.detailButton.setSize(maxWidth, this.detailButton.getSize().height); + this.detailButton.setEnabled(false); + buttonPanel.add(this.detailButton); tablePanel.add(tabbedPane, BorderLayout.CENTER); tablePanel.add(buttonPanel, BorderLayout.SOUTH); @@ -237,17 +289,18 @@ if (parent != null) { JPanel closePanel = new JPanel(new BorderLayout()); - closePanel.setBorder(BorderFactory.createEmptyBorder(7, 7, 7, 7)); - JButton closeButton = new JButton(R("ButClose")); + closePanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); + final String buttonText; + JButton closeButton = new JButton(buttonText = R("ButClose")); closeButton.addActionListener(new CloseButtonListener()); + closeButton.setMnemonic(mnemonicsMap.get(buttonText)); defaultFocusComponent = closeButton; closePanel.add(closeButton, BorderLayout.EAST); main.add(closePanel, BorderLayout.SOUTH); } - setLayout(new GridLayout(0,1)); + setLayout(new GridLayout(0, 1)); add(main); - } /** @@ -289,12 +342,12 @@ private void repopulateTables() { initializeKeyStore(); readKeyStore(); - DefaultTableModel tableModel = new DefaultTableModel(issuedToAndBy, columnNames); - userTable.setModel(tableModel); + userTable.setModel(new NonEditableTableModel(issuedToAndBy, + CertificatePane.columnNames)); - tableModel = new DefaultTableModel(issuedToAndBy, columnNames); - systemTable.setModel(tableModel); + systemTable.setModel(new NonEditableTableModel(issuedToAndBy, + CertificatePane.columnNames)); } public void focusOnDefaultButton() { @@ -305,8 +358,12 @@ private char[] getPassword(final String label) { JPasswordField jpf = new JPasswordField(); + final JLabel jl = new JLabel(label); + final String passwordTitle; + jl.setDisplayedMnemonic(UI.generateMnemonics(new String[] { label }).get(label)); + jl.setLabelFor(jpf); int result = JOptionPane.showConfirmDialog(parent, - new Object[]{label, jpf}, R("CVPasswordTitle"), + new Object[] {jl, jpf}, R("CVPasswordTitle"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE); if (result == JOptionPane.OK_OPTION) @@ -339,6 +396,15 @@ JComboBox source = (JComboBox) e.getSource(); CertificateType type = (CertificateType) source.getSelectedItem(); currentKeyStoreType = type.getType(); + importButton.setEnabled(isKeyStoreWriteable = + KeyStores.isKeyStoreWriteable(currentKeyStoreLevel, currentKeyStoreType)); + if (isKeyStoreWriteable) { + importButton.setToolTipText(null); + removeButton.setToolTipText(null); + } else { + importButton.setToolTipText("" + R("CVCannotImport") + ""); + removeButton.setToolTipText("" + R("CVCannotRemove") + ""); + } repopulateTables(); } } @@ -354,19 +420,20 @@ switch (source.getSelectedIndex()) { case 0: currentKeyStoreLevel = Level.USER; - for (JComponent component : disableForSystem) { - component.setEnabled(true); - } break; case 1: currentKeyStoreLevel = Level.SYSTEM; - for (JComponent component : disableForSystem) { - component.setEnabled(false); - } - break; + } + importButton.setEnabled(isKeyStoreWriteable = + KeyStores.isKeyStoreWriteable(currentKeyStoreLevel, currentKeyStoreType)); + if (isKeyStoreWriteable) { + importButton.setToolTipText(null); + removeButton.setToolTipText(null); + } else { + importButton.setToolTipText("" + R("CVCannotImport", R("CVCause")) + ""); + removeButton.setToolTipText("" + R("CVCannotRemove", R("CVCause")) + ""); } repopulateTables(); - } } @@ -374,6 +441,19 @@ public void actionPerformed(ActionEvent e) { JFileChooser chooser = new JFileChooser(); + if (currentKeyStoreType == KeyStores.Type.CLIENT_CERTS) { + chooser.addChoosableFileFilter(new FileNameExtensionFilter(CertificatePane.PKCS12 + + " (*." + CertificatePane.PFX_EXTENSION + File.pathSeparator + + "*." + CertificatePane.P12_EXTENSION + ")", + CertificatePane.PFX_EXTENSION, CertificatePane.P12_EXTENSION)); + } else { + chooser.addChoosableFileFilter(new FileNameExtensionFilter(R("CVCertificateViewer") + + " (*." + CertificatePane.CER_EXTENSION + File.pathSeparator + + "*." + CertificatePane.CRT_EXTENSION + ")", + CertificatePane.CER_EXTENSION, CertificatePane.CRT_EXTENSION)); + } + chooser.setFileFilter(chooser.getChoosableFileFilters()[1]); + chooser.setFileHidingEnabled(false); int returnVal = chooser.showOpenDialog(parent); if (returnVal == JFileChooser.APPROVE_OPTION) { try { @@ -425,24 +505,41 @@ try { int selectedRow = table.getSelectedRow(); - if (selectedRow != -1) { - JFileChooser chooser = new JFileChooser(); - int returnVal = chooser.showOpenDialog(parent); - if (returnVal == JFileChooser.APPROVE_OPTION) { - String alias = keyStore.getCertificateAlias(certs - .get(selectedRow)); - if (alias != null) { - if (currentKeyStoreType == KeyStores.Type.CLIENT_CERTS) { - char[] password = getPassword(R("CVExportPasswordMessage")); - if (password != null) - CertificateUtils.dumpPKCS12(alias, chooser.getSelectedFile(), keyStore, password); + JFileChooser chooser = new JFileChooser(); + chooser.setFileHidingEnabled(false); + final String extension; + if (currentKeyStoreType == KeyStores.Type.CLIENT_CERTS) { + extension = "." + CertificatePane.PFX_EXTENSION; + chooser.addChoosableFileFilter(new FileNameExtensionFilter(CertificatePane.PKCS12 + + " (*." + CertificatePane.PFX_EXTENSION + File.pathSeparator + + "*." + CertificatePane.P12_EXTENSION + ")", + CertificatePane.PFX_EXTENSION, CertificatePane.P12_EXTENSION)); + } else { + extension = "." + (JNLPRuntime.isWindows() ? CertificatePane.CER_EXTENSION : CertificatePane.CRT_EXTENSION); + chooser.addChoosableFileFilter(new FileNameExtensionFilter(R("CVCertificateViewer") + + " (*." + CertificatePane.CER_EXTENSION + File.pathSeparator + + "*." + CertificatePane.CRT_EXTENSION + ")", + CertificatePane.CER_EXTENSION, CertificatePane.CRT_EXTENSION)); + } + chooser.setFileFilter(chooser.getChoosableFileFilters()[1]); + chooser.setSelectedFile(new File( + (String)table.getModel().getValueAt(selectedRow, 0) + + extension)); + int returnVal = chooser.showSaveDialog(parent); + if (returnVal == JFileChooser.APPROVE_OPTION) { + String alias = keyStore.getCertificateAlias(certs + .get(selectedRow)); + if (alias != null) { + if (currentKeyStoreType == KeyStores.Type.CLIENT_CERTS) { + char[] password = getPassword(R("CVExportPasswordMessage")); + if (password != null) + CertificateUtils.dumpPKCS12(alias, chooser.getSelectedFile(), keyStore, password); } else { Certificate c = keyStore.getCertificate(alias); PrintStream ps = new PrintStream(chooser.getSelectedFile().getAbsolutePath()); CertificateUtils.dump(c, ps); } - repopulateTables(); - } + repopulateTables(); } } } catch (Exception ex) { @@ -468,28 +565,26 @@ try { int selectedRow = table.getSelectedRow(); - if (selectedRow != -1) { - String alias = keyStore.getCertificateAlias(certs.get(selectedRow)); - if (alias != null) { + String alias = keyStore.getCertificateAlias(certs.get(selectedRow)); + if (alias != null) { - int i = JOptionPane.showConfirmDialog(parent, - R("CVRemoveConfirmMessage"), - R("CVRemoveConfirmTitle"), - JOptionPane.YES_NO_OPTION); - if (i == 0) { - keyStore.deleteEntry(alias); - File keyStoreFile = new File(KeyStores - .getKeyStoreLocation(currentKeyStoreLevel, currentKeyStoreType)); - if (!keyStoreFile.isFile()) { - FileUtils.createRestrictedFile(keyStoreFile, true); - } - FileOutputStream fos = new FileOutputStream(keyStoreFile); - keyStore.store(fos, KeyStores.getPassword()); - fos.close(); + int i = JOptionPane.showConfirmDialog(parent, + R("CVRemoveConfirmMessage"), + R("CVRemoveConfirmTitle"), + JOptionPane.YES_NO_OPTION); + if (i == 0) { + keyStore.deleteEntry(alias); + File keyStoreFile = new File(KeyStores + .getKeyStoreLocation(currentKeyStoreLevel, currentKeyStoreType)); + if (!keyStoreFile.isFile()) { + FileUtils.createRestrictedFile(keyStoreFile, true); } + FileOutputStream fos = new FileOutputStream(keyStoreFile); + keyStore.store(fos, KeyStores.getPassword()); + fos.close(); } - repopulateTables(); } + repopulateTables(); } catch (Exception ex) { // TODO ex.printStackTrace(); @@ -513,10 +608,8 @@ } int selectedRow = table.getSelectedRow(); - if (selectedRow != -1 && selectedRow >= 0) { - X509Certificate c = certs.get(selectedRow); - SecurityDialog.showSingleCertInfoDialog(c, parent); - } + X509Certificate c = certs.get(selectedRow); + SecurityDialog.showSingleCertInfoDialog(c, parent); } } @@ -527,4 +620,27 @@ } } + private final class CertificateListSelectionListener implements ListSelectionListener { + public void valueChanged(ListSelectionEvent listSelectionEvent) { + final ListSelectionModel listSelectionModel = + (ListSelectionModel)listSelectionEvent.getSource(); + + if (listSelectionModel.isSelectionEmpty()) { + exportButton.setEnabled(false); + removeButton.setEnabled(false); + detailButton.setEnabled(false); + } else { + // Has only one row been selected? + if (listSelectionModel.getMinSelectionIndex() == + listSelectionModel.getMaxSelectionIndex()) { + exportButton.setEnabled(true); + detailButton.setEnabled(true); + } else { + exportButton.setEnabled(false); + detailButton.setEnabled(false); + } + removeButton.setEnabled(isKeyStoreWriteable); + } + } + } } diff -r 94ebabfba6ab netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java --- a/netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java +++ b/netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java @@ -49,6 +49,7 @@ import javax.swing.JDialog; import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; import net.sourceforge.jnlp.runtime.JNLPRuntime; import net.sourceforge.jnlp.util.ImageResources; @@ -98,7 +99,7 @@ ScreenFinder.centerWindowsToCurrentScreen(this); } - public static void showCertificateViewer() throws Exception { + public static void showCertificateViewer() { JNLPRuntime.initialize(true); setSystemLookAndFeel(); @@ -112,12 +113,16 @@ private static void setSystemLookAndFeel() { try { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (Exception e) { + } catch (ClassNotFoundException classNotFoundException) {} + catch (InstantiationException instantiationException) {} + catch (IllegalAccessException illegalAccessException) {} + catch (UnsupportedLookAndFeelException unsupportedLookAndFeelException) {} + catch (ClassCastException classCastException) { // don't worry if we can't. } } - public static void main(String[] args) throws Exception { + public static void main(String[] args) { CertificateViewer.showCertificateViewer(); } } From bugzilla-daemon at icedtea.classpath.org Wed Aug 28 08:55:11 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 28 Aug 2013 15:55:11 +0000 Subject: [Bug 839] Minecraft classic fails to start due to a jnlp issue In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=839 Andrew Azores changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |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/20130828/3932addd/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Aug 28 08:56:02 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 28 Aug 2013 15:56:02 +0000 Subject: [Bug 842] LWJGL applets do not work on ubuntu/firefox/icedtea In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=842 Andrew Azores changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |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/20130828/b864acf2/attachment.html From gnu.andrew at redhat.com Wed Aug 28 10:26:01 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Wed, 28 Aug 2013 13:26:01 -0400 (EDT) Subject: OpenJDK 7 Zero built for AArch64 In-Reply-To: <520D2B16.3000302@ubuntu.com> References: <520D2B16.3000302@ubuntu.com> Message-ID: <1512610688.3113011.1377710761359.JavaMail.root@redhat.com> ----- Original Message ----- > After three weeks build time, I have now OpenJDK 7 Zero packages available > for > AArch64. The AArch64 support announced in IcedTea 2.3.10 turned out to be > non-working, so I'm wondering who was able to get a working build for AArch64 > using this release. I don't know of anyone having built it. It was just a reference to the first of Michal's patches (from your link below) being included. We couldn't include the second for the reason you already outlined. > > Binary packages are available from > > deb http://people.canonical.com/~doko/tmp/openjdk-aarch64 ./ > > I did need the following three patches to get it building. > > - hotspot-fork.diff, found at > http://mail.openjdk.java.net/pipermail/porters-dev/2013-March/000469.html > > While the patch might not be generic enough it is needed for AArch64 > because __NR_fork and __NR_execve are not defined, at least when using > glibc 2.17 and kernel headers 3.10. > > - jdk-zero-arch.diff, not found anywhere, sets ARCH_DATA_MODEL and > ZERO_ENDIANNESS correctly for AArch64. Fedora also seems to have a (better) version of this. I don't know where this is from. http://pkgs.fedoraproject.org/cgit/java-1.7.0-openjdk.git/tree/aarch64.patch Did you actually need the jdk/make/jdk_generic_profile.sh changes as IcedTea's build doesn't invoke this? They are set in acinclude.m4: AC_C_BIGENDIAN([ZERO_ENDIANNESS="big"], [ZERO_ENDIANNESS="little"]) We do probably need a section for aarch64. > > - aarch64-detection.diff, only needed for Debian/Ubuntu based builds. > Correctly using the host and not the build macros, and translating > arm64 to aarch64. Unfortunately Debian calls this port arm64 and > not aarch64. > I can apply this easily enough. > All three patches attached. > > The build is a native build using gcj 4.8 from the 4.8 fsf branch for the > stage1 > build. No tests were run except using the stage1 build to build stage2. That's a pretty good test in itself :) > > Matthias > -- 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 Wed Aug 28 10:27:45 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Wed, 28 Aug 2013 13:27:45 -0400 (EDT) Subject: [rfc][icedtea7] patch for macosx build In-Reply-To: <52080477.1080102@gmail.com> References: <52080477.1080102@gmail.com> Message-ID: <848108177.3113403.1377710865539.JavaMail.root@redhat.com> ----- Original Message ----- > Hi, > > I've built icedtea7 head (hg:0a8108854365) for macosx x86_64 and want to > publish patch for possible upstreaming. > > I've used the same sources, as in windows build - obtained from > "icedtea7/openjdk" directory by running: > > ./configure \ > --disable-system-zlib \ > --disable-system-jpeg \ > --disable-system-png \ > --disable-system-gif \ > --disable-system-lcms \ > --disable-compile-against-syscalls \ > --disable-nss > > and "make" on debian wheezy. > > Then built these sources on macosx 10.7.5 with xcode 4.3.2 (gcc 4.2.1) > as a separate openjdk build (without icedtea infrastructure) using > additional environment > variables: > > export FT2_CFLAGS='-I$(FREETYPE_HEADERS_PATH) > -I$(FREETYPE_HEADERS_PATH)/freetype2' > export DISABLE_INTREE_EC=true > > Patch was created against icedtea7-forest/jdk (hg:afaedb56b499): > > 2013-08-11 Alex Kasko > > *make/java/nio/Makefile: > add "syscalls_fp.c" to compilation list in macosx specific section > *make/sun/lwawt/FILES_c_macosx.gmk: > add "cups_fp.c" to compilation list > *make/sun/lwawt/Makefile: > add "solaris/native/common/deps" directory to headers search list, and > to vpath (not sure whether vpath is necessary here) > > > -- > Regards, > Alex Kasko > Why didn't you just use IcedTea in full? I can understand the problems on Windows but OS X is UNIX-like. I haven't looked at the changes in full but I have a feeling they are more due to misconfiguration arising from this than something that would be generally useful. -- 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 adomurad at icedtea.classpath.org Wed Aug 28 11:50:18 2013 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Wed, 28 Aug 2013 18:50:18 +0000 Subject: /hg/icedtea-web: Do not wait for applet initialization when bind... Message-ID: changeset 420d72e5cee7 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=420d72e5cee7 author: Adam Domurad date: Tue Aug 27 16:53:30 2013 -0400 Do not wait for applet initialization when binding Java applets for NPAPI. diffstat: ChangeLog | 15 + plugin/icedteanp/IcedTeaNPPlugin.cc | 36 +-- plugin/icedteanp/IcedTeaPluginUtils.cc | 134 +++++-- plugin/icedteanp/IcedTeaPluginUtils.h | 67 +++- plugin/icedteanp/IcedTeaScriptablePluginObject.cc | 220 +++++++++---- plugin/icedteanp/IcedTeaScriptablePluginObject.h | 28 +- tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc | 15 +- 7 files changed, 356 insertions(+), 159 deletions(-) diffs (truncated from 851 to 500 lines): diff -r 94ebabfba6ab -r 420d72e5cee7 ChangeLog --- a/ChangeLog Fri Aug 23 16:35:37 2013 -0400 +++ b/ChangeLog Tue Aug 27 16:53:30 2013 -0400 @@ -1,3 +1,18 @@ +2013-08-27 Adam Domurad + + Do not wait for applet initialization when binding Java applets for NPAPI. + * plugin/icedteanp/IcedTeaNPPlugin.cc: Refactor to use + lazy-initialized javascript applet binding. + * plugin/icedteanp/IcedTeaPluginUtils.cc: Make use of new helper + class, introduce (stringPrintf), introduce NPObjectRef. + * plugin/icedteanp/IcedTeaPluginUtils.h: Same. + * plugin/icedteanp/IcedTeaScriptablePluginObject.cc: Allow + IcedTeaScriptableJavaObject to be lazy-initialized, introduce + lazy-initializing (get_scriptable_applet_object). + * plugin/icedteanp/IcedTeaScriptablePluginObject.h: Same. + * tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc: Adapt + test to new helper class. + 2013-08-23 Adam Domurad Spawn Java side during C++ unit tests. Many new tests. diff -r 94ebabfba6ab -r 420d72e5cee7 plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Fri Aug 23 16:35:37 2013 -0400 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Tue Aug 27 16:53:30 2013 -0400 @@ -2101,14 +2101,6 @@ if (data->is_applet_instance) // dummy instance/package? { - JavaRequestProcessor java_request = JavaRequestProcessor(); - JavaResultData* java_result; - std::string instance_id = std::string(); - std::string applet_class_id = std::string(); - - int id = get_id_from_instance(instance); - gchar* id_str = g_strdup_printf ("%d", id); - // Some browsers.. (e.g. chromium) don't call NPP_SetWindow // for 0x0 plugins and therefore require initialization with // a 0 handle @@ -2117,30 +2109,10 @@ plugin_send_initialization_message(data->instance_id, 0, 0, 0, data->parameters_string); } - java_result = java_request.getAppletObjectInstance(id_str); - - g_free(id_str); - - if (java_result->error_occurred) - { - printf("Error: Unable to fetch applet instance id from Java side.\n"); - return NULL; - } - - instance_id.append(*(java_result->return_string)); - - java_result = java_request.getClassID(instance_id); - - if (java_result->error_occurred) - { - printf("Error: Unable to fetch applet instance id from Java side.\n"); - return NULL; - } - - applet_class_id.append(*(java_result->return_string)); - - obj = IcedTeaScriptableJavaObject::get_scriptable_java_object(instance, applet_class_id, instance_id, false); - + NPObjectRef applet_object = IcedTeaScriptableJavaObject::get_scriptable_applet_object(instance); + /* Retain because we are returning an NPObject* */ + applet_object.raw_retain(); + obj = applet_object.get(); } else { obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object(instance, ""); diff -r 94ebabfba6ab -r 420d72e5cee7 plugin/icedteanp/IcedTeaPluginUtils.cc --- a/plugin/icedteanp/IcedTeaPluginUtils.cc Fri Aug 23 16:35:37 2013 -0400 +++ b/plugin/icedteanp/IcedTeaPluginUtils.cc Tue Aug 27 16:53:30 2013 -0400 @@ -53,7 +53,7 @@ int IcedTeaPluginUtilities::reference = -1; pthread_mutex_t IcedTeaPluginUtilities::reference_mutex = PTHREAD_MUTEX_INITIALIZER; std::map* IcedTeaPluginUtilities::instance_map = new std::map(); -std::map* IcedTeaPluginUtilities::object_map = new std::map(); +std::map IcedTeaPluginUtilities::object_map; /* Plugin async call queue */ static std::vector< PluginThreadCall* >* pendingPluginThreadRequests = new std::vector< PluginThreadCall* >(); @@ -433,9 +433,9 @@ IcedTeaPluginUtilities::printStringVector(const char* prefix, std::vector* str_vector) { - // This is a CPU intensive function. Run only if debugging - if (!plugin_debug) - return; + // This is a CPU intensive function. Run only if debugging + if (!plugin_debug) + return; std::string* str = new std::string(); *str += "{ "; @@ -561,27 +561,25 @@ * @return The associated active NPObject, NULL otherwise */ -NPObject* +NPObjectRef IcedTeaPluginUtilities::getNPObjectFromJavaKey(std::string key) { - - NPObject* object = NULL; PLUGIN_DEBUG("getNPObjectFromJavaKey looking for %s\n", key.c_str()); - std::map::iterator iterator = object_map->find(key); + std::map::iterator iterator = object_map.find(key); - if (iterator != object_map->end()) + if (iterator != object_map.end()) { - NPObject* mapped_object = object_map->find(key)->second; + NPObjectRef object = object_map.find(key)->second; - if (getInstanceFromMemberPtr(mapped_object) != NULL) + if (getInstanceFromMemberPtr(object.get()) != NULL) { - object = mapped_object; - PLUGIN_DEBUG("getNPObjectFromJavaKey found %s. NPObject = %p\n", key.c_str(), object); + PLUGIN_DEBUG("getNPObjectFromJavaKey found %s. NPObject = %p\n", key.c_str(), object.get()); + return object; } } - return object; + return NPObjectRef(NULL); } /** @@ -592,10 +590,10 @@ */ void -IcedTeaPluginUtilities::storeObjectMapping(std::string key, NPObject* object) +IcedTeaPluginUtilities::storeObjectMapping(std::string key, NPObjectRef object) { - PLUGIN_DEBUG("Storing object %p with key %s\n", object, key.c_str()); - object_map->insert(std::make_pair(key, object)); + PLUGIN_DEBUG("Storing object %p with key %s\n", object.get(), key.c_str()); + object_map.insert(std::make_pair(key, object)); } /** @@ -608,19 +606,14 @@ IcedTeaPluginUtilities::removeObjectMapping(std::string key) { PLUGIN_DEBUG("Removing key %s from object map\n", key.c_str()); - object_map->erase(key); + 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(); + object_map = std::map(); } /* @@ -633,9 +626,9 @@ void IcedTeaPluginUtilities::printStringPtrVector(const char* prefix, std::vector* str_ptr_vector) { - // This is a CPU intensive function. Run only if debugging - if (!plugin_debug) - return; + // This is a CPU intensive function. Run only if debugging + if (!plugin_debug) + return; std::string* str = new std::string(); *str += "{ "; @@ -819,18 +812,13 @@ std::string jclass_id = *jclass_result->return_string; - NPObject* obj; - if (jclass_id.at(0) == '[') // array - { - obj = IcedTeaScriptableJavaObject::get_scriptable_java_object(instance, jclass_id, - jobject_id, true); - } else - { - obj = IcedTeaScriptableJavaObject::get_scriptable_java_object(instance, jclass_id, - jobject_id, false); - } + bool is_array = (jclass_id.at(0) == '['); + NPObjectRef object = IcedTeaScriptableJavaObject::get_scriptable_java_object(instance, jclass_id, + jobject_id, is_array); - OBJECT_TO_NPVARIANT(obj, *variant); + OBJECT_TO_NPVARIANT(object.get(), *variant); + /* Retain because we are returning an NPObject* */ + object.raw_retain(); return true; } @@ -874,12 +862,12 @@ } bool -IcedTeaPluginUtilities::isObjectJSArray(NPP instance, NPObject* object) +IcedTeaPluginUtilities::isObjectJSArray(NPP instance, NPObjectRef object) { NPVariant constructor_v = NPVariant(); NPIdentifier constructor_id = browser_functions.getstringidentifier("constructor"); - browser_functions.getproperty(instance, object, constructor_id, &constructor_v); + browser_functions.getproperty(instance, object.get(), constructor_id, &constructor_v); IcedTeaPluginUtilities::printNPVariant(constructor_v); // void constructor => not an array @@ -1087,6 +1075,34 @@ str = str.substr(start, end - start + 1); } +std::string +IcedTeaPluginUtilities::stringPrintf(const char* fmt, /*variable arguments*/ ...) +{ + /* Extract the variable arguments */ + va_list args; + va_start(args, fmt); + + gchar* result = NULL; + size_t size; + + /* Format the arguments into a new buffer, held in 'result' */ + size = g_vasprintf (&result, fmt, args); + + if (result == NULL) + { + // We are out of memory + throw std::bad_alloc(); + } + + /* Wrap as string and free buffer */ + std::string str(result, size); + g_free(result); + + va_end(args); /* Finish using variable arguments */ + + return str; +} + std::string IcedTeaPluginUtilities::NPIdentifierAsString(NPIdentifier id) { NPUTF8* cstr = browser_functions.utf8fromidentifier(id); if (cstr == NULL) { @@ -1242,3 +1258,41 @@ PLUGIN_DEBUG("%p unlocked...\n", &msg_queue_mutex); } +void +NPObjectRef::set(NPObject* new_object) +{ + if (new_object != NULL) { + /* Increase the new object's reference count */ + browser_functions.retainobject(new_object); + } + if (current_object != NULL) { + /* Decrease the old object's reference count */ + browser_functions.releaseobject(current_object); + } + + this->current_object = new_object; +} + +NPObjectRef +NPObjectRef::create(NPP instance, NPClass* np_class) +{ + NPObjectRef ref; + /* Don't use set(), otherwise we'd double-retain */ + ref.current_object = browser_functions.createobject(instance, np_class); + return ref; +} + +/* Explicit reference counting operations, use only if needed for interoperating with NPObject* */ +void +NPObjectRef::raw_retain() { + if (current_object != NULL) { + browser_functions.retainobject(current_object); + } +} + +void +NPObjectRef::raw_release() { + if (current_object != NULL) { + browser_functions.releaseobject(current_object); + } +} diff -r 94ebabfba6ab -r 420d72e5cee7 plugin/icedteanp/IcedTeaPluginUtils.h --- a/plugin/icedteanp/IcedTeaPluginUtils.h Fri Aug 23 16:35:37 2013 -0400 +++ b/plugin/icedteanp/IcedTeaPluginUtils.h Tue Aug 27 16:53:30 2013 -0400 @@ -153,6 +153,61 @@ /* Function to process all pending async calls */ void processAsyncCallQueue(void*); +/* Reference-counted 'smart pointer' to NPObject */ +class NPObjectRef { +public: + /* Create with browser_functions.createobject. + * This ensures the object is not double-retained. */ + static NPObjectRef create(NPP instance, NPClass* np_class); + + NPObjectRef(NPObject* obj = NULL) { + current_object = NULL; + set(obj); + } + + NPObjectRef(const NPObjectRef& ref) { + current_object = NULL; + set(ref.current_object); + } + + NPObjectRef& operator=(const NPObjectRef& ref) { + set(ref.current_object); + return *this; + } + + ~NPObjectRef() { + clear(); + } + + void set(NPObject* new_object); + + /* Get's the object pointer */ + NPObject* get() { + return current_object; + } + + /* Helper for getting object as different type. + * NOTE: This cast is unchecked. */ + template + T as() { + return (T)current_object; + } + + /* Explicit reference counting operations, use only if needed for interoperating with NPObject* */ + void raw_retain(); + void raw_release(); + + bool empty() { + return (current_object == NULL); + } + + void clear() { + set(NULL); + } +private: + NPObject* current_object; +}; + class IcedTeaPluginUtilities { @@ -165,8 +220,8 @@ /* Map holding window pointer<->instance relationships */ static std::map* instance_map; - /* Map holding java-side-obj-key->NPObject relationship */ - static std::map* object_map; + /* Map holding java-side-obj-key->NPObject relationship. */ + static std::map object_map; /* Posts a call in the async call queue */ static bool postPluginThreadAsyncCall(NPP instance, void (*func) (void *), void* data); @@ -202,6 +257,8 @@ /* Converts the given integer to a string */ static void itoa(int i, std::string* result); + static std::string stringPrintf(const char* fmt, ...); + /* Copies a variant data type into a C++ string */ static std::string NPVariantAsString(NPVariant variant); @@ -262,9 +319,9 @@ static NPP getInstanceFromMemberPtr(void* member_ptr); - static NPObject* getNPObjectFromJavaKey(std::string key); + static NPObjectRef getNPObjectFromJavaKey(std::string key); - static void storeObjectMapping(std::string key, NPObject* object); + static void storeObjectMapping(std::string key, NPObjectRef object); static void removeObjectMapping(std::string key); @@ -273,7 +330,7 @@ static void invalidateInstance(NPP instance); - static bool isObjectJSArray(NPP instance, NPObject* object); + static bool isObjectJSArray(NPP instance, NPObjectRef object); static void decodeURL(const char* url, char** decoded_url); diff -r 94ebabfba6ab -r 420d72e5cee7 plugin/icedteanp/IcedTeaScriptablePluginObject.cc --- a/plugin/icedteanp/IcedTeaScriptablePluginObject.cc Fri Aug 23 16:35:37 2013 -0400 +++ b/plugin/icedteanp/IcedTeaScriptablePluginObject.cc Tue Aug 27 16:53:30 2013 -0400 @@ -306,24 +306,26 @@ //NPIdentifier property = browser_functions.getstringidentifier(property_name.c_str()); - NPObject* obj; + NPObjectRef object; if (isPropertyClass) { PLUGIN_DEBUG("Returning package object\n"); - obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object( + object = IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object( IcedTeaPluginUtilities::getInstanceFromMemberPtr(npobj), property_name.c_str()); } else { PLUGIN_DEBUG("Returning Java object\n"); - obj = IcedTeaScriptableJavaObject::get_scriptable_java_object( + object = IcedTeaScriptableJavaObject::get_scriptable_java_object( IcedTeaPluginUtilities::getInstanceFromMemberPtr(npobj), *(java_result->return_string), "0", false); } - OBJECT_TO_NPVARIANT(obj, *result); + OBJECT_TO_NPVARIANT(object.get(), *result); + /* Retain because we are returning an NPObject* */ + object.raw_retain(); return true; } @@ -384,32 +386,33 @@ return np_class; } -NPObject* -IcedTeaScriptableJavaObject::get_scriptable_java_object(NPP instance, - std::string class_id, - std::string instance_id, - bool isArray) +/* Creates a scriptable java object (intended to be called asynch.) */ +static void +create_scriptable_java_object_async(void* data) +{ + PLUGIN_DEBUG("Asynchronously creating object ...\n"); + + std::vector parameters = ((AsyncCallThreadData*) data)->parameters; + NPP instance = (NPP) parameters.at(0); + NPClass* np_class = (NPClass*) parameters.at(1); + NPObjectRef* object_ref = (NPObjectRef*) parameters.at(2); + + *object_ref = browser_functions.createobject(instance, np_class); + + ((AsyncCallThreadData*) data)->result_ready = true; +} + +static NPObjectRef +create_scriptable_java_object(NPP instance) { /* Shared NPClass instance for IcedTeaScriptablePluginObject */ static NPClass np_class = scriptable_java_package_object_class(); - std::string obj_key = class_id + ":" + instance_id; - - PLUGIN_DEBUG("get_scriptable_java_object searching for %s...\n", obj_key.c_str()); - IcedTeaScriptableJavaObject* scriptable_object = (IcedTeaScriptableJavaObject*) IcedTeaPluginUtilities::getNPObjectFromJavaKey(obj_key); - - if (scriptable_object != NULL) - { - PLUGIN_DEBUG("Returning existing object %p\n", scriptable_object); - browser_functions.retainobject(scriptable_object); - return scriptable_object; - } - // try to create normally - scriptable_object = (IcedTeaScriptableJavaObject*)browser_functions.createobject(instance, &np_class); + NPObjectRef np_object = NPObjectRef::create(instance, &np_class); // didn't work? try creating asynch - if (!scriptable_object) + if (np_object.empty()) { AsyncCallThreadData thread_data = AsyncCallThreadData(); thread_data.result_ready = false; @@ -418,45 +421,104 @@ thread_data.parameters.push_back(instance); thread_data.parameters.push_back(&np_class); - thread_data.parameters.push_back(&scriptable_object); From bugzilla-daemon at icedtea.classpath.org Wed Aug 28 11:51:29 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 28 Aug 2013 18:51:29 +0000 Subject: [Bug 1533] New: Wrong handling of in jnlp Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1533 Bug ID: 1533 Summary: Wrong handling of in jnlp 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: mnl at mnl.de CC: unassigned at icedtea.classpath.org Found in (IcedTea 2.3.10) (7u25-2.3.10-1ubuntu0.13.04.2) s in sections in the jnlp file aren't handled correctly. A defined in a common -section is ignored if there is a more specific section. As there is no "restriction" in the general statement, it should be applied in all environments. As a workaround, the statements can be copied into the specific sections. But this is tedious if the jnlp is downloaded from the web. -- 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/20130828/958e023f/attachment.html From adomurad at redhat.com Wed Aug 28 11:58:27 2013 From: adomurad at redhat.com (Adam Domurad) Date: Wed, 28 Aug 2013 14:58:27 -0400 Subject: [rfc][icedtea-web] Java -> Javascript object leak tests Message-ID: <521E4853.9070203@redhat.com> Hi all. The fixes will be posted soon, but I am putting this here so the reviewer can have a head-start. These tests currently fail. Bundled also are some C++ unit test infrastructure improvements: * Ability to query Java objects stored in PluginObjectStore for the C++ unit tests. MemoryLeakDetector was augmented to use this to calculate Javascript-bound Java object leaks. * The tests now fail if there is a leak of any of the three kinds: - NPAPI (eg browser_functions.memalloc) - C++ (new/delete) - Bound Java object leak (reference to Javascript-bound Java object in PluginObjectStore never freed) * Minor output improvements ChangeLog: 2013-XX-XX Adam Domurad Add Java-object leak unit tests & reproducer. Treat unit test leak as failure. * plugin/icedteanp/java/sun/applet/PluginObjectStore.java (getStoredClassCount): New, allow for querying amount of currently bound plugin Java classes. (getStoredInstanceCount): New, allow for querying amount of currently bound plugin Java objects. * tests/cpp-unit-tests/java_query.cc: Uses reflection to access PluginObjectStore (getStoredInstanceCount) and (getStoredClassCount). * tests/cpp-unit-tests/java_query.h: Same, as well introduce JavaValueID, which keeps track of Java object references. * tests/cpp-unit-tests/IcedTeaJavaRequestProcessorTest.cc: Make use of JavaValueID wherever possible. * tests/cpp-unit-tests/IcedTeaNPPluginTest.cc: Update to new MemoryLeakDetector interface. * tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc: Same. * tests/cpp-unit-tests/MemoryLeakDetector.h: Unify warning messages with leak detection. * tests/cpp-unit-tests/main.cc: More forceful memory leak detection: Treat any of the 3 kinds of memory detection as failure. * tests/reproducers/simple/JavascriptMemoryLeak/resources/JavascriptMemoryLeak.html: Test if binding large objects continuously causes OutOfMemoryError. * tests/reproducers/simple/JavascriptMemoryLeak/resources/JavascriptMemoryLeak.js: Same. * tests/reproducers/simple/JavascriptMemoryLeak/srcs/JavascriptMemoryLeak.java: Same. * tests/reproducers/simple/JavascriptMemoryLeak/testcases/JavascriptMemoryLeakTest.java: Same. With this patch on HEAD, 36/42 unit tests should pass (6 failures), and the reproducer should fail. Happy hacking, -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: BoundJavaObjectLeakTests.patch Type: text/x-patch Size: 59665 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130828/2793080d/BoundJavaObjectLeakTests.patch From bugzilla-daemon at icedtea.classpath.org Wed Aug 28 12:09:50 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 28 Aug 2013 19:09:50 +0000 Subject: [Bug 1533] Wrong handling of in jnlp In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1533 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |omajid at redhat.com Component|IcedTea |NetX (javaws) Assignee|gnu.andrew at redhat.com |omajid at redhat.com Product|IcedTea |IcedTea-Web -- 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/20130828/36976a96/attachment.html From andrew at icedtea.classpath.org Wed Aug 28 12:34:33 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 28 Aug 2013 19:34:33 +0000 Subject: /hg/icedtea6: Fix TCK regression caused by backport of 7162902. Message-ID: changeset ec5f676ee853 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ec5f676ee853 author: Andrew John Hughes date: Wed Aug 28 20:34:26 2013 +0100 Fix TCK regression caused by backport of 7162902. 2013-08-28 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new backport. * patches/openjdk/6893617-cnctx_always_uses_default_orb.patch: Fixes TCK regression caused by 7162902. diffstat: ChangeLog | 7 + Makefile.am | 3 +- patches/openjdk/6893617-cnctx_always_uses_default_orb.patch | 234 ++++++++++++ 3 files changed, 243 insertions(+), 1 deletions(-) diffs (265 lines): diff -r a4e16f083f3b -r ec5f676ee853 ChangeLog --- a/ChangeLog Tue Aug 20 16:27:39 2013 +0100 +++ b/ChangeLog Wed Aug 28 20:34:26 2013 +0100 @@ -1,3 +1,10 @@ +2013-08-28 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new backport. + * patches/openjdk/6893617-cnctx_always_uses_default_orb.patch: + Fixes TCK regression caused by 7162902. + 2013-08-20 Andrew John Hughes * Makefile.am: diff -r a4e16f083f3b -r ec5f676ee853 Makefile.am --- a/Makefile.am Tue Aug 20 16:27:39 2013 +0100 +++ b/Makefile.am Wed Aug 28 20:34:26 2013 +0100 @@ -734,7 +734,8 @@ patches/hotspot/original/jvmtiEnv.patch \ patches/hotspot/original/7197906-handle_32_bit_shifts.patch \ patches/sparc-trapsfix.patch \ - patches/print_lsb_release.patch + patches/print_lsb_release.patch \ + patches/openjdk/6893617-cnctx_always_uses_default_orb.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r a4e16f083f3b -r ec5f676ee853 patches/openjdk/6893617-cnctx_always_uses_default_orb.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6893617-cnctx_always_uses_default_orb.patch Wed Aug 28 20:34:26 2013 +0100 @@ -0,0 +1,234 @@ +# HG changeset patch +# User coffeys +# Date 1340827826 -3600 +# Wed Jun 27 21:10:26 2012 +0100 +# Node ID 83f8283e47917f97b838257db5711e37be9b715e +# Parent 352fad83e8447dec768064f60dc85934db32ef27 +6893617: JDK 6 CNCtx always uses the default ORB +Reviewed-by: lancea + +diff --git a/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java b/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java +--- openjdk/jdk/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java ++++ openjdk/jdk/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1999, 2012, 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 +@@ -59,8 +59,22 @@ + + private final static boolean debug = false; + ++ /* ++ * Implement one shared ORB among all CNCtx. However, there is a public constructor ++ * accepting an ORB, so we need the option of using a given ORB. ++ */ ++ private static ORB _defaultOrb; + ORB _orb; // used by ExceptionMapper and RMI/IIOP factory + public NamingContext _nc; // public for accessing underlying NamingContext ++ ++ private synchronized static ORB getDefaultOrb() { ++ if (_defaultOrb == null) { ++ _defaultOrb = CorbaUtils.getOrb(null, -1, ++ new Hashtable()); ++ } ++ return _defaultOrb; ++ } ++ + private NameComponent[] _name = null; + + Hashtable _env; // used by ExceptionMapper +@@ -113,8 +127,9 @@ + // rest is the INS name + // Return the parsed form to prevent subsequent lookup + // from parsing the string as a composite name +- // The caller should be aware that a toString() of the name +- // will yield its INS syntax, rather than a composite syntax ++ // The caller should be aware that a toString() of the name, ++ // which came from the environment will yield its INS syntax, ++ // rather than a composite syntax + return new ResolveResult(ctx, parser.parse(rest)); + } + +@@ -134,10 +149,10 @@ + if (orb == null || nctx == null) + throw new ConfigurationException( + "Must supply ORB or NamingContext"); +- _orb = orb; +- orbTracker = tracker; +- if (orbTracker != null) { +- orbTracker.incRefCount(); ++ if (orb != null) { ++ _orb = orb; ++ } else { ++ _orb = getDefaultOrb(); + } + _nc = nctx; + _env = env; +@@ -211,10 +226,13 @@ + org.omg.CORBA.ORB inOrb = null; + String ncIor = null; + +- if (env != null) { ++ if (inOrb == null && env != null) { + inOrb = (org.omg.CORBA.ORB) env.get("java.naming.corba.orb"); + } + ++ if (inOrb == null) ++ inOrb = getDefaultOrb(); // will create a default ORB if none exists ++ + // Extract PROVIDER_URL from environment + String provUrl = null; + if (env != null) { +@@ -225,13 +243,6 @@ + // Initialize the root naming context by using the IOR supplied + // in the PROVIDER_URL + ncIor = getStringifiedIor(provUrl); +- +- if (inOrb == null) { +- +- // no ORB instance specified; create one using env and defaults +- inOrb = CorbaUtils.getOrb(null, -1, env); +- orbTracker = new OrbReuseTracker(inOrb); +- } + setOrbAndRootContext(inOrb, ncIor); + } else if (provUrl != null) { + // Initialize the root naming context by using the URL supplied +@@ -257,14 +268,8 @@ + } + } else { + // No PROVIDER_URL supplied; initialize using defaults +- if (inOrb == null) { +- +- // No ORB instance specified; create one using env and defaults +- inOrb = CorbaUtils.getOrb(null, -1, env); +- orbTracker = new OrbReuseTracker(inOrb); +- if (debug) { +- System.err.println("Getting default ORB: " + inOrb + env); +- } ++ if (debug) { ++ System.err.println("Getting default ORB: " + inOrb + env); + } + setOrbAndRootContext(inOrb, (String)null); + } +@@ -285,6 +290,10 @@ + */ + private String initUsingIiopUrl(ORB defOrb, String url, Hashtable env) + throws NamingException { ++ ++ if (defOrb == null) ++ defOrb = getDefaultOrb(); ++ + try { + IiopUrl parsedUrl = new IiopUrl(url); + +@@ -296,19 +305,17 @@ + addr = (IiopUrl.Address)addrs.elementAt(i); + + try { +- if (defOrb != null) { +- try { +- String tmpUrl = "corbaloc:iiop:" + addr.host +- + ":" + addr.port + "/NameService"; +- if (debug) { +- System.err.println("Using url: " + tmpUrl); +- } +- org.omg.CORBA.Object rootCtx = +- defOrb.string_to_object(tmpUrl); +- setOrbAndRootContext(defOrb, rootCtx); +- return parsedUrl.getStringName(); +- } catch (Exception e) {} // keep going +- } ++ try { ++ String tmpUrl = "corbaloc:iiop:" + addr.host ++ + ":" + addr.port + "/NameService"; ++ if (debug) { ++ System.err.println("Using url: " + tmpUrl); ++ } ++ org.omg.CORBA.Object rootCtx = ++ defOrb.string_to_object(tmpUrl); ++ setOrbAndRootContext(defOrb, rootCtx); ++ return parsedUrl.getStringName(); ++ } catch (Exception e) {} // keep going + + // Get ORB + if (debug) { +@@ -316,12 +323,8 @@ + + " and port " + addr.port); + } + +- // Get ORB +- ORB orb = CorbaUtils.getOrb(addr.host, addr.port, env); +- orbTracker = new OrbReuseTracker(orb); +- + // Assign to fields +- setOrbAndRootContext(orb, (String)null); ++ setOrbAndRootContext(defOrb, (String)null); + return parsedUrl.getStringName(); + + } catch (NamingException ne) { +@@ -343,18 +346,16 @@ + */ + private String initUsingCorbanameUrl(ORB orb, String url, Hashtable env) + throws NamingException { ++ ++ if (orb == null) ++ orb = getDefaultOrb(); ++ + try { + CorbanameUrl parsedUrl = new CorbanameUrl(url); + + String corbaloc = parsedUrl.getLocation(); + String cosName = parsedUrl.getStringName(); + +- if (orb == null) { +- +- // No ORB instance specified; create one using env and defaults +- orb = CorbaUtils.getOrb(null, -1, env); +- orbTracker = new OrbReuseTracker(orb); +- } + setOrbAndRootContext(orb, corbaloc); + + return parsedUrl.getStringName(); +@@ -1115,9 +1116,6 @@ + } + + synchronized public void incEnumCount() { +- if (orbTracker == null) { +- return; +- } + enumCount++; + if (debug) { + System.out.println("incEnumCount, new count:" + enumCount); +@@ -1126,9 +1124,6 @@ + + synchronized public void decEnumCount() + throws NamingException { +- if (orbTracker == null) { +- return; +- } + enumCount--; + if (debug) { + System.out.println("decEnumCount, new count:" + enumCount + +@@ -1140,14 +1135,15 @@ + } + + synchronized public void close() throws NamingException { +- if (orbTracker == null) { +- return; +- } ++ + if (enumCount > 0) { + isCloseCalled = true; + return; + } +- orbTracker.decRefCount(); ++ ++ // Never destroy an orb in CNCtx. ++ // The orb we have is either the shared/default orb, or one passed in to a constructor ++ // from elsewhere, so that orb is somebody else's reponsibility. + } + + protected void finalize() { From andrew at icedtea.classpath.org Wed Aug 28 15:12:56 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 28 Aug 2013 22:12:56 +0000 Subject: /hg/icedtea6: Fix TCK regression with LCMS 2 by making setTagDat... Message-ID: changeset b79ee332e4f6 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b79ee332e4f6 author: Andrew John Hughes date: Wed Aug 28 23:12:48 2013 +0100 Fix TCK regression with LCMS 2 by making setTagData not throw exceptions. 2013-08-28 Andrew John Hughes * Makefile.am: Add new patch. * patches/lcms2-emulate_old_settagdata.patch: Emulate behaviour of old 6 setTagData function in not throwing exceptions. diffstat: ChangeLog | 7 ++++++ Makefile.am | 3 +- patches/lcms2-emulate_old_settagdata.patch | 31 ++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletions(-) diffs (62 lines): diff -r ec5f676ee853 -r b79ee332e4f6 ChangeLog --- a/ChangeLog Wed Aug 28 20:34:26 2013 +0100 +++ b/ChangeLog Wed Aug 28 23:12:48 2013 +0100 @@ -1,3 +1,10 @@ +2013-08-28 Andrew John Hughes + + * Makefile.am: Add new patch. + * patches/lcms2-emulate_old_settagdata.patch: + Emulate behaviour of old 6 setTagData function + in not throwing exceptions. + 2013-08-28 Andrew John Hughes * Makefile.am: diff -r ec5f676ee853 -r b79ee332e4f6 Makefile.am --- a/Makefile.am Wed Aug 28 20:34:26 2013 +0100 +++ b/Makefile.am Wed Aug 28 23:12:48 2013 +0100 @@ -457,7 +457,8 @@ patches/openjdk/lcms2/8009654-cmsnamed_stability.patch \ patches/openjdk/lcms2/7002766-parfait.patch \ patches/openjdk/lcms2/7042594-tck_failure.patch \ - patches/openjdk/lcms2/8007927-improve_cmsallocprofilesequencedescription.patch + patches/openjdk/lcms2/8007927-improve_cmsallocprofilesequencedescription.patch \ + patches/lcms2-emulate_old_settagdata.patch else LCMS_PATCHES = \ patches/lcms.patch diff -r ec5f676ee853 -r b79ee332e4f6 patches/lcms2-emulate_old_settagdata.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/lcms2-emulate_old_settagdata.patch Wed Aug 28 23:12:48 2013 +0100 @@ -0,0 +1,31 @@ +diff --git a/src/share/native/sun/java2d/cmm/lcms/LCMS.c b/src/share/native/sun/java2d/cmm/lcms/LCMS.c +--- openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c ++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c +@@ -479,7 +479,7 @@ + sig.j = tagSig; + + if (JNU_IsNull(env, data)) { +- JNU_ThrowIllegalArgumentException(env, "Can not write tag data."); ++ J2dRlsTraceLn(J2D_TRACE_ERROR, "LCMS_setTagData: data == NULL"); + return; + } + +@@ -488,7 +488,7 @@ + dataArray = (*env)->GetByteArrayElements(env, data, 0); + + if (dataArray == NULL) { +- JNU_ThrowIllegalArgumentException(env, "Can not write tag data."); ++ J2dRlsTraceLn(J2D_TRACE_ERROR, "LCMS_setTagData: dataArray == NULL"); + return; + } + +@@ -501,7 +501,8 @@ + (*env)->ReleaseByteArrayElements(env, data, dataArray, 0); + + if (!status) { +- JNU_ThrowIllegalArgumentException(env, "Can not write tag data."); ++ J2dRlsTraceLn1(J2D_TRACE_ERROR, "LCMS_setTagData: status == %d", ++ status); + } + } + From ptisnovs at icedtea.classpath.org Thu Aug 29 02:13:54 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 29 Aug 2013 09:13:54 +0000 Subject: /hg/gfx-test: Another ten new tests added into BitBltBasicTests ... Message-ID: changeset 94b777606de8 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=94b777606de8 author: Pavel Tisnovsky date: Thu Aug 29 11:17:36 2013 +0200 Another 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 109b82453520 -r 94b777606de8 ChangeLog --- a/ChangeLog Wed Aug 28 11:18:18 2013 +0200 +++ b/ChangeLog Thu Aug 29 11:17:36 2013 +0200 @@ -1,3 +1,8 @@ +2013-08-29 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + Another ten new tests added into BitBltBasicTests test suite. + 2013-08-28 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java: diff -r 109b82453520 -r 94b777606de8 src/org/gfxtest/testsuites/BitBltBasicTests.java --- a/src/org/gfxtest/testsuites/BitBltBasicTests.java Wed Aug 28 11:18:18 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Thu Aug 29 11:17:36 2013 +0200 @@ -5520,6 +5520,158 @@ } /** + * Test basic BitBlt operation for texture RGB pattern #1 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 testBitBltRGBTexture1BufferedImageTypeIntARGB_Pre(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture1Image(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE); + } + + /** + * Test basic BitBlt operation for texture RGB pattern #1 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 testBitBltRGBTexture1BufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture1Image(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB); + } + + /** + * Test basic BitBlt operation for texture RGB pattern #1 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 testBitBltRGBTexture1BufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture1Image(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB); + } + + /** + * Test basic BitBlt operation for texture RGB pattern #1 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 testBitBltRGBTexture1BufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture1Image(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY); + } + + /** + * Test basic BitBlt operation for texture RGB pattern #1 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 testBitBltRGBTexture2BufferedImageType3ByteBGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture2Image(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR); + } + + /** + * Test basic BitBlt operation for texture RGB pattern #1 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 testBitBltRGBTexture2BufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture2Image(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR); + } + + /** + * Test basic BitBlt operation for texture RGB pattern #1 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 testBitBltRGBTexture2BufferedImageType4ByteABGR_PRE(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture2Image(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE); + } + + /** + * Test basic BitBlt operation for texture RGB pattern #1 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 testBitBltRGBTexture2BufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture2Image(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); + } + + /** + * Test basic BitBlt operation for texture RGB pattern #1 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 testBitBltRGBTexture2BufferedImageTypeByteIndexed(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture2Image(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED); + } + + /** + * Test basic BitBlt operation for texture RGB pattern #1 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 testBitBltRGBTexture2BufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture2Image(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY); + } + + /** * Entry point to the test suite. * * @param args not used in this case From ptisnovs at icedtea.classpath.org Thu Aug 29 02:18:58 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 29 Aug 2013 09:18:58 +0000 Subject: /hg/rhino-tests: Added new test testAsSubclass into the test sui... Message-ID: changeset e89e9eb83631 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=e89e9eb83631 author: Pavel Tisnovsky date: Thu Aug 29 11:22:40 2013 +0200 Added new test testAsSubclass into the test suite InvocableClassTest. diffstat: ChangeLog | 5 + src/org/RhinoTests/InvocableClassTest.java | 158 +++++++++++++++++++++++++++++ 2 files changed, 163 insertions(+), 0 deletions(-) diffs (180 lines): diff -r fbd5a6ff705f -r e89e9eb83631 ChangeLog --- a/ChangeLog Wed Aug 28 11:21:38 2013 +0200 +++ b/ChangeLog Thu Aug 29 11:22:40 2013 +0200 @@ -1,3 +1,8 @@ +2013-08-29 Pavel Tisnovsky + + * src/org/RhinoTests/InvocableClassTest.java: + Added new test testAsSubclass into the test suite InvocableClassTest. + 2013-08-28 Pavel Tisnovsky * src/org/RhinoTests/SimpleScriptContextClassTest.java: diff -r fbd5a6ff705f -r e89e9eb83631 src/org/RhinoTests/InvocableClassTest.java --- a/src/org/RhinoTests/InvocableClassTest.java Wed Aug 28 11:21:38 2013 +0200 +++ b/src/org/RhinoTests/InvocableClassTest.java Thu Aug 29 11:22:40 2013 +0200 @@ -1072,6 +1072,164 @@ } /** + * Test for method javax.script.Invocable.getClass().asSubclass() + */ + protected void testAsSubclass() { + try { + this.invocableClass.asSubclass(invocableClass); + } + catch (Exception e) { + e.printStackTrace(); + throw new AssertionError(e.getMessage()); + } + + try { + this.invocableClass.asSubclass(java.lang.Void.class); + throw new AssertionError("Class.asSubclass(java.lang.Void.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.invocableClass.asSubclass(java.lang.Number.class); + throw new AssertionError("Class.asSubclass(java.lang.Number.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.invocableClass.asSubclass(java.lang.Byte.class); + throw new AssertionError("Class.asSubclass(java.lang.Byte.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.invocableClass.asSubclass(java.lang.Double.class); + throw new AssertionError("Class.asSubclass(java.lang.Double.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.invocableClass.asSubclass(java.lang.Float.class); + throw new AssertionError("Class.asSubclass(java.lang.Float.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.invocableClass.asSubclass(java.lang.Integer.class); + throw new AssertionError("Class.asSubclass(java.lang.Integer.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.invocableClass.asSubclass(java.lang.Long.class); + throw new AssertionError("Class.asSubclass(java.lang.Long.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.invocableClass.asSubclass(java.lang.Short.class); + throw new AssertionError("Class.asSubclass(java.lang.Short.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.invocableClass.asSubclass(java.lang.String.class); + throw new AssertionError("Class.asSubclass(java.lang.String.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.invocableClass.asSubclass(java.lang.StringBuffer.class); + throw new AssertionError("Class.asSubclass(java.lang.StringBuffer.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.invocableClass.asSubclass(java.lang.StringBuilder.class); + throw new AssertionError("Class.asSubclass(java.lang.StringBuilder.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.invocableClass.asSubclass(java.awt.Color.class); + throw new AssertionError("Class.asSubclass(java.awt.Color.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.invocableClass.asSubclass(java.awt.Font.class); + throw new AssertionError("Class.asSubclass(java.awt.Font.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.invocableClass.asSubclass(java.awt.Image.class); + throw new AssertionError("Class.asSubclass(java.awt.Image.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.invocableClass.asSubclass(javax.swing.JPanel.class); + throw new AssertionError("Class.asSubclass(javax.swing.JPanel.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.invocableClass.asSubclass(javax.swing.JColorChooser.class); + throw new AssertionError("Class.asSubclass(javax.swing.JColorChooser.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.invocableClass.asSubclass(javax.swing.JScrollBar.class); + throw new AssertionError("Class.asSubclass(javax.swing.JScrollBar.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.invocableClass.asSubclass(javax.swing.JSlider.class); + throw new AssertionError("Class.asSubclass(javax.swing.JSlider.class) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + } + + /** * Test for instanceof operator applied to a class javax.script.Invocable */ @SuppressWarnings("cast") From jvanek at redhat.com Thu Aug 29 03:47:07 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 29 Aug 2013 12:47:07 +0200 Subject: [rfc][icedtea-web] Very small SecurityDialog refactor In-Reply-To: <521BB140.80203@redhat.com> References: <521BB140.80203@redhat.com> Message-ID: <521F26AB.5030800@redhat.com> On 08/26/2013 09:49 PM, Andrew Azores wrote: > Changelog: > * /netx/net/sourceforge/jnlp/security/SecurityDialogs.java: refactored return statements following > getUserResponse(message) calls > > Not much to explain here really. Some of the if-else going on was a bit unnecessary since the return > value is boolean as well, and checking if the reference is null before using the instanceof operator > is also not needed as "null instanceof Foo" is defined as false anyway. > > Thanks, > hmhmh. You have compressed three blocks of copy pasted code into three small blocks of copy pasted code :) I would like to move the verbose/compressed code to separate method like getIntegerResponseAsBoolean (with javadoc in case of compressed one - for us dummies from east ;), and with unittest ) and then use this method. As I'm looking into code around, more such an copypasted code is spread here... The last hunk looks less readable after the change, but as you wish. Otherwise nice cleanup. J. From aazores at redhat.com Thu Aug 29 06:13:23 2013 From: aazores at redhat.com (Andrew Azores) Date: Thu, 29 Aug 2013 09:13:23 -0400 Subject: [rfc][icedtea-web] Fix CacheReproducerTest Message-ID: <521F48F3.5050108@redhat.com> Changelog: * tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java: (icedteaDir) field updated to reflect new ITW cache location from XDG spec. (clearCacheUnsucessfully) checks for correct "can not clear the cache" error message Not much going on here, really :). This is the start of my effort to stabilize reproducers. Looks like I got lucky with my first set to fix, because this turned out to be very very easy. There is one "KnownToFail" test in here that occasionally passes, so I will also look into that, but these two small changes stand on their own to fix the rest of the tests at least. Thanks, -- Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: CachReproducerTest.patch Type: text/x-patch Size: 1361 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130829/c8a0207d/CachReproducerTest.patch From bugzilla-daemon at icedtea.classpath.org Thu Aug 29 06:39:56 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 29 Aug 2013 13:39:56 +0000 Subject: [Bug 1534] New: Eclipse / ZendStudio crash Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1534 Bug ID: 1534 Summary: Eclipse / ZendStudio crash Classification: Unclassified Product: IcedTea Version: unspecified Hardware: x86 OS: Linux Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: thomas.vequaud at gmail.com CC: unassigned at icedtea.classpath.org Created attachment 924 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=924&action=edit Log Since the last update of my JVM (OpenJDK), I cannot start ZendStudio (Eclipse)... It crashes everytime after few seconds. -- 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/20130829/5bb93944/attachment.html From gitne at excite.co.jp Thu Aug 29 06:58:01 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Thu, 29 Aug 2013 22:58:01 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtyZmNdW2ljZWR0ZWEtd2ViXSBDZXJ0aWZpY2F0ZSB2aWV3ZXIgY2xlYW51cA==?= Message-ID: <201308291358.r7TDw1w2006686@mail-web03.excite.co.jp> "Jacob Wisor" wrote: > "Jacob Wisor" wrote: > > * Replaced old insufficient certificate viewer's action buttons handling with proper handling > > * Made System-level certificates managable if current user has write access to a KeyStore (usually only root or admin) > > * Added informative tool tip to disabled buttons when certificates are unmanagable > > * Made certificate table uneditable > > * Made certificate info table uneditable > > * Made certificate info's descriptive JTextField have the same font size as its info table for better readability > > * Added certificate file filters with Windows/Linux preference > > * Added auto-suggested certificate file names when exporting > > * Added automatically generated mnemonics > > * Made labels link to corresponding JComponents > > * Added a border to certificate type label for better readability > > * Uniformed border sizes > > * Added removing of multiple certificates at once > > * Turned some only once occuring fields into static > > * Added proper exception handling when setting system look & feel, hence removed superfluous "throws Exception" from method signatures > > > > Happy reviewing! > > > > Jacob > > Pasting in this time. > > [...] I have realized I have missed to add a new file to the patch. I have updated the copyright headers also. From jvanek at redhat.com Thu Aug 29 06:59:01 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 29 Aug 2013 15:59:01 +0200 Subject: [rfc][icedtea-web] Fix CacheReproducerTest In-Reply-To: <521F48F3.5050108@redhat.com> References: <521F48F3.5050108@redhat.com> Message-ID: <521F53A5.6080605@redhat.com> On 08/29/2013 03:13 PM, Andrew Azores wrote: > Changelog: > * tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java: (icedteaDir) field > updated to reflect new ITW cache location from XDG spec. (clearCacheUnsucessfully) checks for > correct "can not clear the cache" error message > > Not much going on here, really :). This is the start of my effort to stabilize reproducers. Looks > like I got lucky with my first set to fix, because this turned out to be very very easy. There is > one "KnownToFail" test in here that occasionally passes, so I will also look into that, but these > two small changes stand on their own to fix the rest of the tests at least. > > Thanks, > Nice catch. My wrong I overlooked the hard coded path. However - the test case can see the libraries, and the real cache(/config) path is now in Defaults. So I think it would be better to get rid of this hard coded path completely and replace by variable[1] (there was no variable in time of this test writing). This variable should be filled correctly no meter if custom XDG variable i set. J. [1]http://icedtea.classpath.org/hg/icedtea-web/file/420d72e5cee7/netx/net/sourceforge/jnlp/config/Defaults.java#l58 If you do not wont to use the full path (but why not), then maybe just http://icedtea.classpath.org/hg/icedtea-web/file/420d72e5cee7/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java#l53 From bugzilla-daemon at icedtea.classpath.org Thu Aug 29 06:59:13 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 29 Aug 2013 13:59:13 +0000 Subject: [Bug 1534] Eclipse / ZendStudio crash In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1534 --- Comment #1 from Thomas --- OpenJDK removed then replaced by GCJ : ZendStudio works well... But GCJ is so f***** slow ! Really need OpenJDK, 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/20130829/50f495f8/attachment.html From gitne at excite.co.jp Thu Aug 29 08:18:21 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Fri, 30 Aug 2013 00:18:21 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtyZmNdW2ljZWR0ZWEtd2ViXSBDZXJ0aWZpY2F0ZSB2aWV3ZXIgY2xlYW51cA==?= Message-ID: <201308291518.r7TFILBG011772@mail-web03.excite.co.jp> "Jacob Wisor" wrote: > "Jacob Wisor" wrote: > > * Replaced old insufficient certificate viewer's action buttons handling with proper handling > > * Made System-level certificates managable if current user has write access to a KeyStore (usually only root or admin) > > * Added informative tool tip to disabled buttons when certificates are unmanagable > > * Made certificate table uneditable > > * Made certificate info table uneditable > > * Made certificate info's descriptive JTextField have the same font size as its info table for better readability > > * Added certificate file filters with Windows/Linux preference > > * Added auto-suggested certificate file names when exporting > > * Added automatically generated mnemonics > > * Made labels link to corresponding JComponents > > * Added a border to certificate type label for better readability > > * Uniformed border sizes > > * Added removing of multiple certificates at once > > * Turned some only once occuring fields into static > > * Added proper exception handling when setting system look & feel, hence removed superfluous "throws Exception" from method signatures > > > > Happy reviewing! > > > > Jacob > > Pasting in this time. > > [...] I have realized I have missed to add a new file to the patch. I have updated the copyright headers too. -------------- next part -------------- A non-text attachment was scrubbed... Name: CertficateViewer_cleanup.patch Type: text/x-patch Size: 45995 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130830/43c05fe5/ISO-2022-JPBQ2VydGZpY2F0ZVZpZXdlcl9jbGVhbnVwLnBhdGNo.patch From adomurad at redhat.com Thu Aug 29 08:49:02 2013 From: adomurad at redhat.com (Adam Domurad) Date: Thu, 29 Aug 2013 11:49:02 -0400 Subject: [rfc][icedtea-web] Java -> Javascript object leak tests In-Reply-To: <521E4853.9070203@redhat.com> References: <521E4853.9070203@redhat.com> Message-ID: <521F6D6E.3050301@redhat.com> On 08/28/2013 02:58 PM, Adam Domurad wrote: > Hi all. The fixes will be posted soon, but I am putting this here so the > reviewer can have a head-start. > > These tests currently fail. > > Bundled also are some C++ unit test infrastructure improvements: > > * Ability to query Java objects stored in PluginObjectStore for the C++ > unit tests. MemoryLeakDetector was augmented to use this to calculate > Javascript-bound Java object leaks. > * The tests now fail if there is a leak of any of the three kinds: > - NPAPI (eg browser_functions.memalloc) > - C++ (new/delete) > - Bound Java object leak (reference to Javascript-bound Java object in > PluginObjectStore never freed) > * Minor output improvements > > ChangeLog: > 2013-XX-XX Adam Domurad > > Add Java-object leak unit tests & reproducer. Treat unit test > leak as > failure. > * plugin/icedteanp/java/sun/applet/PluginObjectStore.java > (getStoredClassCount): New, allow for querying amount of currently > bound plugin Java classes. > (getStoredInstanceCount): New, allow for querying amount of > currently > bound plugin Java objects. > * tests/cpp-unit-tests/java_query.cc: Uses reflection to access > PluginObjectStore (getStoredInstanceCount) and > (getStoredClassCount). > * tests/cpp-unit-tests/java_query.h: Same, as well introduce > JavaValueID, which keeps track of Java object references. > * tests/cpp-unit-tests/IcedTeaJavaRequestProcessorTest.cc: Make > use of > JavaValueID wherever possible. > * tests/cpp-unit-tests/IcedTeaNPPluginTest.cc: Update to new > MemoryLeakDetector interface. > * tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc: Same. > * tests/cpp-unit-tests/MemoryLeakDetector.h: Unify warning > messages > with leak detection. > * tests/cpp-unit-tests/main.cc: More forceful memory leak > detection: > Treat any of the 3 kinds of memory detection as failure. > * > tests/reproducers/simple/JavascriptMemoryLeak/resources/JavascriptMemoryLeak.html: > > Test if binding large objects continuously causes > OutOfMemoryError. > * > tests/reproducers/simple/JavascriptMemoryLeak/resources/JavascriptMemoryLeak.js: > > Same. > * > tests/reproducers/simple/JavascriptMemoryLeak/srcs/JavascriptMemoryLeak.java: > > Same. > * > tests/reproducers/simple/JavascriptMemoryLeak/testcases/JavascriptMemoryLeakTest.java: > > Same. > > With this patch on HEAD, 36/42 unit tests should pass (6 failures), and > the reproducer should fail. > > Happy hacking, > -Adam These test fixes came up during creation of the patch. To be applied after the tests patch. Cheers, -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: test-fixes.patch Type: text/x-patch Size: 5343 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130829/c01b6b62/test-fixes.patch From aazores at redhat.com Thu Aug 29 08:59:10 2013 From: aazores at redhat.com (Andrew Azores) Date: Thu, 29 Aug 2013 11:59:10 -0400 Subject: [rfc][icedtea-web] Fix CacheReproducerTest In-Reply-To: <521F53A5.6080605@redhat.com> References: <521F48F3.5050108@redhat.com> <521F53A5.6080605@redhat.com> Message-ID: <521F6FCE.3070207@redhat.com> On 08/29/2013 09:59 AM, Jiri Vanek wrote: > On 08/29/2013 03:13 PM, Andrew Azores wrote: >> Changelog: >> * >> tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java: >> (icedteaDir) field >> updated to reflect new ITW cache location from XDG spec. >> (clearCacheUnsucessfully) checks for >> correct "can not clear the cache" error message >> >> Not much going on here, really :). This is the start of my effort to >> stabilize reproducers. Looks >> like I got lucky with my first set to fix, because this turned out to >> be very very easy. There is >> one "KnownToFail" test in here that occasionally passes, so I will >> also look into that, but these >> two small changes stand on their own to fix the rest of the tests at >> least. >> >> Thanks, >> > > Nice catch. My wrong I overlooked the hard coded path. > > However - the test case can see the libraries, and the real > cache(/config) path is now in Defaults. So I think it would be better > to get rid of this hard coded path completely and replace by > variable[1] (there was no variable in time of this test writing). This > variable should be filled correctly no meter if custom XDG variable i > set. > > > J. > > [1]http://icedtea.classpath.org/hg/icedtea-web/file/420d72e5cee7/netx/net/sourceforge/jnlp/config/Defaults.java#l58 > > > If you do not wont to use the full path (but why not), then maybe just > http://icedtea.classpath.org/hg/icedtea-web/file/420d72e5cee7/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java#l53 > Like this you mean? I had to add the test to the same package as the Defaults class since that variable is set to default visibility, not public. Thanks, -- Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: CachReproducerTest.patch Type: text/x-patch Size: 2862 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130829/060923a6/CachReproducerTest.patch From andrew at icedtea.classpath.org Thu Aug 29 09:42:22 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 29 Aug 2013 16:42:22 +0000 Subject: /hg/release/icedtea6-1.12: 4 new changesets Message-ID: changeset fd43ce34de24 in /hg/release/icedtea6-1.12 details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=fd43ce34de24 author: Andrew John Hughes date: Thu Aug 29 16:11:28 2013 +0100 Fix TCK regression caused by backport of 7162902. 2013-08-28 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new backport. * patches/openjdk/6893617-cnctx_always_uses_default_orb.patch: Fixes TCK regression caused by 7162902. changeset 7d370df4beac in /hg/release/icedtea6-1.12 details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=7d370df4beac author: Andrew John Hughes date: Thu Aug 29 16:14:55 2013 +0100 Add dependencies of 8013196 and remove SharedSecrets fragment of 8013196 which causes a TCK regression. 2013-08-05 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch, * patches/openjdk/6636370-appcontext_simplification.patch, * patches/openjdk/7196533-timezone_bottleneck.patch: Backport additional patches which relate to changes in 8013196. * patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch: Drop SharedSecrets changes which cause a TCK regression. changeset f47f5152f6ac in /hg/release/icedtea6-1.12 details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=f47f5152f6ac author: Andrew John Hughes date: Thu Aug 29 16:16:25 2013 +0100 Fix naming of patch. 2013-08-06 Andrew John Hughes * 8013196-TimeZone_getDefault_throws_exception.patch: Renamed to... * 8013196-timezone_getdefault_throws_exception.patch: ...this. * Makefile.am: (ICEDTEA_PATCHES): Fix name of patch. changeset e319de2968f3 in /hg/release/icedtea6-1.12 details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=e319de2968f3 author: Andrew John Hughes date: Thu Aug 29 17:42:01 2013 +0100 Add latest tzdata updates. 2013-08-29 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new timezone data patches. * patches/openjdk/8014469-tzdata2013c.patch, * patches/openjdk/8020054-tzdata2013d.patch: Latest tzdata updates. diffstat: ChangeLog | 35 + Makefile.am | 11 +- patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch | 24 + patches/openjdk/6636370-appcontext_simplification.patch | 178 +++++ patches/openjdk/6893617-cnctx_always_uses_default_orb.patch | 234 +++++++ patches/openjdk/7196533-timezone_bottleneck.patch | 66 ++ patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch | 58 - patches/openjdk/8013196-timezone_getdefault_throws_exception.patch | 39 + patches/openjdk/8014469-tzdata2013c.patch | 276 ++++++++ patches/openjdk/8020054-tzdata2013d.patch | 314 ++++++++++ 10 files changed, 1174 insertions(+), 61 deletions(-) diffs (truncated from 1291 to 500 lines): diff -r a8496c2dd880 -r e319de2968f3 ChangeLog --- a/ChangeLog Wed Jul 10 21:26:41 2013 +0100 +++ b/ChangeLog Thu Aug 29 17:42:01 2013 +0100 @@ -1,3 +1,38 @@ +2013-08-29 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new timezone data patches. + * patches/openjdk/8014469-tzdata2013c.patch, + * patches/openjdk/8020054-tzdata2013d.patch: + Latest tzdata updates. + +2013-08-06 Andrew John Hughes + + * 8013196-TimeZone_getDefault_throws_exception.patch: + Renamed to... + * 8013196-timezone_getdefault_throws_exception.patch: + ...this. + * Makefile.am: + (ICEDTEA_PATCHES): Fix name of patch. + +2013-08-05 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patches. + * patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch, + * patches/openjdk/6636370-appcontext_simplification.patch, + * patches/openjdk/7196533-timezone_bottleneck.patch: + Backport additional patches which relate to changes in 8013196. + * patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch: + Drop SharedSecrets changes which cause a TCK regression. + +2013-08-28 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new backport. + * patches/openjdk/6893617-cnctx_always_uses_default_orb.patch: + Fixes TCK regression caused by 7162902. + 2013-07-10 Andrew John Hughes * configure.ac: Set to 1.12.7pre. diff -r a8496c2dd880 -r e319de2968f3 Makefile.am --- a/Makefile.am Wed Jul 10 21:26:41 2013 +0100 +++ b/Makefile.am Thu Aug 29 17:42:01 2013 +0100 @@ -683,7 +683,7 @@ patches/openjdk/8012112-MlibOpsTest_fails.patch \ patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch \ patches/openjdk/8012933-appcontext_disposed_too_early.patch \ - patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch \ + patches/openjdk/8013196-timezone_getdefault_throws_exception.patch \ patches/openjdk/8014427-raster_regression.patch \ patches/openjdk/8010727-empty_logger_name.patch \ patches/openjdk/8010939-logmanager_deadlock.patch \ @@ -704,8 +704,13 @@ patches/openjdk/7158483-tzdata2012c.patch \ patches/openjdk/7198570-tzdata2012f.patch \ patches/openjdk/8002225-tzdata2012i.patch \ - patches/openjdk/8009987-tzdata2013b.patch - + patches/openjdk/8009987-tzdata2013b.patch \ + patches/openjdk/6893617-cnctx_always_uses_default_orb.patch \ + patches/openjdk/7196533-timezone_bottleneck.patch \ + patches/openjdk/6636370-appcontext_simplification.patch \ + patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch \ + patches/openjdk/8014469-tzdata2013c.patch \ + patches/openjdk/8020054-tzdata2013d.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r a8496c2dd880 -r e319de2968f3 patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch Thu Aug 29 17:42:01 2013 +0100 @@ -0,0 +1,24 @@ +# HG changeset patch +# User son +# Date 1205416264 -10800 +# Thu Mar 13 16:51:04 2008 +0300 +# Node ID c9ee9428aea9baa8e32691db1e14744002c70def +# Parent bbd8e20d50523bbd89d10204e4f337a844f3cef1 +6636331: ConcurrentModificationException in AppContext code +Summary: Added synchronization to AppContext.getAppContexts() +Reviewed-by: art + +diff --git a/src/share/classes/sun/awt/AppContext.java b/src/share/classes/sun/awt/AppContext.java +--- openjdk/jdk/src/share/classes/sun/awt/AppContext.java ++++ openjdk/jdk/src/share/classes/sun/awt/AppContext.java +@@ -146,7 +146,9 @@ + * Returns a set containing all AppContexts. + */ + public static Set getAppContexts() { +- return new HashSet(threadGroup2appContext.values()); ++ synchronized (threadGroup2appContext) { ++ return new HashSet(threadGroup2appContext.values()); ++ } + } + + /* The main "system" AppContext, used by everything not otherwise diff -r a8496c2dd880 -r e319de2968f3 patches/openjdk/6636370-appcontext_simplification.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6636370-appcontext_simplification.patch Thu Aug 29 17:42:01 2013 +0100 @@ -0,0 +1,178 @@ +diff -Nru openjdk.orig/jdk/src/share/classes/sun/awt/AppContext.java openjdk/jdk/src/share/classes/sun/awt/AppContext.java +--- openjdk.orig/jdk/src/share/classes/sun/awt/AppContext.java 2013-08-05 16:49:37.120128300 +0100 ++++ openjdk/jdk/src/share/classes/sun/awt/AppContext.java 2013-08-05 17:02:51.304664462 +0100 +@@ -151,7 +151,7 @@ + contained in another AppContext. It is implicitly created for + standalone apps only (i.e. not applets) + */ +- private static AppContext mainAppContext = null; ++ private static volatile AppContext mainAppContext = null; + + /* + * The hash map associated with this AppContext. A private delegate +@@ -223,14 +223,15 @@ + threadGroup2appContext.put(threadGroup, this); + + this.contextClassLoader = +- (ClassLoader) AccessController.doPrivileged(new PrivilegedAction() { +- public Object run() { ++ AccessController.doPrivileged(new PrivilegedAction() { ++ public ClassLoader run() { + return Thread.currentThread().getContextClassLoader(); + } + }); + } + +- private static MostRecentThreadAppContext mostRecentThreadAppContext = null; ++ private static final ThreadLocal threadAppContext = ++ new ThreadLocal(); + + private final static void initMainAppContext() { + // On the main Thread, we get the ThreadGroup, make a corresponding +@@ -270,30 +271,18 @@ + return mainAppContext; + } + +- final Thread currentThread = Thread.currentThread(); ++ AppContext appContext = threadAppContext.get(); + +- AppContext appContext = null; +- +- // Note: this most recent Thread/AppContext caching is thread-hot. +- // A simple test using SwingSet found that 96.8% of lookups +- // were matched using the most recent Thread/AppContext. By +- // instantiating a simple MostRecentThreadAppContext object on +- // cache misses, the cache hits can be processed without +- // synchronization. +- +- MostRecentThreadAppContext recent = mostRecentThreadAppContext; +- if ((recent != null) && (recent.thread == currentThread)) { +- appContext = recent.appContext; // Cache hit +- } else { +- appContext = (AppContext)AccessController.doPrivileged( +- new PrivilegedAction() { +- public Object run() { +- // Get the current ThreadGroup, and look for it and its +- // parents in the hash from ThreadGroup to AppContext -- +- // it should be found, because we use createNewContext() +- // when new AppContext objects are created. +- ThreadGroup currentThreadGroup = currentThread.getThreadGroup(); +- ThreadGroup threadGroup = currentThreadGroup; ++ if (null == appContext) { ++ appContext = AccessController.doPrivileged(new PrivilegedAction() ++ { ++ public AppContext run() { ++ // Get the current ThreadGroup, and look for it and its ++ // parents in the hash from ThreadGroup to AppContext -- ++ // it should be found, because we use createNewContext() ++ // when new AppContext objects are created. ++ ThreadGroup currentThreadGroup = Thread.currentThread().getThreadGroup(); ++ ThreadGroup threadGroup = currentThreadGroup; + + // Special case: we implicitly create the main app context + // if no contexts have been created yet. This covers standalone apps +@@ -308,28 +297,29 @@ + } + } + +- AppContext context = threadGroup2appContext.get(threadGroup); +- while (context == null) { +- threadGroup = threadGroup.getParent(); +- if (threadGroup == null) { +- return null; ++ AppContext context = threadGroup2appContext.get(threadGroup); ++ while (context == null) { ++ threadGroup = threadGroup.getParent(); ++ if (threadGroup == null) { ++ return null; ++ } ++ context = threadGroup2appContext.get(threadGroup); ++ } ++ ++ // In case we did anything in the above while loop, we add ++ // all the intermediate ThreadGroups to threadGroup2appContext ++ // so we won't spin again. ++ for (ThreadGroup tg = currentThreadGroup; tg != threadGroup; tg = tg.getParent()) { ++ threadGroup2appContext.put(tg, context); ++ } ++ ++ // Now we're done, so we cache the latest key/value pair. ++ threadAppContext.set(context); ++ ++ ++ return context; + } +- context = threadGroup2appContext.get(threadGroup); +- } +- // In case we did anything in the above while loop, we add +- // all the intermediate ThreadGroups to threadGroup2appContext +- // so we won't spin again. +- for (ThreadGroup tg = currentThreadGroup; tg != threadGroup; tg = tg.getParent()) { +- threadGroup2appContext.put(tg, context); +- } +- +- // Now we're done, so we cache the latest key/value pair. +- mostRecentThreadAppContext = +- new MostRecentThreadAppContext(currentThread, context); +- +- return context; +- } +- }); ++ }); + } + + return appContext; +@@ -473,7 +463,7 @@ + // Threads in the ThreadGroup to exit. + + long startTime = System.currentTimeMillis(); +- long endTime = startTime + (long)THREAD_INTERRUPT_TIMEOUT; ++ long endTime = startTime + THREAD_INTERRUPT_TIMEOUT; + while ((this.threadGroup.activeCount() > 0) && + (System.currentTimeMillis() < endTime)) { + try { +@@ -488,7 +478,7 @@ + // Threads in the ThreadGroup to die. + + startTime = System.currentTimeMillis(); +- endTime = startTime + (long)THREAD_INTERRUPT_TIMEOUT; ++ endTime = startTime + THREAD_INTERRUPT_TIMEOUT; + while ((this.threadGroup.activeCount() > 0) && + (System.currentTimeMillis() < endTime)) { + try { +@@ -507,10 +497,7 @@ + } + threadGroup2appContext.remove(this.threadGroup); + +- MostRecentThreadAppContext recent = mostRecentThreadAppContext; +- if ((recent != null) && (recent.appContext == this)) +- mostRecentThreadAppContext = null; +- // If the "most recent" points to this, clear it for GC ++ threadAppContext.set(null); + + // Finally, we destroy the ThreadGroup entirely. + try { +@@ -693,6 +680,7 @@ + * Returns a string representation of this AppContext. + * @since 1.2 + */ ++ @Override + public String toString() { + return getClass().getName() + "[threadGroup=" + threadGroup.getName() + "]"; + } +@@ -842,15 +830,6 @@ + } + } + +-final class MostRecentThreadAppContext { +- final Thread thread; +- final AppContext appContext; +- MostRecentThreadAppContext(Thread key, AppContext value) { +- thread = key; +- appContext = value; +- } +-} +- + final class MostRecentKeyValue { + Object key; + Object value; diff -r a8496c2dd880 -r e319de2968f3 patches/openjdk/6893617-cnctx_always_uses_default_orb.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6893617-cnctx_always_uses_default_orb.patch Thu Aug 29 17:42:01 2013 +0100 @@ -0,0 +1,234 @@ +# HG changeset patch +# User coffeys +# Date 1340827826 -3600 +# Wed Jun 27 21:10:26 2012 +0100 +# Node ID 83f8283e47917f97b838257db5711e37be9b715e +# Parent 352fad83e8447dec768064f60dc85934db32ef27 +6893617: JDK 6 CNCtx always uses the default ORB +Reviewed-by: lancea + +diff --git a/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java b/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java +--- openjdk/jdk/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java ++++ openjdk/jdk/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1999, 2012, 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 +@@ -59,8 +59,22 @@ + + private final static boolean debug = false; + ++ /* ++ * Implement one shared ORB among all CNCtx. However, there is a public constructor ++ * accepting an ORB, so we need the option of using a given ORB. ++ */ ++ private static ORB _defaultOrb; + ORB _orb; // used by ExceptionMapper and RMI/IIOP factory + public NamingContext _nc; // public for accessing underlying NamingContext ++ ++ private synchronized static ORB getDefaultOrb() { ++ if (_defaultOrb == null) { ++ _defaultOrb = CorbaUtils.getOrb(null, -1, ++ new Hashtable()); ++ } ++ return _defaultOrb; ++ } ++ + private NameComponent[] _name = null; + + Hashtable _env; // used by ExceptionMapper +@@ -113,8 +127,9 @@ + // rest is the INS name + // Return the parsed form to prevent subsequent lookup + // from parsing the string as a composite name +- // The caller should be aware that a toString() of the name +- // will yield its INS syntax, rather than a composite syntax ++ // The caller should be aware that a toString() of the name, ++ // which came from the environment will yield its INS syntax, ++ // rather than a composite syntax + return new ResolveResult(ctx, parser.parse(rest)); + } + +@@ -134,10 +149,10 @@ + if (orb == null || nctx == null) + throw new ConfigurationException( + "Must supply ORB or NamingContext"); +- _orb = orb; +- orbTracker = tracker; +- if (orbTracker != null) { +- orbTracker.incRefCount(); ++ if (orb != null) { ++ _orb = orb; ++ } else { ++ _orb = getDefaultOrb(); + } + _nc = nctx; + _env = env; +@@ -211,10 +226,13 @@ + org.omg.CORBA.ORB inOrb = null; + String ncIor = null; + +- if (env != null) { ++ if (inOrb == null && env != null) { + inOrb = (org.omg.CORBA.ORB) env.get("java.naming.corba.orb"); + } + ++ if (inOrb == null) ++ inOrb = getDefaultOrb(); // will create a default ORB if none exists ++ + // Extract PROVIDER_URL from environment + String provUrl = null; + if (env != null) { +@@ -225,13 +243,6 @@ + // Initialize the root naming context by using the IOR supplied + // in the PROVIDER_URL + ncIor = getStringifiedIor(provUrl); +- +- if (inOrb == null) { +- +- // no ORB instance specified; create one using env and defaults +- inOrb = CorbaUtils.getOrb(null, -1, env); +- orbTracker = new OrbReuseTracker(inOrb); +- } + setOrbAndRootContext(inOrb, ncIor); + } else if (provUrl != null) { + // Initialize the root naming context by using the URL supplied +@@ -257,14 +268,8 @@ + } + } else { + // No PROVIDER_URL supplied; initialize using defaults +- if (inOrb == null) { +- +- // No ORB instance specified; create one using env and defaults +- inOrb = CorbaUtils.getOrb(null, -1, env); +- orbTracker = new OrbReuseTracker(inOrb); +- if (debug) { +- System.err.println("Getting default ORB: " + inOrb + env); +- } ++ if (debug) { ++ System.err.println("Getting default ORB: " + inOrb + env); + } + setOrbAndRootContext(inOrb, (String)null); + } +@@ -285,6 +290,10 @@ + */ + private String initUsingIiopUrl(ORB defOrb, String url, Hashtable env) + throws NamingException { ++ ++ if (defOrb == null) ++ defOrb = getDefaultOrb(); ++ + try { + IiopUrl parsedUrl = new IiopUrl(url); + +@@ -296,19 +305,17 @@ + addr = (IiopUrl.Address)addrs.elementAt(i); + + try { +- if (defOrb != null) { +- try { +- String tmpUrl = "corbaloc:iiop:" + addr.host +- + ":" + addr.port + "/NameService"; +- if (debug) { +- System.err.println("Using url: " + tmpUrl); +- } +- org.omg.CORBA.Object rootCtx = +- defOrb.string_to_object(tmpUrl); +- setOrbAndRootContext(defOrb, rootCtx); +- return parsedUrl.getStringName(); +- } catch (Exception e) {} // keep going +- } ++ try { ++ String tmpUrl = "corbaloc:iiop:" + addr.host ++ + ":" + addr.port + "/NameService"; ++ if (debug) { ++ System.err.println("Using url: " + tmpUrl); ++ } ++ org.omg.CORBA.Object rootCtx = ++ defOrb.string_to_object(tmpUrl); ++ setOrbAndRootContext(defOrb, rootCtx); ++ return parsedUrl.getStringName(); ++ } catch (Exception e) {} // keep going + + // Get ORB + if (debug) { +@@ -316,12 +323,8 @@ + + " and port " + addr.port); + } + +- // Get ORB +- ORB orb = CorbaUtils.getOrb(addr.host, addr.port, env); +- orbTracker = new OrbReuseTracker(orb); +- + // Assign to fields +- setOrbAndRootContext(orb, (String)null); ++ setOrbAndRootContext(defOrb, (String)null); + return parsedUrl.getStringName(); + + } catch (NamingException ne) { +@@ -343,18 +346,16 @@ + */ + private String initUsingCorbanameUrl(ORB orb, String url, Hashtable env) + throws NamingException { ++ ++ if (orb == null) ++ orb = getDefaultOrb(); ++ + try { + CorbanameUrl parsedUrl = new CorbanameUrl(url); + + String corbaloc = parsedUrl.getLocation(); + String cosName = parsedUrl.getStringName(); + +- if (orb == null) { +- +- // No ORB instance specified; create one using env and defaults +- orb = CorbaUtils.getOrb(null, -1, env); +- orbTracker = new OrbReuseTracker(orb); +- } + setOrbAndRootContext(orb, corbaloc); + + return parsedUrl.getStringName(); +@@ -1115,9 +1116,6 @@ + } + + synchronized public void incEnumCount() { +- if (orbTracker == null) { +- return; +- } + enumCount++; + if (debug) { + System.out.println("incEnumCount, new count:" + enumCount); +@@ -1126,9 +1124,6 @@ + + synchronized public void decEnumCount() + throws NamingException { +- if (orbTracker == null) { +- return; +- } + enumCount--; + if (debug) { + System.out.println("decEnumCount, new count:" + enumCount + +@@ -1140,14 +1135,15 @@ + } From adomurad at redhat.com Thu Aug 29 10:19:20 2013 From: adomurad at redhat.com (Adam Domurad) Date: Thu, 29 Aug 2013 13:19:20 -0400 Subject: [rfc][icedtea-web] Java -> Javascript object leak tests In-Reply-To: <521F6D6E.3050301@redhat.com> References: <521E4853.9070203@redhat.com> <521F6D6E.3050301@redhat.com> Message-ID: <521F8298.3040004@redhat.com> Final patch of my internship :-) I've tested this one pretty thoroughly, hopefully it is suitable. To test it, apply the two previous patches (the test + test fixes). The unit tests and reproducer should then pass. Here are the fixes: ChangLog: 2013-XX-XX Adam Domurad * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc: Fix Java object reference leaks in many methods. * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: Same. * plugin/icedteanp/IcedTeaJavaRequestProcessor.h (NPObjectRef): Force explicit construction. (object_map): Make NPObject references 'weak'. * plugin/icedteanp/IcedTeaPluginUtils.cc: Update object_map usage for new 'weak' references. * plugin/icedteanp/IcedTeaPluginUtils.h: Same. * plugin/icedteanp/IcedTeaScriptablePluginObject.cc: Minor cleanup, fix accidental retain caused by implicit NPObjectRef construction. * plugin/icedteanp/IcedTeaScriptablePluginObject.h: Free Java object references on deallocation. * plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java (handleMessage): Don't create a new object reference when passed an existing object. (store): Now returns reference. (freeIdentifier): New, convenience method for freeing identifier. * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: (call): Cleanup, fix Java string reference leak Cheers & bye for now, -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: Java-Object-Freeing.patch Type: text/x-patch Size: 41845 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130829/162f68a9/Java-Object-Freeing.patch From alex.kasko.lists at gmail.com Thu Aug 29 10:20:48 2013 From: alex.kasko.lists at gmail.com (Alex Kasko) Date: Thu, 29 Aug 2013 21:20:48 +0400 Subject: [rfc][icedtea7] patch for macosx build In-Reply-To: <848108177.3113403.1377710865539.JavaMail.root@redhat.com> References: <52080477.1080102@gmail.com> <848108177.3113403.1377710865539.JavaMail.root@redhat.com> Message-ID: <521F82F0.60500@gmail.com> On 08/28/2013 09:27 PM, Andrew Hughes wrote: > ----- Original Message ----- >> Hi, >> >> I've built icedtea7 head (hg:0a8108854365) for macosx x86_64 and want to >> publish patch for possible upstreaming. >> >> I've used the same sources, as in windows build - obtained from >> "icedtea7/openjdk" directory by running: >> >> ./configure \ >> --disable-system-zlib \ >> --disable-system-jpeg \ >> --disable-system-png \ >> --disable-system-gif \ >> --disable-system-lcms \ >> --disable-compile-against-syscalls \ >> --disable-nss >> >> and "make" on debian wheezy. >> >> Then built these sources on macosx 10.7.5 with xcode 4.3.2 (gcc 4.2.1) >> as a separate openjdk build (without icedtea infrastructure) using >> additional environment >> variables: >> >> export FT2_CFLAGS='-I$(FREETYPE_HEADERS_PATH) >> -I$(FREETYPE_HEADERS_PATH)/freetype2' >> export DISABLE_INTREE_EC=true >> >> Patch was created against icedtea7-forest/jdk (hg:afaedb56b499): >> >> 2013-08-11 Alex Kasko >> >> *make/java/nio/Makefile: >> add "syscalls_fp.c" to compilation list in macosx specific section >> *make/sun/lwawt/FILES_c_macosx.gmk: >> add "cups_fp.c" to compilation list >> *make/sun/lwawt/Makefile: >> add "solaris/native/common/deps" directory to headers search list, and >> to vpath (not sure whether vpath is necessary here) >> >> >> -- >> Regards, >> Alex Kasko >> > > Why didn't you just use IcedTea in full? I can understand the problems on Windows > but OS X is UNIX-like. I tried to configure IcedTea on mac, but gave up. With configure script generated by autotools from macports (automake 1.14) I've got: ./configure: line 8675: syntax error near unexpected token `NSS,' ./configure: line 8675: `PKG_CHECK_MODULES(NSS, nss, NSS_FOUND=yes, NSS_FOUND=no)' With configure script generated in linux (automake 1.11.6) I've got: checking for XPROTO... no configure: error: Could not find Xproto headers - Try installing xorg-x11-proto-devel I have Xproto.h and other headers in /usr/include/X11 . I tried to install x11-xproto from macports with the same results. I have a shallow knowledge in autotools, any suggestions about these issues are appreciated. > > I haven't looked at the changes in full but I have a feeling they are more due to > misconfiguration arising from this than something that would be generally useful. I think it's better to compare patched sources configured on linux and mac, but haven't succeeded in this yet. BTW, changes in a patch are similar to this change - http://hg.openjdk.java.net/icedtea/jdk7/jdk/diff/005c45393f0d/make/sun/xawt/FILES_c_unix.gmk only for mac specific makefiles. -- Regards, Alex Kasko From gnu.andrew at redhat.com Thu Aug 29 14:21:08 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Thu, 29 Aug 2013 17:21:08 -0400 (EDT) Subject: [rfc][icedtea7] patch for macosx build In-Reply-To: <521F82F0.60500@gmail.com> References: <52080477.1080102@gmail.com> <848108177.3113403.1377710865539.JavaMail.root@redhat.com> <521F82F0.60500@gmail.com> Message-ID: <1067337143.4212683.1377811268336.JavaMail.root@redhat.com> ----- Original Message ----- > On 08/28/2013 09:27 PM, Andrew Hughes wrote: > > ----- Original Message ----- > >> Hi, > >> > >> I've built icedtea7 head (hg:0a8108854365) for macosx x86_64 and want to > >> publish patch for possible upstreaming. > >> > >> I've used the same sources, as in windows build - obtained from > >> "icedtea7/openjdk" directory by running: > >> > >> ./configure \ > >> --disable-system-zlib \ > >> --disable-system-jpeg \ > >> --disable-system-png \ > >> --disable-system-gif \ > >> --disable-system-lcms \ > >> --disable-compile-against-syscalls \ > >> --disable-nss > >> > >> and "make" on debian wheezy. > >> > >> Then built these sources on macosx 10.7.5 with xcode 4.3.2 (gcc 4.2.1) > >> as a separate openjdk build (without icedtea infrastructure) using > >> additional environment > >> variables: > >> > >> export FT2_CFLAGS='-I$(FREETYPE_HEADERS_PATH) > >> -I$(FREETYPE_HEADERS_PATH)/freetype2' > >> export DISABLE_INTREE_EC=true > >> > >> Patch was created against icedtea7-forest/jdk (hg:afaedb56b499): > >> > >> 2013-08-11 Alex Kasko > >> > >> *make/java/nio/Makefile: > >> add "syscalls_fp.c" to compilation list in macosx specific section > >> *make/sun/lwawt/FILES_c_macosx.gmk: > >> add "cups_fp.c" to compilation list > >> *make/sun/lwawt/Makefile: > >> add "solaris/native/common/deps" directory to headers search list, and > >> to vpath (not sure whether vpath is necessary here) > >> > >> > >> -- > >> Regards, > >> Alex Kasko > >> > > > > Why didn't you just use IcedTea in full? I can understand the problems on > > Windows > > but OS X is UNIX-like. > I tried to configure IcedTea on mac, but gave up. > > With configure script generated by autotools from macports (automake > 1.14) I've got: > > ./configure: line 8675: syntax error near unexpected token `NSS,' > ./configure: line 8675: `PKG_CHECK_MODULES(NSS, nss, NSS_FOUND=yes, > NSS_FOUND=no)' > This means it can't find the definition of the PKG_CHECK_MODULES macro which is in /usr/share/aclocal/pkg.m4 on GNU/Linux boxes and is part of pkgconfig. You shouldn't need to generate configure at all if you use a release tarball. What exactly are you building? > With configure script generated in linux (automake 1.11.6) I've got: > > checking for XPROTO... no > configure: error: Could not find Xproto headers - Try installing > xorg-x11-proto-devel > > I have Xproto.h and other headers in /usr/include/X11 . I tried to > install x11-xproto from macports with the same results. I have a shallow > knowledge in autotools, any suggestions about these issues are appreciated. > I feel the message may be sending you on a wild goose chase. The first thing with configure scripts is always to check config.log to see the actual failing output (at least for good autoconf macros which log the output). I suspect this is related to pkgconfig again, and it's not a lack of the header but an inability to query pkgconfig for whether or not Xproto is installed. configure:12966: checking for XPROTO configure:12973: $PKG_CONFIG --exists --print-errors "xproto" configure:12976: $? = 0 configure:12990: $PKG_CONFIG --exists --print-errors "xproto" configure:12993: $? = 0 configure:13031: result: yes > > > > I haven't looked at the changes in full but I have a feeling they are more > > due to > > misconfiguration arising from this than something that would be generally > > useful. > I think it's better to compare patched sources configured on linux and > mac, but haven't succeeded in this yet. > > BTW, changes in a patch are similar to this change - > http://hg.openjdk.java.net/icedtea/jdk7/jdk/diff/005c45393f0d/make/sun/xawt/FILES_c_unix.gmk > > only for mac specific makefiles. > Yeah I should have read the patch :) The two changes to Mac OS X makefiles are obvious and the changes don't exist there simply because those makefiles didn't exist when the original CUPS changes were made. Likewise, the java/nio/Makefile code is needed because the same code, while already present, is in a Linux-specific block. Again, the Mac OS X block wouldn't have been present when this was added and it's hard to determine if it's needed without testing on that platform. Looking at this again, UnixDispatcher requires it so it should actually be moved to the !windows block. Thanks a lot for all this testing. It is much appreciated. > > -- > 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 omajid at redhat.com Thu Aug 29 16:33:32 2013 From: omajid at redhat.com (Omair Majid) Date: Thu, 29 Aug 2013 19:33:32 -0400 Subject: [icedtea-web] RFC: PR1058 - XFileOpenService openMultiFileDialog ClassCastException Message-ID: <521FDA4C.3000001@redhat.com> Hi, The attached patch fixes PR1058. Instead of trying to create a privileged proxy for the FileContents[] array, simply create a privileged proxy for each FileContents instance and return an array of them. Okay to push? Thanks, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 -------------- next part -------------- A non-text attachment was scrubbed... Name: pr1058-01.patch Type: text/x-patch Size: 1615 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130829/fcf34b10/pr1058-01.patch From bugzilla-daemon at icedtea.classpath.org Thu Aug 29 16:38:52 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 29 Aug 2013 23:38:52 +0000 Subject: [Bug 1214] DownloadService2 is not supported by IcedTea-Web In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1214 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |omajid at redhat.com Assignee|smohammad at redhat.com |omajid 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/20130829/2b6c99c4/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu Aug 29 16:42:21 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 29 Aug 2013 23:42:21 +0000 Subject: [Bug 1395] Bug javaws.itweb / icedtea with JNLP In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1395 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- 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/20130829/35dd6806/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu Aug 29 17:27:05 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 30 Aug 2013 00:27:05 +0000 Subject: [Bug 1533] Wrong handling of in jnlp In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1533 --- Comment #1 from Omair Majid --- Do you have a test case for this? Unit tests seem to indicate this is handled correctly. -- 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/20130830/6b2582cf/attachment.html From omajid at redhat.com Thu Aug 29 17:36:49 2013 From: omajid at redhat.com (Omair Majid) Date: Thu, 29 Aug 2013 20:36:49 -0400 Subject: [icedtea-web] RFC: Test case for PR1533 Message-ID: <521FE921.9030809@redhat.com> Hi, PR1533 says that resources are not filtered and combined as needed. I wrote up a unit test to check that. Unexpectedly, the test passes. I asked the reporter for more information, but the test seems good enough on it's own. Okay to push? Thanks, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 -------------- next part -------------- A non-text attachment was scrubbed... Name: pr1533-01.patch Type: text/x-patch Size: 3978 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130829/c8122ac5/pr1533-01.patch From jvanek at redhat.com Fri Aug 30 01:55:38 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 30 Aug 2013 10:55:38 +0200 Subject: [icedtea-web] RFC: PR1058 - XFileOpenService openMultiFileDialog ClassCastException In-Reply-To: <521FDA4C.3000001@redhat.com> References: <521FDA4C.3000001@redhat.com> Message-ID: <52205E0A.3020709@redhat.com> On 08/30/2013 01:33 AM, Omair Majid wrote: > + FileContents[] result = new FileContents[length]; > + for (int i = 0; i< length; i++) { > + XFileContents xfile = new XFileContents(files[i]); > + result[i] = (FileContents) ServiceUtil.createPrivilegedProxy(FileContents.class, xfile); > + } > + return result; Looks good to me. From bugzilla-daemon at icedtea.classpath.org Fri Aug 30 01:52:55 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 30 Aug 2013 08:52:55 +0000 Subject: [Bug 1533] Wrong handling of in jnlp In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1533 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jvanek at redhat.com --- Comment #2 from JiriVanek --- Here is Omair's unittest - http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-August/024402.html -- 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/20130830/9368adfa/attachment.html From jvanek at redhat.com Fri Aug 30 01:58:39 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 30 Aug 2013 10:58:39 +0200 Subject: [icedtea-web] RFC: Test case for PR1533 In-Reply-To: <521FE921.9030809@redhat.com> References: <521FE921.9030809@redhat.com> Message-ID: <52205EBF.4060000@redhat.com> On 08/30/2013 02:36 AM, Omair Majid wrote: > Hi, > > PR1533 says that resources are not filtered and combined as needed. I > wrote up a unit test to check that. Unexpectedly, the test passes. I > asked the reporter for more information, but the test seems good enough > on it's own. Okay to push? > > Thanks, > Omair Looks ok to me. Are you going to do any more about this bug? thank you, J. From ptisnovs at icedtea.classpath.org Fri Aug 30 02:21:36 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 30 Aug 2013 09:21:36 +0000 Subject: /hg/gfx-test: Ten new tests added into BitBltUsingBgColor test s... Message-ID: changeset cdf5b6539c5f in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=cdf5b6539c5f author: Pavel Tisnovsky date: Fri Aug 30 11:25:12 2013 +0200 Ten new tests added into BitBltUsingBgColor test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 150 +++++++++++++++++++++ 2 files changed, 155 insertions(+), 0 deletions(-) diffs (172 lines): diff -r 94b777606de8 -r cdf5b6539c5f ChangeLog --- a/ChangeLog Thu Aug 29 11:17:36 2013 +0200 +++ b/ChangeLog Fri Aug 30 11:25:12 2013 +0200 @@ -1,3 +1,8 @@ +2013-08-30 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Ten new tests added into BitBltUsingBgColor test suite. + 2013-08-29 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBasicTests.java: diff -r 94b777606de8 -r cdf5b6539c5f src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Thu Aug 29 11:17:36 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Fri Aug 30 11:25:12 2013 +0200 @@ -3302,6 +3302,156 @@ } /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_RGB. + * Background color is set to Color.magenta. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntRGBbackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntRGB(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_RGB. + * Background color is set to Color.yellow. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntRGBbackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntRGB(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_RGB. + * Background color is set to Color.white. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntRGBbackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntRGB(image, graphics2d, Color.white); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB. + * Background color is set to Color.black. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntARGBbackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB. + * Background color is set to Color.blue. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntARGBbackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB. + * Background color is set to Color.green. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntARGBbackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB. + * Background color is set to Color.cyan. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntARGBbackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB. + * Background color is set to Color.red. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntARGBbackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB. + * Background color is set to Color.magenta. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntARGBbackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB. + * Background color is set to Color.yellow. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltCheckerBufferedImageTypeIntARGBbackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, Color.yellow); + } + + /** * Entry point to the test suite. * * @param args not used in this case From ptisnovs at icedtea.classpath.org Fri Aug 30 02:27:38 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 30 Aug 2013 09:27:38 +0000 Subject: /hg/rhino-tests: Added new test testCast (that checks Class.cast... Message-ID: changeset e55f8607a4cf in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=e55f8607a4cf author: Pavel Tisnovsky date: Fri Aug 30 11:30:45 2013 +0200 Added new test testCast (that checks Class.cast() method) into test test suite AbstractScriptEngineClassTest. diffstat: ChangeLog | 6 + src/org/RhinoTests/AbstractScriptEngineClassTest.java | 190 ++++++++++++++++++ 2 files changed, 196 insertions(+), 0 deletions(-) diffs (213 lines): diff -r e89e9eb83631 -r e55f8607a4cf ChangeLog --- a/ChangeLog Thu Aug 29 11:22:40 2013 +0200 +++ b/ChangeLog Fri Aug 30 11:30:45 2013 +0200 @@ -1,3 +1,9 @@ +2013-08-30 Pavel Tisnovsky + + * src/org/RhinoTests/AbstractScriptEngineClassTest.java: + Added new test testCast (that checks Class.cast() method) into test + test suite AbstractScriptEngineClassTest. + 2013-08-29 Pavel Tisnovsky * src/org/RhinoTests/InvocableClassTest.java: diff -r e89e9eb83631 -r e55f8607a4cf src/org/RhinoTests/AbstractScriptEngineClassTest.java --- a/src/org/RhinoTests/AbstractScriptEngineClassTest.java Thu Aug 29 11:22:40 2013 +0200 +++ b/src/org/RhinoTests/AbstractScriptEngineClassTest.java Fri Aug 30 11:30:45 2013 +0200 @@ -1487,6 +1487,196 @@ } /** + * Test for method javax.script.AbstractScriptEngine.getClass().cast() + */ + protected void testCast() { + try { + this.abstractScriptEngineClass.cast(new Object()); + throw new AssertionError("Class.cast(new Object()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.cast(new Object().getClass()); + throw new AssertionError("Class.cast(new Object().getClass()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.cast(new String()); + throw new AssertionError("Class.cast(new String()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.cast(Boolean.valueOf(true)); + throw new AssertionError("Class.cast(Boolean.valueOf(true)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.cast(Boolean.valueOf(false)); + throw new AssertionError("Class.cast(Boolean.valueOf(false)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.cast(Byte.valueOf((byte)42)); + throw new AssertionError("Class.cast(Byte.valueOf((byte)42)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.cast(Short.valueOf((short)42)); + throw new AssertionError("Class.cast(Short.valueOf((short)42)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.cast(Integer.valueOf(42)); + throw new AssertionError("Class.cast(Integer.valueOf(42)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.cast(Long.valueOf(42L)); + throw new AssertionError("Class.cast(Long.valueOf(42L)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.cast(Float.valueOf(42f)); + throw new AssertionError("Class.cast(Float.valueOf(42f)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.cast(Double.valueOf(42.)); + throw new AssertionError("Class.cast(Double.valueOf(42.)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.cast(new Throwable()); + throw new AssertionError("Class.cast(new Throwable()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.cast(new RuntimeException()); + throw new AssertionError("Class.cast(new RuntimeException()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.cast(new Error()); + throw new AssertionError("Class.cast(new Error()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.cast(new java.lang.String()); + throw new AssertionError("Class.cast(new java.lang.String()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.cast(new java.lang.StringBuffer()); + throw new AssertionError("Class.cast(new java.lang.StringBuffer()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.cast(new java.lang.StringBuilder()); + throw new AssertionError("Class.cast(new java.lang.StringBuilder()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.cast(java.awt.Color.black); + throw new AssertionError("Class.cast(java.awt.Color.black) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.cast(new java.awt.Frame()); + throw new AssertionError("Class.cast(new java.awt.Frame()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.cast(new java.awt.Frame(new String())); + throw new AssertionError("Class.cast(new java.awt.Frame(new String())) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.cast(new javax.swing.JLabel()); + throw new AssertionError("Class.cast(new javax.swing.JLabel()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.cast(new javax.swing.JLabel(new String())); + throw new AssertionError("Class.cast(new javax.swing.JLabel(new String())) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.abstractScriptEngineClass.cast(new javax.swing.JPanel()); + throw new AssertionError("Class.cast(new javax.swing.JPanel()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + } + + /** * Test for instanceof operator applied to a class javax.script.AbstractScriptEngine */ @SuppressWarnings("cast") From bugzilla-daemon at icedtea.classpath.org Fri Aug 30 02:58:53 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 30 Aug 2013 09:58:53 +0000 Subject: [Bug 1533] Wrong handling of in jnlp In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1533 --- Comment #3 from mnl at mnl.de --- Created attachment 925 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=925&action=edit Log of stdout for failure -- 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/20130830/e50524ac/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Aug 30 02:59:43 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 30 Aug 2013 09:59:43 +0000 Subject: [Bug 1533] Wrong handling of in jnlp In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1533 --- Comment #4 from mnl at mnl.de --- Created attachment 926 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=926&action=edit Log of stderr for failure -- 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/20130830/93418c72/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Aug 30 03:00:23 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 30 Aug 2013 10:00:23 +0000 Subject: [Bug 1533] Wrong handling of in jnlp In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1533 --- Comment #5 from mnl at mnl.de --- Created attachment 927 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=927&action=edit Log of stdout after workaround -- 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/20130830/1c24b91d/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Aug 30 03:18:28 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 30 Aug 2013 10:18:28 +0000 Subject: [Bug 1533] Wrong handling of in jnlp In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1533 --- Comment #6 from mnl at mnl.de --- I added some log files (that also contain the jnlp's). Comparing them, I think the important difference is that with the statements only in the common part, javaws says: All possible urls for location=https://olymp-ipmi:443/liblinux_x86_64.jar state=CONNECTING DOWNLOAD STARTED : [https://olymp-ipmi:443/liblinux_x86_64.jar?version-id=1.0.5, https://olymp-ipmi:443/liblinux_x86_64.jar] When the statements are repeated in the Linux/amd64 specific part, it says: All possible urls for location=https://olymp-ipmi:443/liblinux_x86_64.jar state=CONNECTING DOWNLOAD STARTED : [https://olymp-ipmi:443/liblinux_x86_64__V1.0.5.jar.pack.gz, https://olymp-ipmi:443/liblinux_x86_64__V1.0.5.jar, ...] So the problems seems to be that it appends the version as query ("?version-id=1.0.5") if the s are specified in the common part only. Actually, this seems to be the same issue as decribed in https://bugzilla.redhat.com/show_bug.cgi?id=753960#c13 (note that this bug report contains 2 issues). It mentions at the end that the solution has been pushed to the 1.3 branch. As I am using version 1.3.2-1ubuntu1, the solution has either not been pushed after all or the problem has reappeared. -- 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/20130830/7a7a5ee2/attachment.html From gitne at excite.co.jp Fri Aug 30 04:06:21 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Fri, 30 Aug 2013 20:06:21 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtyZmNdW2ljZWR0ZWEtd2ViXSBGaXggQ2FjaGVSZXByb2R1Y2VyVGVzdA==?= Message-ID: <201308301106.r7UB6LlE032185@mail-web03.excite.co.jp> "Andrew Azores" wrote: > On 08/29/2013 09:59 AM, Jiri Vanek wrote: > > On 08/29/2013 03:13 PM, Andrew Azores wrote: > >> Changelog: > >> * > >> tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java: > >> (icedteaDir) field > >> updated to reflect new ITW cache location from XDG spec. > >> (clearCacheUnsucessfully) checks for > >> correct "can not clear the cache" error message > >> > >> Not much going on here, really :). This is the start of my effort to > >> stabilize reproducers. Looks > >> like I got lucky with my first set to fix, because this turned out to > >> be very very easy. There is > >> one "KnownToFail" test in here that occasionally passes, so I will > >> also look into that, but these > >> two small changes stand on their own to fix the rest of the tests at > >> least. > >> > >> Thanks, > >> > > > > Nice catch. My wrong I overlooked the hard coded path. > > > > However - the test case can see the libraries, and the real > > cache(/config) path is now in Defaults. So I think it would be better > > to get rid of this hard coded path completely and replace by > > variable[1] (there was no variable in time of this test writing). This > > variable should be filled correctly no meter if custom XDG variable i > > set. > > > > > > J. > > > > [1]http://icedtea.classpath.org/hg/icedtea-web/file/420d72e5cee7/netx/net/sourceforge/jnlp/config/Defaults.java#l58 > > > > > > If you do not wont to use the full path (but why not), then maybe just > > http://icedtea.classpath.org/hg/icedtea-web/file/420d72e5cee7/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java#l53 > > > > Like this you mean? I had to add the test to the same package as the > Defaults class since that variable is set to default visibility, not public. > Even at the risk this may be perceived as nagging, but you may want to consider replacing those "/" String literals with File.separator, especially in places where the string concatinations are derived from system properties. It is probably no problem to pass slashes ( / ), backslashes ( \ ), or any other system specific file separator to File's constuctors or objects because File converts any paramters into URLs internally anyway. But when manipulating or comparing raw strings one may get undefined or different results. Or, one should make sure to use URLs only and stick to those when manipulating or comparing strings. Another thing that perhaps should be considered are systems that do not - for what ever reason - implement the XDG specification. What should be IcedTea-Web's expected behavior in this case? Should it simply force XDG onto that system or should it rather fall back to the previously employed simple scheme (System.getProperty("user.home") + File.separator + ".icedtea")? Regards, Jacob From bugzilla-daemon at icedtea.classpath.org Fri Aug 30 05:34:44 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 30 Aug 2013 12:34:44 +0000 Subject: [Bug 1535] New: [IcedTea6] Allow use of system Kerberos to obtain cache location Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1535 Bug ID: 1535 Summary: [IcedTea6] Allow use of system Kerberos to obtain cache location Classification: Unclassified Product: IcedTea Version: 6-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org https://bugzilla.redhat.com/show_bug.cgi?id=991170 http://icedtea.classpath.org/hg/icedtea7-forest/jdk/rev/3e4e1a4ef584 http://icedtea.classpath.org/hg/icedtea7-forest/jdk/rev/fd4289593675 -- 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/20130830/cb31dda6/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Aug 30 05:35:12 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 30 Aug 2013 12:35:12 +0000 Subject: [Bug 1535] [IcedTea6] Allow use of system Kerberos to obtain cache location In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1535 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED URL| |https://bugzilla.redhat.com | |/show_bug.cgi?id=991170 Blocks| |1272 -- 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/20130830/b5743084/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Aug 30 05:35:12 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 30 Aug 2013 12:35:12 +0000 Subject: [Bug 1272] [TRACKER] IcedTea6 1.13 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1272 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |1535 -- 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/20130830/04de4cba/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Aug 30 05:35:46 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 30 Aug 2013 12:35:46 +0000 Subject: [Bug 1535] [IcedTea6] Allow use of system Kerberos to obtain cache location In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1535 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Target Milestone|--- |6-1.13.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/20130830/0f469a2a/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Aug 30 05:36:26 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 30 Aug 2013 12:36:26 +0000 Subject: [Bug 1536] New: [IcedTea7] Allow use of system Kerberos to obtain cache location Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1536 Bug ID: 1536 Summary: [IcedTea7] Allow use of system Kerberos to obtain cache location Classification: Unclassified Product: IcedTea Version: 7-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org https://bugzilla.redhat.com/show_bug.cgi?id=991170 http://icedtea.classpath.org/hg/icedtea7-forest/jdk/rev/3e4e1a4ef584 http://icedtea.classpath.org/hg/icedtea7-forest/jdk/rev/fd4289593675 -- 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/20130830/93b6eeeb/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Aug 30 05:37:11 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 30 Aug 2013 12:37:11 +0000 Subject: [Bug 1536] [IcedTea7] Allow use of system Kerberos to obtain cache location In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1536 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED URL| |https://bugzilla.redhat.com | |/show_bug.cgi?id=991170 Target Milestone|--- |2.4.2 -- 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/20130830/596216c9/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Aug 30 05:38:18 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 30 Aug 2013 12:38:18 +0000 Subject: [Bug 1537] New: [IcedTea8] Allow use of system Kerberos to obtain cache location Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1537 Bug ID: 1537 Summary: [IcedTea8] Allow use of system Kerberos to obtain cache location Classification: Unclassified Product: IcedTea Version: 8-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org https://bugzilla.redhat.com/show_bug.cgi?id=991170 http://icedtea.classpath.org/hg/icedtea7-forest/jdk/rev/3e4e1a4ef584 http://icedtea.classpath.org/hg/icedtea7-forest/jdk/rev/fd4289593675 -- 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/20130830/25e56f0f/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Aug 30 05:38:37 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 30 Aug 2013 12:38:37 +0000 Subject: [Bug 1537] [IcedTea8] Allow use of system Kerberos to obtain cache location In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1537 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |3.0.0pre1 -- 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/20130830/a8078599/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Aug 30 05:38:58 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 30 Aug 2013 12:38:58 +0000 Subject: [Bug 1537] [IcedTea8] Allow use of system Kerberos to obtain cache location In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1537 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |1282 -- 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/20130830/639af79c/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Aug 30 05:38:58 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 30 Aug 2013 12:38:58 +0000 Subject: [Bug 1282] [TRACKER] IcedTea 3.0.0pre1 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1282 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |1537 -- 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/20130830/70dbdc8f/attachment.html From andrew at icedtea.classpath.org Fri Aug 30 06:23:09 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 30 Aug 2013 13:23:09 +0000 Subject: /hg/icedtea7: 2 new changesets Message-ID: changeset 8a3e739706f8 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=8a3e739706f8 author: Andrew John Hughes date: Fri Aug 30 14:21:42 2013 +0100 Make logic of IT_BYTECODE7_CHECK more obvious. 2013-08-30 Andrew John Hughes * acinclude.m4: (IT_BYTECODE7_CHECK): Remove inverse logic to make things clearer. changeset 3baf4babcab2 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=3baf4babcab2 author: Andrew John Hughes date: Fri Aug 30 14:23:03 2013 +0100 Merge diffstat: ChangeLog | 27 +++++++++++++++++++++++++++ Makefile.am | 4 ++-- NEWS | 5 +++++ acinclude.m4 | 10 +++++----- 4 files changed, 39 insertions(+), 7 deletions(-) diffs (98 lines): diff -r 0a8108854365 -r 3baf4babcab2 ChangeLog --- a/ChangeLog Fri Jul 12 19:31:57 2013 +0100 +++ b/ChangeLog Fri Aug 30 14:23:03 2013 +0100 @@ -1,3 +1,30 @@ +2013-08-30 Andrew John Hughes + + * acinclude.m4: + (IT_BYTECODE7_CHECK): Remove inverse logic to + make things clearer. + +2013-08-14 Xerxes R??nby + Robert Lougher + + JamVM + - JSR 292: enable for OpenJDK 7/IcedTea 2 + - JSR 335: invokeinterface check in method resolution + - JSR 335: java.lang.invoke.MagicLambdaImpl + - JSR 292: invokedynamic is 5 bytes - non-direct interp + - JSR 292: invokedynamic is 5 bytes in length + - Minor formatting change + - Minor fixes: use perror for mmap failure + - FreeClassData: fix comment + - FreeClassData: adjust method count for Miranda methods + - JSR 335: remove GC hack + - JSR 335: implement "bridge" methods for Mirandas + - JSR 335: handle multiple defaults and conflicts + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2013-07-14 revision. + (JAMVM_SHA256SUM): Updated. + 2013-07-12 Andrew John Hughes * patches/boot/ecj-diamond.patch: diff -r 0a8108854365 -r 3baf4babcab2 Makefile.am --- a/Makefile.am Fri Jul 12 19:31:57 2013 +0100 +++ b/Makefile.am Fri Aug 30 14:23:03 2013 +0100 @@ -24,8 +24,8 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz -JAMVM_VERSION = 7c8dceb90880616b7dd670f257961a1f5f371ec3 -JAMVM_SHA256SUM = 1584d8599bfd799a71baac0694bb3ed9b9fcd14a8548234b24266571e0acfc97 +JAMVM_VERSION = 1a58072f8339270f9372c273d82a00790e04375d +JAMVM_SHA256SUM = b6dafea4924a2772877597b07a59108ac5f95d6ec85fbb0bb2ea80653cdaaaaf JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz diff -r 0a8108854365 -r 3baf4babcab2 NEWS --- a/NEWS Fri Jul 12 19:31:57 2013 +0100 +++ b/NEWS Fri Aug 30 14:23:03 2013 +0100 @@ -14,6 +14,11 @@ New in release 2.5.0 (2012-XX-XX): +* JamVM + - JSR 292: Invoke Dynamic + - JSR 335: Lambda Expressions + - FreeClassData: adjust method count for Miranda methods + New in release 2.4.1 (2013-07-05): * Security fixes diff -r 0a8108854365 -r 3baf4babcab2 acinclude.m4 --- a/acinclude.m4 Fri Jul 12 19:31:57 2013 +0100 +++ b/acinclude.m4 Fri Aug 30 14:23:03 2013 +0100 @@ -2212,7 +2212,7 @@ ]) AC_DEFUN_ONCE([IT_BYTECODE7_CHECK],[ -AC_CACHE_CHECK([if the VM lacks support for 1.7 bytecode], it_cv_bytecode7, [ +AC_CACHE_CHECK([if the VM supports 1.7 bytecode], it_cv_bytecode7, [ CLASS=Test.java BYTECODE=$(echo $CLASS|sed 's#\.java##') mkdir tmp.$$ @@ -2228,18 +2228,18 @@ EOF if $JAVAC -cp . $JAVACFLAGS -source 7 -target 7 $CLASS >&AS_MESSAGE_LOG_FD 2>&1 ; then if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1 ; then + it_cv_bytecode7=yes; + else it_cv_bytecode7=no; - else - it_cv_bytecode7=yes; fi else - it_cv_bytecode7=yes; + it_cv_bytecode7=no; fi ]) rm -f $CLASS *.class cd .. rmdir tmp.$$ -AM_CONDITIONAL([NO_BYTECODE7], test x"${it_cv_bytecode7}" = "xyes") +AM_CONDITIONAL([NO_BYTECODE7], test x"${it_cv_bytecode7}" = "xno") AC_PROVIDE([$0])dnl ]) From andrew at icedtea.classpath.org Fri Aug 30 06:34:30 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 30 Aug 2013 13:34:30 +0000 Subject: /hg/icedtea6: 2 new changesets Message-ID: changeset a1615ed5b8de in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a1615ed5b8de author: Andrew John Hughes date: Fri Aug 30 01:03:30 2013 +0100 RH991170: java does not use correct kerberos credential cache 2013-08-29 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patch. * NEWS: Mention RH991170. * patches/alternative_krb5_cache.patch: Backport from IcedTea 2.x which retrieves the Kerberos cache name using a Kerberos library call. changeset f9e660ea2227 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f9e660ea2227 author: Andrew John Hughes date: Fri Aug 30 14:34:17 2013 +0100 PR1535: Allow use of system Kerberos to obtain cache location 2013-08-30 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patch. (ICEDTEA_ENV): Set SYSTEM_KRB5, KRB5_LIBS and KRB5_CFLAGS. * acinclude.m4: (IT_CHECK_FOR_KERBEROS): Add --enable-system-kerberos option (on by default) which checks for libkrb5 and the krb5.h header. * configure.ac: Invoke IT_CHECK_FOR_KERBEROS. * patches/alternative_krb5_cache_fixup.patch: Fix previous Kerberos patch to fall back on old method of using /tmp/krb5cc_ and to allow the LDFLAGS for Kerberos to be specified. * INSTALL: Updated. * NEWS: Likewise. diffstat: ChangeLog | 27 ++ INSTALL | 5 +- Makefile.am | 11 +- NEWS | 2 + acinclude.m4 | 26 ++ configure.ac | 2 + patches/alternative_krb5_cache.patch | 332 +++++++++++++++++++++++++++++ patches/alternative_krb5_cache_fixup.patch | 128 +++++++++++ 8 files changed, 531 insertions(+), 2 deletions(-) diffs (truncated from 609 to 500 lines): diff -r b79ee332e4f6 -r f9e660ea2227 ChangeLog --- a/ChangeLog Wed Aug 28 23:12:48 2013 +0100 +++ b/ChangeLog Fri Aug 30 14:34:17 2013 +0100 @@ -1,3 +1,30 @@ +2013-08-30 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patch. + (ICEDTEA_ENV): Set SYSTEM_KRB5, KRB5_LIBS + and KRB5_CFLAGS. + * acinclude.m4: + (IT_CHECK_FOR_KERBEROS): Add --enable-system-kerberos + option (on by default) which checks for libkrb5 and + the krb5.h header. + * configure.ac: Invoke IT_CHECK_FOR_KERBEROS. + * patches/alternative_krb5_cache_fixup.patch: + Fix previous Kerberos patch to fall back on old + method of using /tmp/krb5cc_ and to allow + the LDFLAGS for Kerberos to be specified. + * INSTALL: Updated. + * NEWS: Likewise. + +2013-08-29 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patch. + * NEWS: Mention RH991170. + * patches/alternative_krb5_cache.patch: + Backport from IcedTea 2.x which retrieves the + Kerberos cache name using a Kerberos library call. + 2013-08-28 Andrew John Hughes * Makefile.am: Add new patch. diff -r b79ee332e4f6 -r f9e660ea2227 INSTALL --- a/INSTALL Wed Aug 28 23:12:48 2013 +0100 +++ b/INSTALL Fri Aug 30 14:34:17 2013 +0100 @@ -161,7 +161,6 @@ * --enable-pulse-java: Build the PulseAudio sound provider. * --disable-xrender: Don't include the XRender pipeline. -* --enable-nio2: Include the NIO2 backport. * --enable-systemtap: Include support for tracing using systemtap. * --enable-nss: Enable the NSS security provider. * --enable-cacao: Replace HotSpot with the CACAO VM. @@ -172,6 +171,10 @@ * --with-rhino: Include Javascript support using Rhino. * --with-additional-vms=vm-list: Additional VMs to build using the system described below. +* --enable-lcms2: Use LCMS 2 backport from OpenJDK 7 rather than LCMS 1. +* --enable-system-kerberos: Link against the system Kerberos library and + query it at runtime to obtain the cache location, rather than using a + hardcoded value. Testing ======= diff -r b79ee332e4f6 -r f9e660ea2227 Makefile.am --- a/Makefile.am Wed Aug 28 23:12:48 2013 +0100 +++ b/Makefile.am Fri Aug 30 14:34:17 2013 +0100 @@ -736,7 +736,9 @@ patches/hotspot/original/7197906-handle_32_bit_shifts.patch \ patches/sparc-trapsfix.patch \ patches/print_lsb_release.patch \ - patches/openjdk/6893617-cnctx_always_uses_default_orb.patch + patches/openjdk/6893617-cnctx_always_uses_default_orb.patch \ + patches/alternative_krb5_cache.patch \ + patches/alternative_krb5_cache_fixup.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ @@ -1035,6 +1037,13 @@ RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar" endif +if USE_SYSTEM_KERBEROS +ICEDTEA_ENV += \ + SYSTEM_KRB5="true" \ + KRB5_LIBS="${KRB5_LIBS}" \ + KRB5_CFLAGS="${KRB5_CFLAGS}" +endif + # OpenJDK ecj build environment. ICEDTEA_ENV_ECJ = $(ICEDTEA_ENV) \ ALT_OUTPUTDIR="$(ECJ_BUILD_OUTPUT_DIR)" \ diff -r b79ee332e4f6 -r f9e660ea2227 NEWS --- a/NEWS Wed Aug 28 23:12:48 2013 +0100 +++ b/NEWS Fri Aug 30 14:34:17 2013 +0100 @@ -25,6 +25,8 @@ - PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on armel. - PR1318: Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM. - RH902004: very bad performance with E-Porto Add-In f??r OpenOffice Writer installed (hs23 only) + - RH991170: java does not use correct kerberos credential cache + - PR1535: Allow use of system Kerberos to obtain cache location * JamVM - JSR 335: Lambda Expressions - JEP 171: Implement fence methods in sun.misc.Unsafe diff -r b79ee332e4f6 -r f9e660ea2227 acinclude.m4 --- a/acinclude.m4 Wed Aug 28 23:12:48 2013 +0100 +++ b/acinclude.m4 Fri Aug 30 14:34:17 2013 +0100 @@ -2071,3 +2071,29 @@ AM_CONDITIONAL(ENABLE_LCMS2, test x"${ENABLE_LCMS2}" = "xyes") AC_SUBST(ENABLE_LCMS2) ]) + +dnl Check for Kerberos library in order to lookup cache location at runtime. +AC_DEFUN_ONCE([IT_CHECK_FOR_KERBEROS], +[ + AC_MSG_CHECKING([whether to use the system Kerberos install]) + AC_ARG_ENABLE([system-kerberos], + [AS_HELP_STRING(--enable-system-kerberos,use the system kerberos [[default=yes]])], + [ + ENABLE_SYSTEM_KERBEROS="${enableval}" + ], + [ + ENABLE_SYSTEM_KERBEROS="yes" + ]) + AC_MSG_RESULT(${ENABLE_SYSTEM_KERBEROS}) + if test x"${ENABLE_SYSTEM_KERBEROS}" = "xyes"; then + dnl Check for krb5 header and library. + AC_CHECK_LIB([krb5], [krb5_cc_default], + , [AC_MSG_ERROR([Could not find Kerberos library; install Kerberos or build with --disable-system-kerberos to use the default cache location.])]) + AC_CHECK_HEADER([krb5.h], + , [AC_MSG_ERROR([Could not find Kerberos header; install Kerberos or build with --disable-system-kerberos to use the default cache location.])]) + KRB5_LIBS="-lkrb5" + AC_SUBST(KRB5_LIBS) + fi + AM_CONDITIONAL(USE_SYSTEM_KERBEROS, test x"${ENABLE_SYSTEM_KERBEROS}" = "xyes") + AC_SUBST(ENABLE_SYSTEM_KERBEROS) +]) diff -r b79ee332e4f6 -r f9e660ea2227 configure.ac --- a/configure.ac Wed Aug 28 23:12:48 2013 +0100 +++ b/configure.ac Fri Aug 30 14:34:17 2013 +0100 @@ -291,6 +291,8 @@ IT_ENABLE_LCMS2 +IT_CHECK_FOR_KERBEROS + dnl pkgconfig cannot be used to find these headers and libraries. AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[] ,[AC_MSG_ERROR("CUPS headers were not found - diff -r b79ee332e4f6 -r f9e660ea2227 patches/alternative_krb5_cache.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/alternative_krb5_cache.patch Fri Aug 30 14:34:17 2013 +0100 @@ -0,0 +1,332 @@ +diff -Nru openjdk.orig/jdk/make/sun/security/krb5/internal/ccache/Makefile openjdk/jdk/make/sun/security/krb5/internal/ccache/Makefile +--- openjdk.orig/jdk/make/sun/security/krb5/internal/ccache/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/make/sun/security/krb5/internal/ccache/Makefile 2013-08-29 18:23:03.264241145 +0100 +@@ -0,0 +1,48 @@ ++# ++# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved. ++# Copyright (c) 2013 Red Hat, Inc. and/or its affiliates. ++# 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. ++# ++ ++BUILDDIR = ../../../../.. ++PACKAGE = sun.security.krb5.internal.ccache ++PRODUCT = sun ++include $(BUILDDIR)/common/Defs.gmk ++ ++# ++# Java Files ++# ++AUTO_FILES_JAVA_DIRS = sun/security/krb5/internal/ccache ++ ++ifeq ($(PLATFORM), $(filter $(PLATFORM),linux solaris)) ++FILES_export = sun/security/krb5/internal/ccache/FileCredentialsCache.java ++FILES_c = krb5ccache.c ++LIBRARY = j2krb5 ++ ++vpath %.c \ ++ $(PLATFORM_SRC)/native/sun/security/krb5/internal/ccache ++ ++include $(BUILDDIR)/common/Library.gmk ++ ++OTHER_LDLIBS = $(LIBDL) $(JVMLIB) -lkrb5 ++endif # PLATFORM +diff -Nru openjdk.orig/jdk/make/sun/security/Makefile openjdk/jdk/make/sun/security/Makefile +--- openjdk.orig/jdk/make/sun/security/Makefile 2012-10-26 19:25:42.000000000 +0100 ++++ openjdk/jdk/make/sun/security/Makefile 2013-08-29 18:25:01.210077070 +0100 +@@ -1,5 +1,6 @@ + # + # Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved. ++# Copyright (c) 2013 Red Hat, Inc. and/or its affiliates. + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + # + # This code is free software; you can redistribute it and/or modify it +@@ -52,6 +53,12 @@ + endif + endif + ++# Build krb5/internal/ccache only on Linux and Solaris platforms. ++KRB5_CCACHE = ++ifeq ($(PLATFORM), $(filter $(PLATFORM),linux solaris)) ++ KRB5_CCACHE = krb5/internal/ccache ++endif ++ + # Build Microsoft CryptoAPI provider only on (non-64-bit) Windows platform. + MSCAPI = + ifeq ($(PLATFORM), windows) +@@ -61,7 +68,7 @@ + endif + + SUBDIRS = other action util tools jgss krb5 smartcardio $(PKCS11) \ +- $(JGSS_WRAPPER) $(MSCAPI) ++ $(JGSS_WRAPPER) $(MSCAPI) $(KRB5_CCACHE) + + all build clean clobber:: + $(SUBDIRS-loop) +diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java openjdk/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java +--- openjdk.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2012-10-26 19:26:06.000000000 +0100 ++++ openjdk/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2013-08-29 20:33:06.093698688 +0100 +@@ -1,5 +1,6 @@ + /* + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2013 Red Hat, Inc. and/or its affiliates. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -43,7 +44,6 @@ + import java.io.FileOutputStream; + import java.io.BufferedReader; + import java.io.InputStreamReader; +-import java.lang.reflect.*; + + /** + * CredentialsCache stores credentials(tickets, session keys, etc) in a +@@ -63,6 +63,8 @@ + private Vector credentialsList; + private static String dir; + private static boolean DEBUG = Krb5.DEBUG; ++ private static boolean alreadyLoaded = false; ++ private static boolean alreadyTried = false; + + public static synchronized FileCredentialsCache acquireInstance( + PrincipalName principal, String cache) { +@@ -356,14 +358,14 @@ + * Returns path name of the credentials cache file. + * The path name is searched in the following order: + * +- * 1. /tmp/krb5cc_ on unix systems ++ * 1. location specified by Kerberos API on unix systems + * 2. /krb5cc_ + * 3. /krb5cc (if can't get ) + */ + + public static String getDefaultCacheName() { + String stdCacheNameComponent = "krb5cc"; +- String name; ++ String name = null; + // get cache name from system.property + + String osname = +@@ -382,26 +384,46 @@ + */ + + if (osname != null) { +- String cmd = null; +- String uidStr = null; +- long uid = 0; +- + if (osname.startsWith("SunOS") || + (osname.startsWith("Linux"))) { + try { +- Class c = Class.forName +- ("com.sun.security.auth.module.UnixSystem"); +- Constructor constructor = c.getConstructor(); +- Object obj = constructor.newInstance(); +- Method method = c.getMethod("getUid"); +- uid = ((Long)method.invoke(obj)).longValue(); +- name = File.separator + "tmp" + +- File.separator + stdCacheNameComponent + "_" + uid; +- if (DEBUG) { +- System.out.println(">>>KinitOptions cache name is " + +- name); ++ // Load the native code if necessary ++ if (!alreadyTried) { ++ // See if there's any native code to load ++ try { ++ ensureLoaded(); ++ } catch (Exception e) { ++ if (DEBUG) { ++ System.out.println("Could not load native Kerberos bridge"); ++ e.printStackTrace(); ++ } ++ alreadyTried = true; ++ } ++ } ++ if (alreadyLoaded) { ++ // There is some native code ++ if (DEBUG) { ++ System.out.println(">> Look up native default credential cache"); ++ } ++ // Query the native Kerberos API for the cache location ++ name = nativeGetDefaultCacheName(); ++ } ++ ++ /* ++ * We require the default cache location to be a file name. ++ * DIR: can point to a cache collection, while DIR:: points ++ * to a specific cache file. ++ * ++ * http://k5wiki.kerberos.org/wiki?title=Projects/Client_principal_selection&oldid=4118 ++ */ ++ if (name.startsWith("FILE:") || name.startsWith("DIR::")) { ++ name = name.substring(5); ++ if (DEBUG) { ++ System.out.println(">>>KinitOptions cache name is " + ++ name); ++ } ++ return name; + } +- return name; + } catch (Exception e) { + if (DEBUG) { + System.out.println("Exception in obtaining uid " + +@@ -445,6 +467,8 @@ + + return name; + } ++ ++ private native static String nativeGetDefaultCacheName() throws Exception; + + public static String checkValidation(String name) { + String fullname = null; +@@ -526,4 +550,16 @@ + } + return null; + } ++ ++ private static void ensureLoaded() { ++ java.security.AccessController.doPrivileged( ++ new java.security.PrivilegedAction () { ++ public Void run() { ++ System.loadLibrary("j2krb5"); ++ return null; ++ } ++ }); ++ alreadyLoaded = true; ++ } ++ + } +diff -Nru openjdk.orig/jdk/src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c openjdk/jdk/src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c +--- openjdk.orig/jdk/src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c 2013-08-29 18:23:03.264241145 +0100 +@@ -0,0 +1,111 @@ ++/* ++ * Copyright (c) 2013 Red Hat Inc. and/or its affiliates. ++ * 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. ++ */ ++ ++#define _GNU_SOURCE ++ ++#include ++#include ++#include ++ ++#include "sun_security_krb5_internal_ccache_FileCredentialsCache.h" ++ ++static void handle_error(JNIEnv *env, krb5_context context, krb5_error_code err, const char *func_name); ++static jint throw_Exception(JNIEnv *env, const char *class_name, const char *message); ++ ++/* ++ * Class: sun_security_krb5_internal_ccache_FileCredentialsCache ++ * Method: nativeGetDefaultCacheName ++ * Signature: ()Ljava/lang/String; ++ */ ++JNIEXPORT jstring JNICALL Java_sun_security_krb5_internal_ccache_FileCredentialsCache_nativeGetDefaultCacheName ++(JNIEnv *env, jclass krbcredsClass) ++{ ++ krb5_context context; ++ krb5_error_code err; ++ krb5_ccache cache; ++ const char *cc_type, *cc_name; ++ char *cc_full_name; ++ jstring result; ++ ++ /* Need a krb5_context to proceed further */ ++ err = krb5_init_context(&context); ++ if (err) { ++ handle_error(env, context, err, "krb5_init_context"); ++ return NULL; ++ } ++ ++ /* Get the default credential cache. ++ * We intentionally do not use krb5_cc_default_name because when the cache ++ * is a collection, krb5_cc_default_name returns the collection directory. ++ * By using krb5_cc_default and then krb5_cc_get_name, we get the primary ++ * cache file within the collection. */ ++ err = krb5_cc_default(context, &cache); ++ if (err) { ++ handle_error(env, context, err, "krb5_cc_default"); ++ krb5_free_context(context); ++ return NULL; ++ } ++ ++ /* Get the type and name of the default cache and construct a string ++ * of the form 'type:name'. */ ++ cc_type = krb5_cc_get_type(context, cache); ++ cc_name = krb5_cc_get_name(context, cache); ++ if (asprintf(&cc_full_name, "%s:%s", cc_type, cc_name) < 0) { ++ throw_Exception(env, "java/lang/OutOfMemoryError", "Unable to construct credential cache string"); ++ krb5_free_context(context); ++ return NULL; ++ } ++ ++ result = (*env)->NewStringUTF(env, cc_full_name); ++ ++ free(cc_full_name); ++ krb5_free_context(context); ++ return result; ++} ++ ++static void handle_error(JNIEnv *env, krb5_context context, krb5_error_code err, const char *func_name) { ++ const char *err_msg; ++ char *result; ++ ++ err_msg = krb5_get_error_message(context, err); ++ if (asprintf(&result, "%s: %s", func_name, err_msg) < 0) { ++ throw_Exception(env, "java/lang/OutOfMemoryError", "Unable to construct error message"); ++ return; ++ } ++ throw_Exception(env, "java/lang/Exception", result); ++ ++ free(result); ++ krb5_free_error_message(context, err_msg); ++} ++ ++static jint throw_Exception(JNIEnv *env, const char *class_name, const char *message) { ++ jclass class; ++ ++ class = (*env)->FindClass(env, class_name); ++ if (class == NULL) { ++ return -1; ++ } ++ return (*env)->ThrowNew(env, class, message); ++} diff -r b79ee332e4f6 -r f9e660ea2227 patches/alternative_krb5_cache_fixup.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/alternative_krb5_cache_fixup.patch Fri Aug 30 14:34:17 2013 +0100 @@ -0,0 +1,128 @@ +diff -Nru openjdk.orig/jdk/make/jdk_generic_profile.sh openjdk/jdk/make/jdk_generic_profile.sh +--- openjdk.orig/jdk/make/jdk_generic_profile.sh 2013-08-30 02:41:17.276807687 +0100 ++++ openjdk/jdk/make/jdk_generic_profile.sh 2013-08-30 12:11:12.428923185 +0100 +@@ -467,5 +467,14 @@ + export LCMS_CFLAGS + export LCMS_LIBS + ++# Export variables for system krb5 ++# KRB5_CFLAGS and KRB5_LIBS tell the compiler how to compile and ++# link against Kerberos ++if [ "${KRB5_LIBS}" = "" ] ; then ++ KRB5_LIBS="-lkrb5" ++fi ++export KRB5_LIBS ++ + # IcedTea defaults; use system libraries + export USE_SYSTEM_LCMS=true ++export SYSTEM_KRB5=true +diff -Nru openjdk.orig/jdk/make/sun/security/krb5/internal/ccache/Makefile openjdk/jdk/make/sun/security/krb5/internal/ccache/Makefile From bugzilla-daemon at icedtea.classpath.org Fri Aug 30 06:34:39 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 30 Aug 2013 13:34:39 +0000 Subject: [Bug 1535] [IcedTea6] Allow use of system Kerberos to obtain cache location In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1535 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=f9e660ea2227 author: Andrew John Hughes date: Fri Aug 30 14:34:17 2013 +0100 PR1535: Allow use of system Kerberos to obtain cache location 2013-08-30 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patch. (ICEDTEA_ENV): Set SYSTEM_KRB5, KRB5_LIBS and KRB5_CFLAGS. * acinclude.m4: (IT_CHECK_FOR_KERBEROS): Add --enable-system-kerberos option (on by default) which checks for libkrb5 and the krb5.h header. * configure.ac: Invoke IT_CHECK_FOR_KERBEROS. * patches/alternative_krb5_cache_fixup.patch: Fix previous Kerberos patch to fall back on old method of using /tmp/krb5cc_ and to allow the LDFLAGS for Kerberos to be specified. * INSTALL: Updated. * NEWS: Likewise. -- 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/20130830/2345fb7c/attachment.html From andrew at icedtea.classpath.org Fri Aug 30 06:41:48 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 30 Aug 2013 13:41:48 +0000 Subject: /hg/icedtea6: Add latest tzdata updates. Message-ID: changeset 7eeaaf0ac806 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7eeaaf0ac806 author: Andrew John Hughes date: Fri Aug 30 14:41:42 2013 +0100 Add latest tzdata updates. 2013-08-29 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new timezone data patches. * patches/openjdk/8014469-tzdata2013c.patch, * patches/openjdk/8020054-tzdata2013d.patch: Latest tzdata updates. diffstat: ChangeLog | 8 + Makefile.am | 4 +- patches/openjdk/8014469-tzdata2013c.patch | 276 ++++++++++++++++++++++++++ patches/openjdk/8020054-tzdata2013d.patch | 314 ++++++++++++++++++++++++++++++ 4 files changed, 601 insertions(+), 1 deletions(-) diffs (truncated from 627 to 500 lines): diff -r f9e660ea2227 -r 7eeaaf0ac806 ChangeLog --- a/ChangeLog Fri Aug 30 14:34:17 2013 +0100 +++ b/ChangeLog Fri Aug 30 14:41:42 2013 +0100 @@ -1,3 +1,11 @@ +2013-08-29 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new timezone data patches. + * patches/openjdk/8014469-tzdata2013c.patch, + * patches/openjdk/8020054-tzdata2013d.patch: + Latest tzdata updates. + 2013-08-30 Andrew John Hughes * Makefile.am: diff -r f9e660ea2227 -r 7eeaaf0ac806 Makefile.am --- a/Makefile.am Fri Aug 30 14:34:17 2013 +0100 +++ b/Makefile.am Fri Aug 30 14:41:42 2013 +0100 @@ -738,7 +738,9 @@ patches/print_lsb_release.patch \ patches/openjdk/6893617-cnctx_always_uses_default_orb.patch \ patches/alternative_krb5_cache.patch \ - patches/alternative_krb5_cache_fixup.patch + patches/alternative_krb5_cache_fixup.patch \ + patches/openjdk/8014469-tzdata2013c.patch \ + patches/openjdk/8020054-tzdata2013d.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r f9e660ea2227 -r 7eeaaf0ac806 patches/openjdk/8014469-tzdata2013c.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/8014469-tzdata2013c.patch Fri Aug 30 14:41:42 2013 +0100 @@ -0,0 +1,276 @@ +# HG changeset patch +# User peytoia +# Date 1369892058 -32400 +# Thu May 30 14:34:18 2013 +0900 +# Node ID 1dad45fa401d88fd42b795a2bd0ca796f6842ba5 +# Parent a1ec65ac926d41ccca2545dbc3b62bb7c12282af +8014469: (tz) Support tzdata2013c +8015570: Use long comparison in Rule.getRules(). +Reviewed-by: okutsu + +diff --git a/make/sun/javazic/tzdata/VERSION b/make/sun/javazic/tzdata/VERSION +--- openjdk/jdk/make/sun/javazic/tzdata/VERSION ++++ openjdk/jdk/make/sun/javazic/tzdata/VERSION +@@ -21,4 +21,4 @@ + # or visit www.oracle.com if you need additional information or have any + # questions. + # +-tzdata2013b ++tzdata2013c +diff --git a/make/sun/javazic/tzdata/antarctica b/make/sun/javazic/tzdata/antarctica +--- openjdk/jdk/make/sun/javazic/tzdata/antarctica ++++ openjdk/jdk/make/sun/javazic/tzdata/antarctica +@@ -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 --git a/make/sun/javazic/tzdata/asia b/make/sun/javazic/tzdata/asia +--- openjdk/jdk/make/sun/javazic/tzdata/asia ++++ openjdk/jdk/make/sun/javazic/tzdata/asia +@@ -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 --git a/make/sun/javazic/tzdata/australasia b/make/sun/javazic/tzdata/australasia +--- openjdk/jdk/make/sun/javazic/tzdata/australasia ++++ openjdk/jdk/make/sun/javazic/tzdata/australasia +@@ -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 --git a/make/sun/javazic/tzdata/southamerica b/make/sun/javazic/tzdata/southamerica +--- openjdk/jdk/make/sun/javazic/tzdata/southamerica ++++ openjdk/jdk/make/sun/javazic/tzdata/southamerica +@@ -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 --git a/make/sun/javazic/tzdata/zone.tab b/make/sun/javazic/tzdata/zone.tab +--- openjdk/jdk/make/sun/javazic/tzdata/zone.tab ++++ openjdk/jdk/make/sun/javazic/tzdata/zone.tab +@@ -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 --git a/make/tools/src/build/tools/javazic/Rule.java b/make/tools/src/build/tools/javazic/Rule.java +--- openjdk/jdk/make/tools/src/build/tools/javazic/Rule.java ++++ openjdk/jdk/make/tools/src/build/tools/javazic/Rule.java +@@ -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 f9e660ea2227 -r 7eeaaf0ac806 patches/openjdk/8020054-tzdata2013d.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/8020054-tzdata2013d.patch Fri Aug 30 14:41:42 2013 +0100 @@ -0,0 +1,314 @@ +# HG changeset patch +# User igerasim +# Date 1373612209 -14400 +# Fri Jul 12 10:56:49 2013 +0400 +# Node ID dbf9b854ae55750afe3c8b3e319e3ccf5cfd2901 +# Parent 1dad45fa401d88fd42b795a2bd0ca796f6842ba5 +8020054: (tz) Support tzdata2013d +Reviewed-by: coffeys, peytoia + +diff --git a/make/sun/javazic/tzdata/VERSION b/make/sun/javazic/tzdata/VERSION +--- openjdk/jdk/make/sun/javazic/tzdata/VERSION ++++ openjdk/jdk/make/sun/javazic/tzdata/VERSION +@@ -21,4 +21,4 @@ + # or visit www.oracle.com if you need additional information or have any + # questions. + # +-tzdata2013c ++tzdata2013d +diff --git a/make/sun/javazic/tzdata/africa b/make/sun/javazic/tzdata/africa +--- openjdk/jdk/make/sun/javazic/tzdata/africa ++++ openjdk/jdk/make/sun/javazic/tzdata/africa +@@ -875,12 +875,18 @@ + # announced that year's Ramadan daylight-saving transitions would be + # 2012-07-20 and 2012-08-20; see + # . +-# ++ ++# From Andrew Paprocki (2013-07-02): ++# Morocco announced that the year's Ramadan daylight-savings ++# transitions would be 2013-07-07 and 2013-08-10; see: ++# http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10 ++ ++# From Paul Eggert (2013-07-03): + # To estimate what the Moroccan government will do in future years, +-# transition dates for 2013 through 2021 were determined by running ++# transition dates for 2014 through 2021 were determined by running + # the following program under GNU Emacs 24.3: + # +-# (let ((islamic-year 1434)) ++# (let ((islamic-year 1435)) + # (while (< islamic-year 1444) + # (let ((a + # (calendar-gregorian-from-absolute +@@ -933,8 +939,8 @@ + 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 2013 only - Jul 7 3:00 0 - ++Rule Morocco 2013 only - Aug 10 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 - +diff --git a/make/sun/javazic/tzdata/asia b/make/sun/javazic/tzdata/asia +--- openjdk/jdk/make/sun/javazic/tzdata/asia ++++ openjdk/jdk/make/sun/javazic/tzdata/asia +@@ -1235,39 +1235,21 @@ + Rule Zion 2012 only - Mar Fri>=26 2:00 1:00 D + Rule Zion 2012 only - Sep 23 2:00 0 S + +-# From Ephraim Silverberg (2012-10-18): +-# Yesterday, the Interior Ministry Committee, after more than a year +-# past, approved sending the proposed June 2011 changes to the Time +-# Decree Law back to the Knesset for second and third (final) votes +-# before the upcoming elections on Jan. 22, 2013. Hence, although the +-# changes are not yet law, they are expected to be so before February 2013. ++# From Ephraim Silverberg (2013-06-27): ++# On June 23, 2013, the Israeli government approved changes to the ++# Time Decree Law. The next day, the changes passed the First Reading ++# in the Knesset. The law is expected to pass the Second and Third ++# (final) Readings by the beginning of September 2013. + # +-# As of 2013, DST starts at 02:00 on the Friday before the last Sunday in March. +-# DST ends at 02:00 on the first Sunday after October 1, unless it occurs on the +-# second day of the Jewish Rosh Hashana holiday, in which case DST ends a day +-# later (i.e. at 02:00 the first Monday after October 2). +-# [Rosh Hashana holidays are factored in until 2100.] +- +-# From Ephraim Silverberg (2012-11-05): +-# The Knesset passed today (in second and final readings) the amendment to the +-# Time Decree Law making the changes ... law. ++# As of 2013, DST starts at 02:00 on the Friday before the last Sunday ++# in March. DST ends at 02:00 on the last Sunday of October. + + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S + Rule Zion 2013 max - Mar Fri>=23 2:00 1:00 D +-Rule Zion 2013 2026 - Oct Sun>=2 2:00 0 S +-Rule Zion 2027 only - Oct Mon>=3 2:00 0 S +-Rule Zion 2028 max - Oct Sun>=2 2:00 0 S +-# The following rules are commented out for now, as they break older +-# versions of zic that support only signed 32-bit timestamps, i.e., +-# through 2038-01-19 03:14:07 UTC. +-#Rule Zion 2028 2053 - Oct Sun>=2 2:00 0 S +-#Rule Zion 2054 only - Oct Mon>=3 2:00 0 S +-#Rule Zion 2055 2080 - Oct Sun>=2 2:00 0 S +-#Rule Zion 2081 only - Oct Mon>=3 2:00 0 S +-#Rule Zion 2082 max - Oct Sun>=2 2:00 0 S ++Rule Zion 2013 max - Oct lastSun 2:00 0 S + + # Zone NAME GMTOFF RULES FORMAT [UNTIL] +-Zone Asia/Jerusalem 2:20:56 - LMT 1880 ++Zone Asia/Jerusalem 2:20:54 - LMT 1880 + 2:20:40 - JMT 1918 # Jerusalem Mean Time? + 2:00 Zion I%sT + +@@ -2570,8 +2552,8 @@ + Rule Syria 2007 only - Mar lastFri 0:00 1:00 S + # From Jesper Norgard (2007-10-27): + # The sister center ICARDA of my work CIMMYT is confirming that Syria DST will +-# not take place 1.st November at 0:00 o'clock but 1.st November at 24:00 or +-# rather Midnight between Thursday and Friday. This does make more sence than ++# not take place 1st November at 0:00 o'clock but 1st November at 24:00 or ++# rather Midnight between Thursday and Friday. This does make more sense than + # having it between Wednesday and Thursday (two workdays in Syria) since the + # weekend in Syria is not Saturday and Sunday, but Friday and Saturday. So now + # it is implemented at midnight of the last workday before weekend... +diff --git a/make/sun/javazic/tzdata/australasia b/make/sun/javazic/tzdata/australasia +--- openjdk/jdk/make/sun/javazic/tzdata/australasia ++++ openjdk/jdk/make/sun/javazic/tzdata/australasia +@@ -253,10 +253,16 @@ + # - 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. ++# ++# From Arthur David Olson (2013-05-23): ++# The 1919 transition is overspecified below so pre-2013 zics ++# will produce a binary file with an EST-type as the first 32-bit type; ++# this is required for correct handling of times before 1916 by ++# pre-2013 versions of localtime. + 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 ++ 10:00 Aus EST 1919 Apr 1 0:00s + 0 - zzz 1948 Mar 25 + 10:00 Aus EST 1967 + 10:00 AT EST 2010 Apr 4 3:00 +@@ -1498,12 +1504,12 @@ + # From Paul Eggert (2000-01-08): + # IATA SSIM (1999-09) says DST ends 0100 local time. Go with McDow. + +-# From the BBC World Service (1998-10-31 11:32 UTC): ++# From the BBC World Service in ++# http://news.bbc.co.uk/2/hi/asia-pacific/205226.stm (1998-10-31 16:03 UTC): + # The Fijiian government says the main reasons for the time change is to +-# improve productivity and reduce road accidents. But correspondents say it +-# also hopes the move will boost Fiji's ability to compete with other pacific +-# islands in the effort to attract tourists to witness the dawning of the new +-# millenium. ++# improve productivity and reduce road accidents.... [T]he move is also ++# intended to boost Fiji's ability to attract tourists to witness the dawning ++# of the new millennium. + + # http://www.fiji.gov.fj/press/2000_09/2000_09_13-05.shtml (2000-09-13) + # reports that Fiji has discontinued DST. +@@ -1648,7 +1654,7 @@ + # Shanks & Pottenger say the transition was on 1968-10-01; go with Mundell. + + # From Eric Ulevik (1999-05-03): +-# Tonga's director of tourism, who is also secretary of the National Millenium ++# Tonga's director of tourism, who is also secretary of the National Millennium + # Committee, has a plan to get Tonga back in front. + # He has proposed a one-off move to tropical daylight saving for Tonga from + # October to March, which has won approval in principle from the Tongan +diff --git a/make/sun/javazic/tzdata/europe b/make/sun/javazic/tzdata/europe +--- openjdk/jdk/make/sun/javazic/tzdata/europe ++++ openjdk/jdk/make/sun/javazic/tzdata/europe +@@ -546,7 +546,7 @@ + # It seems that Paris, Monaco, Rule France, Rule Belgium all agree on + # 2:00 standard time, e.g. 3:00 local time. However there are no + # countries that use C-Eur rules in September 1945, so the only items +-# affected are apparently these ficticious zones that translates acronyms ++# affected are apparently these fictitious zones that translate acronyms + # CET and MET: + # + # Zone CET 1:00 C-Eur CE%sT +@@ -2802,9 +2802,9 @@ + + # Ukraine + # +-# From Igor Karpov, who works for the Ukranian Ministry of Justice, ++# From Igor Karpov, who works for the Ukrainian Ministry of Justice, + # via Garrett Wollman (2003-01-27): +-# BTW, I've found the official document on this matter. It's goverment ++# BTW, I've found the official document on this matter. It's government + # regulations number 509, May 13, 1996. In my poor translation it says: From bugzilla-daemon at icedtea.classpath.org Fri Aug 30 06:42:13 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 30 Aug 2013 13:42:13 +0000 Subject: [Bug 1535] [IcedTea6] Allow use of system Kerberos to obtain cache location In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1535 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/20130830/354626df/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Aug 30 06:42:13 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 30 Aug 2013 13:42:13 +0000 Subject: [Bug 1272] [TRACKER] IcedTea6 1.13 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1272 Bug 1272 depends on bug 1535, which changed state. Bug 1535 Summary: [IcedTea6] Allow use of system Kerberos to obtain cache location http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1535 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/20130830/d10ba85b/attachment.html From andrew at icedtea.classpath.org Fri Aug 30 06:55:00 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 30 Aug 2013 13:55:00 +0000 Subject: /hg/icedtea7: Fix default setting of --disable-bootstrap-tools f... Message-ID: changeset d0908d45075a in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=d0908d45075a author: Andrew John Hughes date: Fri Aug 30 14:54:54 2013 +0100 Fix default setting of --disable-bootstrap-tools following fix to IT_BYTECODE7_CHECK. 2013-08-30 Andrew John Hughes * acinclude.m4: (IT_USE_BOOTSTRAP_TOOLS): Fix default following change to IT_BYTECODE7_CHECK. diffstat: ChangeLog | 6 ++++++ acinclude.m4 | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diffs (28 lines): diff -r 3baf4babcab2 -r d0908d45075a ChangeLog --- a/ChangeLog Fri Aug 30 14:23:03 2013 +0100 +++ b/ChangeLog Fri Aug 30 14:54:54 2013 +0100 @@ -1,3 +1,9 @@ +2013-08-30 Andrew John Hughes + + * acinclude.m4: + (IT_USE_BOOTSTRAP_TOOLS): Fix default following + change to IT_BYTECODE7_CHECK. + 2013-08-30 Andrew John Hughes * acinclude.m4: diff -r 3baf4babcab2 -r d0908d45075a acinclude.m4 --- a/acinclude.m4 Fri Aug 30 14:23:03 2013 +0100 +++ b/acinclude.m4 Fri Aug 30 14:54:54 2013 +0100 @@ -2510,9 +2510,9 @@ ], [ if test "x${it_cv_bytecode7}" = "xyes"; then + disable_bootstrap_tools=no; + else disable_bootstrap_tools=yes; - else - disable_bootstrap_tools=no; fi ]) AC_MSG_RESULT([$disable_bootstrap_tools]) From alex.kasko.lists at gmail.com Fri Aug 30 07:12:45 2013 From: alex.kasko.lists at gmail.com (Alex Kasko) Date: Fri, 30 Aug 2013 18:12:45 +0400 Subject: [rfc][icedtea7] patch for macosx build In-Reply-To: <1067337143.4212683.1377811268336.JavaMail.root@redhat.com> References: <52080477.1080102@gmail.com> <848108177.3113403.1377710865539.JavaMail.root@redhat.com> <521F82F0.60500@gmail.com> <1067337143.4212683.1377811268336.JavaMail.root@redhat.com> Message-ID: <5220A85D.2080904@gmail.com> On 08/30/2013 01:21 AM, Andrew Hughes wrote: > > > ----- Original Message ----- >> On 08/28/2013 09:27 PM, Andrew Hughes wrote: >>> ----- Original Message ----- >>>> Hi, >>>> >>>> I've built icedtea7 head (hg:0a8108854365) for macosx x86_64 and want to >>>> publish patch for possible upstreaming. >>>> >>>> I've used the same sources, as in windows build - obtained from >>>> "icedtea7/openjdk" directory by running: >>>> >>>> ./configure \ >>>> --disable-system-zlib \ >>>> --disable-system-jpeg \ >>>> --disable-system-png \ >>>> --disable-system-gif \ >>>> --disable-system-lcms \ >>>> --disable-compile-against-syscalls \ >>>> --disable-nss >>>> >>>> and "make" on debian wheezy. >>>> >>>> Then built these sources on macosx 10.7.5 with xcode 4.3.2 (gcc 4.2.1) >>>> as a separate openjdk build (without icedtea infrastructure) using >>>> additional environment >>>> variables: >>>> >>>> export FT2_CFLAGS='-I$(FREETYPE_HEADERS_PATH) >>>> -I$(FREETYPE_HEADERS_PATH)/freetype2' >>>> export DISABLE_INTREE_EC=true >>>> >>>> Patch was created against icedtea7-forest/jdk (hg:afaedb56b499): >>>> >>>> 2013-08-11 Alex Kasko >>>> >>>> *make/java/nio/Makefile: >>>> add "syscalls_fp.c" to compilation list in macosx specific section >>>> *make/sun/lwawt/FILES_c_macosx.gmk: >>>> add "cups_fp.c" to compilation list >>>> *make/sun/lwawt/Makefile: >>>> add "solaris/native/common/deps" directory to headers search list, and >>>> to vpath (not sure whether vpath is necessary here) >>>> >>>> >>>> -- >>>> Regards, >>>> Alex Kasko >>>> >>> >>> Why didn't you just use IcedTea in full? I can understand the problems on >>> Windows >>> but OS X is UNIX-like. >> I tried to configure IcedTea on mac, but gave up. >> >> With configure script generated by autotools from macports (automake >> 1.14) I've got: >> >> ./configure: line 8675: syntax error near unexpected token `NSS,' >> ./configure: line 8675: `PKG_CHECK_MODULES(NSS, nss, NSS_FOUND=yes, >> NSS_FOUND=no)' >> > > This means it can't find the definition of the PKG_CHECK_MODULES macro > which is in /usr/share/aclocal/pkg.m4 on GNU/Linux boxes and is part > of pkgconfig. > > You shouldn't need to generate configure at all if you use a release > tarball. What exactly are you building? It's icedtea7 hg:0a8108854365, the same version I prepared patch against. > >> With configure script generated in linux (automake 1.11.6) I've got: >> >> checking for XPROTO... no >> configure: error: Could not find Xproto headers - Try installing >> xorg-x11-proto-devel >> >> I have Xproto.h and other headers in /usr/include/X11 . I tried to >> install x11-xproto from macports with the same results. I have a shallow >> knowledge in autotools, any suggestions about these issues are appreciated. >> > > I feel the message may be sending you on a wild goose chase. The first thing > with configure scripts is always to check config.log to see the actual failing > output (at least for good autoconf macros which log the output). I suspect this > is related to pkgconfig again, and it's not a lack of the header but an inability > to query pkgconfig for whether or not Xproto is installed. > > configure:12966: checking for XPROTO > configure:12973: $PKG_CONFIG --exists --print-errors "xproto" > configure:12976: $? = 0 > configure:12990: $PKG_CONFIG --exists --print-errors "xproto" > configure:12993: $? = 0 > configure:13031: result: yes Yes both of the issues were pkgconfig related. Solved them by installing pkgconfig port and adding xproto.pc to pkgconfig path. Configure script (generated on mac) runs fine, but make fails with patch error on "patches/boot/javafiles.patch". The same version with the same configure options works on linux. I'll postpone the investigation for later. > >>> >>> I haven't looked at the changes in full but I have a feeling they are more >>> due to >>> misconfiguration arising from this than something that would be generally >>> useful. >> I think it's better to compare patched sources configured on linux and >> mac, but haven't succeeded in this yet. >> >> BTW, changes in a patch are similar to this change - >> http://hg.openjdk.java.net/icedtea/jdk7/jdk/diff/005c45393f0d/make/sun/xawt/FILES_c_unix.gmk >> >> only for mac specific makefiles. >> > > Yeah I should have read the patch :) > > The two changes to Mac OS X makefiles are obvious and the changes don't exist there > simply because those makefiles didn't exist when the original CUPS changes were made. > > Likewise, the java/nio/Makefile code is needed because the same code, while already present, > is in a Linux-specific block. Again, the Mac OS X block wouldn't have been present when this > was added and it's hard to determine if it's needed without testing on that platform. > > Looking at this again, UnixDispatcher requires it so it should actually be moved to the !windows block. > > Thanks a lot for all this testing. It is much appreciated. > >> >> -- >> Regards, >> Alex Kasko >> > -- Regards, Alex Kasko From omajid at redhat.com Fri Aug 30 07:46:01 2013 From: omajid at redhat.com (Omair Majid) Date: Fri, 30 Aug 2013 10:46:01 -0400 Subject: [icedtea-web] RFC: Test case for PR1533 In-Reply-To: <52205EBF.4060000@redhat.com> References: <521FE921.9030809@redhat.com> <52205EBF.4060000@redhat.com> Message-ID: <5220B029.2040906@redhat.com> On 08/30/2013 04:58 AM, Jiri Vanek wrote: > On 08/30/2013 02:36 AM, Omair Majid wrote: >> PR1533 says that resources are not filtered and combined as needed. I >> wrote up a unit test to check that. Unexpectedly, the test passes. I >> asked the reporter for more information, but the test seems good enough >> on it's own. Okay to push? > > Looks ok to me. Are you going to do any more about this bug? I am hoping to hear back from the reporter before I do much else. 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 Fri Aug 30 08:04:35 2013 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Fri, 30 Aug 2013 15:04:35 +0000 Subject: /hg/icedtea-web: 2 new changesets Message-ID: changeset 5e59e92d16ed in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=5e59e92d16ed author: Omair Majid date: Fri Aug 30 10:56:59 2013 -0400 PR1058: XFileOpenService openMultiFileDialog ClassCastException Instead of trying to create a privileged proxy for the FileContents[] array, simply create a privileged proxy for each FileContents instance and return an array of them. 2013-08-29 Omair Majid PR1058 * netx/net/sourceforge/jnlp/services/XFileOpenService.java (openMultiFileDialog): Create a privileged proxy for each FileContents instance and return an array of them. changeset 79bdc074df81 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=79bdc074df81 author: Omair Majid date: Fri Aug 30 11:02:08 2013 -0400 Test case for PR1533 Add a unit test that checks the behaviour of JNLPFile when combining and filtering properties. 2013-08-29 Omair Majid * tests/netx/unit/net/sourceforge/jnlp/JNLPFileTest.java (testPropertyRestrictions): New method. Check that properties in resources are are combined and filtered as approp diffstat: ChangeLog | 13 +++ netx/net/sourceforge/jnlp/services/XFileOpenService.java | 11 +- tests/netx/unit/net/sourceforge/jnlp/JNLPFileTest.java | 60 ++++++++++++++++ 3 files changed, 79 insertions(+), 5 deletions(-) diffs (116 lines): diff -r 420d72e5cee7 -r 79bdc074df81 ChangeLog --- a/ChangeLog Tue Aug 27 16:53:30 2013 -0400 +++ b/ChangeLog Fri Aug 30 11:02:08 2013 -0400 @@ -1,3 +1,16 @@ +2013-08-29 Omair Majid + + * tests/netx/unit/net/sourceforge/jnlp/JNLPFileTest.java + (testPropertyRestrictions): New method. Check that properties in + resources are are combined and filtered as appropriate. + +2013-08-29 Omair Majid + + PR1058 + * netx/net/sourceforge/jnlp/services/XFileOpenService.java + (openMultiFileDialog): Create a privileged proxy for each FileContents + instance and return an array of them. + 2013-08-27 Adam Domurad Do not wait for applet initialization when binding Java applets for NPAPI. diff -r 420d72e5cee7 -r 79bdc074df81 netx/net/sourceforge/jnlp/services/XFileOpenService.java --- a/netx/net/sourceforge/jnlp/services/XFileOpenService.java Tue Aug 27 16:53:30 2013 -0400 +++ b/netx/net/sourceforge/jnlp/services/XFileOpenService.java Fri Aug 30 11:02:08 2013 -0400 @@ -91,11 +91,12 @@ if (chosen == JFileChooser.APPROVE_OPTION) { File[] files = chooser.getSelectedFiles(); int length = files.length; - XFileContents[] xfiles = new XFileContents[length]; - for (int i = 0; i < length; i++) - xfiles[i] = new XFileContents(files[i]); - return (FileContents[]) ServiceUtil.createPrivilegedProxy( - FileContents.class, xfiles); + FileContents[] result = new FileContents[length]; + for (int i = 0; i < length; i++) { + XFileContents xfile = new XFileContents(files[i]); + result[i] = (FileContents) ServiceUtil.createPrivilegedProxy(FileContents.class, xfile); + } + return result; } else { return null; } diff -r 420d72e5cee7 -r 79bdc074df81 tests/netx/unit/net/sourceforge/jnlp/JNLPFileTest.java --- a/tests/netx/unit/net/sourceforge/jnlp/JNLPFileTest.java Tue Aug 27 16:53:30 2013 -0400 +++ b/tests/netx/unit/net/sourceforge/jnlp/JNLPFileTest.java Fri Aug 30 11:02:08 2013 -0400 @@ -42,6 +42,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Locale; +import java.util.Map; import net.sourceforge.jnlp.JNLPFile.Match; import net.sourceforge.jnlp.mock.MockJNLPFile; @@ -148,4 +149,63 @@ Assert.assertEquals("Sample Test", jnlpFile.getTitle()); Assert.assertEquals(2, jnlpFile.getResources().getJARs().length); } + + @Test + public void testPropertyRestrictions() throws MalformedURLException, ParseException { + String jnlpContents = "\n" + + "\n" + + " \n" + + " Parsing Test\n" + + " IcedTea\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " " + + " \n" + + " \n" + + " " + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + ""; + + URL codeBase = new URL("http://www.redhat.com/"); + InputStream is = new ByteArrayInputStream(jnlpContents.getBytes()); + JNLPFile jnlpFile = new JNLPFile(is, codeBase, new ParserSettings(false,false,false)); + + ResourcesDesc resources; + Map properties; + + resources = jnlpFile.getResources(Locale.getDefault(), "os0", "arch0"); + properties = resources.getPropertiesMap(); + Assert.assertEquals("general", properties.get("general")); + Assert.assertEquals("general", properties.get("os")); + Assert.assertEquals("general", properties.get("arch")); + + resources = jnlpFile.getResources(Locale.getDefault(), "os1", "arch0"); + properties = resources.getPropertiesMap(); + Assert.assertEquals("general", properties.get("general")); + Assert.assertEquals("os1", properties.get("os")); + Assert.assertEquals("general", properties.get("arch")); + + resources = jnlpFile.getResources(Locale.getDefault(), "os1", "arch1"); + properties = resources.getPropertiesMap(); + Assert.assertEquals("general", properties.get("general")); + Assert.assertEquals("os1", properties.get("os")); + Assert.assertEquals("arch1", properties.get("arch")); + + resources = jnlpFile.getResources(Locale.getDefault(), "os2", "arch2"); + properties = resources.getPropertiesMap(); + Assert.assertEquals("general", properties.get("general")); + Assert.assertEquals("os2", properties.get("os")); + Assert.assertEquals("arch2", properties.get("arch")); + } } From bugzilla-daemon at icedtea.classpath.org Fri Aug 30 08:04:51 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 30 Aug 2013 15:04:51 +0000 Subject: [Bug 1058] XFileOpenService openMultiFileDialog ClassCastException, FileContents[] instead of FileContents In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1058 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea-web?cmd=changeset;node=5e59e92d16ed author: Omair Majid date: Fri Aug 30 10:56:59 2013 -0400 PR1058: XFileOpenService openMultiFileDialog ClassCastException Instead of trying to create a privileged proxy for the FileContents[] array, simply create a privileged proxy for each FileContents instance and return an array of them. 2013-08-29 Omair Majid PR1058 * netx/net/sourceforge/jnlp/services/XFileOpenService.java (openMultiFileDialog): Create a privileged proxy for each FileContents instance and return an array of them. -- 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/20130830/7d7dc574/attachment.html From bugzilla-daemon at icedtea.classpath.org Fri Aug 30 08:04:57 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 30 Aug 2013 15:04:57 +0000 Subject: [Bug 1533] Wrong handling of in jnlp In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1533 --- Comment #7 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea-web?cmd=changeset;node=79bdc074df81 author: Omair Majid date: Fri Aug 30 11:02:08 2013 -0400 Test case for PR1533 Add a unit test that checks the behaviour of JNLPFile when combining and filtering properties. 2013-08-29 Omair Majid * tests/netx/unit/net/sourceforge/jnlp/JNLPFileTest.java (testPropertyRestrictions): New method. Check that properties in resources are are combined and filtered as approp -- 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/20130830/dd0a9ac0/attachment.html From aazores at redhat.com Fri Aug 30 08:20:29 2013 From: aazores at redhat.com (Andrew Azores) Date: Fri, 30 Aug 2013 11:20:29 -0400 Subject: [rfc][icedtea-web] Fix CacheReproducerTest In-Reply-To: <201308301106.r7UB6LlE032185@mail-web03.excite.co.jp> References: <201308301106.r7UB6LlE032185@mail-web03.excite.co.jp> Message-ID: <5220B83D.8030606@redhat.com> On 08/30/13 07:06, Jacob Wisor wrote: > Even at the risk this may be perceived as nagging, but you may want to consider replacing those "/" String literals with File.separator, especially in places where the string concatinations are derived from system properties. It is probably no problem to pass slashes ( / ), backslashes ( \ ), or any other system specific file separator to File's constuctors or objects because File converts any paramters into URLs internally anyway. But when manipulating or comparing raw strings one may get undefined or different results. Or, one should make sure to use URLs only and stick to those when manipulating or comparing strings. Mm yea, this makes sense I suppose. Hopefully it shouldn't affect anything to be using the '/' char like you said, but, better safe than sorry. > Another thing that perhaps should be considered are systems that do not - for what ever reason - implement the XDG specification. What should be IcedTea-Web's expected behavior in this case? Should it simply force XDG onto that system or should it rather fall back to the previously employed simple scheme (System.getProperty("user.home") + File.separator + ".icedtea")? > > Regards, > Jacob (changed font formatting of this mail because it came out looking, frankly, atrocious in Thunderbird on my end. There was also some strange extra email address added to the Cc when I hit reply-all. Please find a better mail client, Jacob...) I don't know honestly, I didn't do the thinking behind the XDG-spec patch :). In any case if you're worried about that behaviour, this reproducer test is not really the place to be fixing it. I think this reproducer should really just be looking for the cache where it's been specified by the user, or in the default location if the user hasn't changed that, and not worrying about whether or not that cache location is XDG-spec compliant or not. On that note - Jiri, wouldn't using the value from Defaults not take into account the user changing the cache location using itweb-settings? Perhaps it makes more sense to use DeploymentConfiguration here to ensure that the reproducer test is actually testing using the cache dir that the user expects to use as a cache dir? This way if you've never changed the cache location in itweb-settings then you get the same path as taking it from Defaults would give you, but it does still also respect if you've changed the cache location. Thanks, -- Andrew A -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130830/7c653d9a/attachment.html From omajid at redhat.com Fri Aug 30 08:32:05 2013 From: omajid at redhat.com (Omair Majid) Date: Fri, 30 Aug 2013 11:32:05 -0400 Subject: [rfc][icedtea-web] Fix CacheReproducerTest In-Reply-To: <5220B83D.8030606@redhat.com> References: <201308301106.r7UB6LlE032185@mail-web03.excite.co.jp> <5220B83D.8030606@redhat.com> Message-ID: <5220BAF5.6080209@redhat.com> On 08/30/2013 11:20 AM, Andrew Azores wrote: > On that note - Jiri, wouldn't using the value from Defaults not take > into account the user changing the cache location using itweb-settings? > Perhaps it makes more sense to use DeploymentConfiguration here to > ensure that the reproducer test is actually testing using the cache dir > that the user expects to use as a cache dir? This way if you've never > changed the cache location in itweb-settings then you get the same path > as taking it from Defaults would give you, but it does still also > respect if you've changed the cache location. This is sort of hand-wavy, but it might be a good idea to keep reproducers predictable. When the reproducers are run, they should use a 'known' configuration and check for exact paths. A mistake in code (a typo in one of the configuration defaults, for example) should be detected by the reproducers. Allowing a user's configuration to affect the test would surely make things much less predictable - the opposite of what you want in a good automated test. Thanks, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From aazores at redhat.com Fri Aug 30 10:31:23 2013 From: aazores at redhat.com (Andrew Azores) Date: Fri, 30 Aug 2013 13:31:23 -0400 Subject: [rfc][icedtea-web] Fix CacheReproducerTest In-Reply-To: <5220BAF5.6080209@redhat.com> References: <201308301106.r7UB6LlE032185@mail-web03.excite.co.jp> <5220B83D.8030606@redhat.com> <5220BAF5.6080209@redhat.com> Message-ID: <5220D6EB.1060503@redhat.com> On 08/30/2013 11:32 AM, Omair Majid wrote: > On 08/30/2013 11:20 AM, Andrew Azores wrote: >> On that note - Jiri, wouldn't using the value from Defaults not take >> into account the user changing the cache location using itweb-settings? >> Perhaps it makes more sense to use DeploymentConfiguration here to >> ensure that the reproducer test is actually testing using the cache dir >> that the user expects to use as a cache dir? This way if you've never >> changed the cache location in itweb-settings then you get the same path >> as taking it from Defaults would give you, but it does still also >> respect if you've changed the cache location. > This is sort of hand-wavy, but it might be a good idea to keep > reproducers predictable. When the reproducers are run, they should use a > 'known' configuration and check for exact paths. A mistake in code (a > typo in one of the configuration defaults, for example) should be > detected by the reproducers. > > Allowing a user's configuration to affect the test would surely make > things much less predictable - the opposite of what you want in a good > automated test. > > Thanks, > Omair The problem is that as the test is now, it relies on the user leaving the cache location as default. If you use the default location, which it is set up to expect, then it works. But if you change the cache location with itweb-settings, then the reproducer tests all fail due to the cache location not existing. I can: (1) modify the reproducer to create the default cache location if it doesn't exist and then use it, or (2) have the reproducer use the DeploymentConfiguration-specified location whether or not that happens to be default, or (3) allow the reproducer to fail if you are not using the default cache location. I don't think it makes sense to choose (3), which is the current state of the reproducer, so the choice is really between (1) and (2). I see what you mean about having much more rigidly defined paths in the test for predictability, ie choosing option (1), but I think it also makes sense to use the configured cache path settings, ie option (2). If we take the second option then this test also catches whether or not the DeploymentConfiguration settings are actually being modified by the itweb-settings GUI. On the other hand, option (1) will tell you simply whether the caching mechanism is working correctly, regardless of if your particular cache configuration (ie cache location) works or not. Option (2) can emulate option (1) if you just set the cache location to default in itweb-settings. Speaking of which, perhaps there should be a way within that GUI to reset the cache location to default? -- Andrew A From omajid at redhat.com Fri Aug 30 12:37:14 2013 From: omajid at redhat.com (Omair Majid) Date: Fri, 30 Aug 2013 15:37:14 -0400 Subject: [rfc][icedtea-web] Fix CacheReproducerTest In-Reply-To: <5220D6EB.1060503@redhat.com> References: <201308301106.r7UB6LlE032185@mail-web03.excite.co.jp> <5220B83D.8030606@redhat.com> <5220BAF5.6080209@redhat.com> <5220D6EB.1060503@redhat.com> Message-ID: <5220F46A.6060104@redhat.com> On 08/30/2013 01:31 PM, Andrew Azores wrote: > On 08/30/2013 11:32 AM, Omair Majid wrote: >> Allowing a user's configuration to affect the test would surely make >> things much less predictable - the opposite of what you want in a good >> automated test. > > The problem is that as the test is now, it relies on the user leaving > the cache location as default. If you use the default location, which it > is set up to expect, then it works. But if you change the cache location > with itweb-settings, then the reproducer tests all fail due to the cache > location not existing. I can: (1) modify the reproducer to create the > default cache location if it doesn't exist and then use it, or (2) have > the reproducer use the DeploymentConfiguration-specified location > whether or not that happens to be default, or (3) allow the reproducer > to fail if you are not using the default cache location. > > I don't think it makes sense to choose (3), which is the current state > of the reproducer, so the choice is really between (1) and (2). I see > what you mean about having much more rigidly defined paths in the test > for predictability, ie choosing option (1), but I think it also makes > sense to use the configured cache path settings, ie option (2). Can you explain how it makes sense? The reason I prefer (1) is that it isolates what's under test from random changes outside the environment. And that makes tests predictable and reduces false positives. The more moving parts a test has, the harder it is to know if a failure is really meaningful or a random failure. Not to mention that you really want to hardcode many paths in your tests - just to be able to catch typos in things like DeploymentConfiguration. Also, if we can set up and use separate configuration files for tests, that makes it much easier to test the impact of configuration changes (as well as test, say, things like configuration migration) safely. > If we > take the second option then this test also catches whether or not the > DeploymentConfiguration settings are actually being modified by the > itweb-settings GUI. I thought the patch was for javaws? What you are suggesting sounds like a separate test - for itweb-settings. And that would be nice to have too, but as a separate test. If you mix it in this test, it's much harder to identify from a test failure if it's caused by itweb-settings or javaws. > On the other hand, option (1) will tell you simply > whether the caching mechanism is working correctly, regardless of if > your particular cache configuration (ie cache location) works or not. > Option (2) can emulate option (1) if you just set the cache location to > default in itweb-settings. In the short-term, 2 sounds okay to me. But I don't think it's the best option long-term. > Speaking of which, perhaps there should be a > way within that GUI to reset the cache location to default? Some way to reset things to defaults using itweb-settings sounds nice to me (not sure how urgent/important it is, though). Thanks, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From gitne at excite.co.jp Fri Aug 30 15:06:40 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Sat, 31 Aug 2013 07:06:40 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtyZmNdW2ljZWR0ZWEtd2ViXSBGaXggQ2FjaGVSZXByb2R1Y2VyVGVzdA==?= Message-ID: <201308302206.r7UM6e2T029643@mail-web03.excite.co.jp> Hello, if I may way in here... "Andrew Azores" wrote: > On 08/30/2013 11:32 AM, Omair Majid wrote: > > On 08/30/2013 11:20 AM, Andrew Azores wrote: > >> On that note - Jiri, wouldn't using the value from Defaults not take > >> into account the user changing the cache location using itweb-settings? > >> Perhaps it makes more sense to use DeploymentConfiguration here to > >> ensure that the reproducer test is actually testing using the cache dir > >> that the user expects to use as a cache dir? This way if you've never > >> changed the cache location in itweb-settings then you get the same path > >> as taking it from Defaults would give you, but it does still also > >> respect if you've changed the cache location. > > This is sort of hand-wavy, but it might be a good idea to keep > > reproducers predictable. When the reproducers are run, they should use a > > 'known' configuration and check for exact paths. I always assumed reproducers to be unpredictable on any random system by definition? I may be wrong here, but in my understanding a reproducer is not a general test, it is a special case or kind of test. A reproducer tests for or against a specific configuration and/or specific system and hence is allowed to fail on some systems. Imho a reproducer should not cover default configuration tests. It just gives a hint on what to fix to make an application or program work on a specific system or with a specific configuration. That said, a reproducer's results are per se unpredictable by definition. They are of course predictable with a specific configuration and/or on a specific system. Consequently imho testing for the default configuration should be put into a general test that must succeed on any system. Any specific configuration tests should be put into a reproducer that is allowed to fail on some systems (until the app/program has been adapted). > >A mistake in code (a > > typo in one of the configuration defaults, for example) should be > > detected by the reproducers. > > > > Allowing a user's configuration to affect the test would surely make > > things much less predictable - the opposite of what you want in a good > > automated test. > > > > Thanks, > > Omair > The problem is that as the test is now, it relies on the user leaving > the cache location as default. If you use the default location, which it > is set up to expect, then it works. But if you change the cache location > with itweb-settings, then the reproducer tests all fail due to the cache > location not existing. I can: (1) modify the reproducer to create the > default cache location if it doesn't exist and then use it, or (2) have > the reproducer use the DeploymentConfiguration-specified location > whether or not that happens to be default, or (3) allow the reproducer > to fail if you are not using the default cache location. > > I don't think it makes sense to choose (3), which is the current state > of the reproducer, so the choice is really between (1) and (2). I see > what you mean about having much more rigidly defined paths in the test > for predictability, ie choosing option (1), but I think it also makes > sense to use the configured cache path settings, ie option (2). If we > take the second option then this test also catches whether or not the > DeploymentConfiguration settings are actually being modified by the > itweb-settings GUI. On the other hand, option (1) will tell you simply > whether the caching mechanism is working correctly, regardless of if > your particular cache configuration (ie cache location) works or not. > Option (2) can emulate option (1) if you just set the cache location to > default in itweb-settings. Speaking of which, perhaps there should be a > way within that GUI to reset the cache location to default? Then the question is, what is the default? The default seems to be somewhat dynamic, that is system dependent, maybe even configuration dependent. But for the sake of simplicity, let's assume DeploymentConfiguration can provide a default configuration. I do not see anything speaking against a "reset to default" button, but I also do not see any real reason for it. (1) does not seem to make sense because it actually should have been covered by a test. (2) Seems to make sense only if a non-default configuration has been already created (and it _must_ have been created). Perhaps creating some randomly generated configurations or special cases, like folder names with known invalid characters on some file systems, or embarrassingly long file and folder names would add any value? Sorry, but (3) does not make sense at all because it effectively does not test anything except for "not having the default configuration". Regards, Jacob From omajid at redhat.com Fri Aug 30 15:16:48 2013 From: omajid at redhat.com (Omair Majid) Date: Fri, 30 Aug 2013 18:16:48 -0400 Subject: [rfc][icedtea-web] Fix CacheReproducerTest In-Reply-To: <201308302206.r7UM6e2T029643@mail-web03.excite.co.jp> References: <201308302206.r7UM6e2T029643@mail-web03.excite.co.jp> Message-ID: <522119D0.4040007@redhat.com> Hi, On 08/30/2013 06:06 PM, Jacob Wisor wrote: > I always assumed reproducers to be unpredictable on any random system > by definition? I am going to ask Jiri to chime in here. He created the reproducer system so he has probably the best idea of what it is supposed to be :) That said, I have always taken reproducers to be system-level integration/regression tests. That is, they test that the entire system works (either proactively or as a result of a bug fix). They should always pass. I don't see the point of tests if the unpredictable. That's almost as bad as not having tests to begin with - you are forced to run tests and look at results and analyze them manually. > I may be wrong here, but in my understanding a reproducer is not a > general test, it is a special case or kind of test. A reproducer > tests for or against a specific configuration and/or specific system > and hence is allowed to fail on some systems. I think it makes more sense for the test to declare itself as passing if it is not applicable on a system (eg: it tests a POSIX-specific quirk). Or did you mean something else? > Imho a reproducer > should not cover default configuration tests. It just gives a hint on > what to fix to make an application or program work on a specific > system or with a specific configuration. That said, a reproducer's > results are per se unpredictable by definition. They are of course > predictable with a specific configuration and/or on a specific > system. > > Consequently imho testing for the default configuration should be put > into a general test that must succeed on any system. Any specific > configuration tests should be put into a reproducer that is allowed > to fail on some systems (until the app/program has been adapted). Well, I guess we may have some different ideas about what a reproducer is supposed to be, but at least we both agree that we need system-level tests that check that the default configuration is correct :) Cheers, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From bugzilla-daemon at icedtea.classpath.org Sat Aug 31 01:39:20 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 31 Aug 2013 08:39:20 +0000 Subject: [Bug 1538] New: HttpCallerInfo missing from rt.jar when bootstrapping is enabled Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1538 Bug ID: 1538 Summary: HttpCallerInfo missing from rt.jar when bootstrapping is enabled Classification: Unclassified Product: IcedTea Version: 2.4.1 Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P3 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: icedtea at jmbreuer.net CC: unassigned at icedtea.classpath.org When building IcedTea-7 on gentoo using the default configuration of its ebuild, specifically '--enable-bootstrap'; at least one class - sun/net/www/protocol/http/HttpCallerInfo - is missing from the resulting rt.jar. This problem becomes readily apparent when using apache maven 2.2.1 with the IcedTea-7 VM, whenever maven wants to download something: Downloading: http://xxxxxxxx:yyyy/nexus/content/groups/mirror/org/eclipse/equinox/org.eclipse.equinox.common/3.4.0/org.eclipse.equinox.common-3.4.0.pom [INFO] ------------------------------------------------------------------------ [ERROR] FATAL ERROR [INFO] ------------------------------------------------------------------------ [INFO] sun/net/www/protocol/http/HttpCallerInfo [INFO] ------------------------------------------------------------------------ [INFO] Trace java.lang.NoClassDefFoundError: sun/net/www/protocol/http/HttpCallerInfo at sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1447) at java.net.HttpURLConnection.getResponseCode(HttpURLConnection.java:468) at org.apache.maven.wagon.providers.http.LightweightHttpWagon.fillInputData(LightweightHttpWagon.java:115) at org.apache.maven.wagon.StreamWagon.getInputStream(StreamWagon.java:116) at org.apache.maven.wagon.StreamWagon.getIfNewer(StreamWagon.java:88) at org.apache.maven.wagon.StreamWagon.get(StreamWagon.java:61) at org.apache.maven.artifact.manager.DefaultWagonManager.getRemoteFile(DefaultWagonManager.java:546) ... [Stacktrace truncated, I don't think there's anything valuable following] The corresponding gentoo bug is https://bugs.gentoo.org/show_bug.cgi?id=464224 I tried to build IcedTea7-2.4.1 outside of gentoo's build system to see whether the issue is related to gentoo's ebuild; by doing the following: a) Got the icedtea distribution from http://icedtea.wildebeest.org/download/source/icedtea-2.4.1.tar.gz b) Set up my gentoo environment to use the icedtea-7 2.3.9 binary JDK (this JDK does include the HttpCallerInfo class, i.e. it works inconspicuously for me: $ java-config -s icedtea-bin-7 $ export JAVA_HOME=/opt/icedtea-bin-7.2.3.9 c) Made sure this configuration is actually used [I took this from the ebuild] $ export ANT_RESPECT_JAVA_HOME=TRUE $ export ANT_TASKS="none" d) configured with as little intervention as seemed useful: $ ./configure --with-parallel-jobs=48 --enable-nss --without-rhino [I'd already checked earlier; disabling parallel jobs makes no difference] e) built: $ make The resulting ./openjdk.build/ now has rt.jar files with HttpCallerInfo missing, compare these (HttpURLConnection is class right next to HttpCallerInfo in the same package, sun.net.www.protocol.http): $ find . -type f -iname \*.jar -print0 | xargs -0 grep HttpURLConnection Binary file ./openjdk.build-boot/lib/charsets.jar matches Binary file ./openjdk.build-boot/lib/ext/dnsns.jar matches Binary file ./openjdk.build-boot/lib/ext/localedata.jar matches Binary file ./openjdk.build-boot/lib/sa-jdi.jar matches Binary file ./openjdk.build-boot/tmp/rt-orig.jar matches Binary file ./openjdk.build-boot/j2re-image/lib/rt.jar matches Binary file ./openjdk.build-boot/j2re-image/lib/charsets.jar matches Binary file ./openjdk.build-boot/j2re-image/lib/ext/dnsns.jar matches Binary file ./openjdk.build-boot/j2re-image/lib/ext/localedata.jar matches Binary file ./openjdk.build-boot/jaxws/dist/lib/classes.jar matches Binary file ./openjdk.build-boot/j2sdk-server-image/lib/sa-jdi.jar matches Binary file ./openjdk.build-boot/j2sdk-server-image/jre/lib/rt.jar matches Binary file ./openjdk.build-boot/j2sdk-server-image/jre/lib/charsets.jar matches Binary file ./openjdk.build-boot/j2sdk-server-image/jre/lib/ext/dnsns.jar matches Binary file ./openjdk.build-boot/j2sdk-server-image/jre/lib/ext/localedata.jar matches Binary file ./openjdk.build-boot/hotspot/import/lib/sa-jdi.jar matches Binary file ./openjdk.build-boot/hotspot/outputdir/linux_amd64_compiler2/generated/sa-jdi.jar matches Binary file ./openjdk.build-boot/j2sdk-image/lib/sa-jdi.jar matches Binary file ./openjdk.build-boot/j2sdk-image/jre/lib/rt.jar matches Binary file ./openjdk.build-boot/j2sdk-image/jre/lib/charsets.jar matches Binary file ./openjdk.build-boot/j2sdk-image/jre/lib/ext/dnsns.jar matches Binary file ./openjdk.build-boot/j2sdk-image/jre/lib/ext/localedata.jar matches Binary file ./openjdk.build-boot/corba/dist/lib/classes.jar matches Binary file ./openjdk.build/tmp/rt-orig.jar matches Binary file ./openjdk.build/j2re-image/lib/rt.jar matches Binary file ./openjdk.build/j2sdk-server-image/jre/lib/rt.jar matches Binary file ./openjdk.build/j2sdk-image/jre/lib/rt.jar matches Binary file ./bootstrap/boot/jre/lib/rt.jar matches $ find . -type f -iname \*.jar -print0 | xargs -0 grep HttpCallerInfo Binary file ./openjdk.build-boot/lib/charsets.jar matches Binary file ./openjdk.build-boot/lib/ext/dnsns.jar matches Binary file ./openjdk.build-boot/lib/ext/localedata.jar matches Binary file ./openjdk.build-boot/lib/sa-jdi.jar matches Binary file ./openjdk.build-boot/tmp/rt-orig.jar matches Binary file ./openjdk.build-boot/j2re-image/lib/rt.jar matches Binary file ./openjdk.build-boot/j2re-image/lib/charsets.jar matches Binary file ./openjdk.build-boot/j2re-image/lib/ext/dnsns.jar matches Binary file ./openjdk.build-boot/j2re-image/lib/ext/localedata.jar matches Binary file ./openjdk.build-boot/jaxws/dist/lib/classes.jar matches Binary file ./openjdk.build-boot/j2sdk-server-image/lib/sa-jdi.jar matches Binary file ./openjdk.build-boot/j2sdk-server-image/jre/lib/rt.jar matches Binary file ./openjdk.build-boot/j2sdk-server-image/jre/lib/charsets.jar matches Binary file ./openjdk.build-boot/j2sdk-server-image/jre/lib/ext/dnsns.jar matches Binary file ./openjdk.build-boot/j2sdk-server-image/jre/lib/ext/localedata.jar matches Binary file ./openjdk.build-boot/hotspot/import/lib/sa-jdi.jar matches Binary file ./openjdk.build-boot/hotspot/outputdir/linux_amd64_compiler2/generated/sa-jdi.jar matches Binary file ./openjdk.build-boot/j2sdk-image/lib/sa-jdi.jar matches Binary file ./openjdk.build-boot/j2sdk-image/jre/lib/rt.jar matches Binary file ./openjdk.build-boot/j2sdk-image/jre/lib/charsets.jar matches Binary file ./openjdk.build-boot/j2sdk-image/jre/lib/ext/dnsns.jar matches Binary file ./openjdk.build-boot/j2sdk-image/jre/lib/ext/localedata.jar matches Binary file ./openjdk.build-boot/corba/dist/lib/classes.jar matches Binary file ./bootstrap/boot/jre/lib/rt.jar matches When running 'make check' in the build directory, a number of tests fail - I cannot say what significance that might have: FAILED: compiler/8010927/Test8010927.java FAILED: compiler/8011901/Test8011901.java Error: gc/6941923/test6941923.sh FAILED: gc/heap_inspection/TestPrintClassHistogram.java FAILED: gc/init/TestHandleExceedingProcessSizeLimitIn32BitBuilds.java FAILED: gc/TestVerifyBeforeGCDuringStartup.java Error: runtime/7196045/Test7196045.java FAILED: runtime/CommandLine/CompilerConfigFileWarning.java FAILED: runtime/CommandLine/ConfigFileWarning.java FAILED: runtime/NMT/BaselineWithParameter.java FAILED: runtime/NMT/CommandLineDetail.java FAILED: runtime/NMT/CommandLineEmptyArgument.java FAILED: runtime/NMT/CommandLineInvalidArgument.java FAILED: runtime/NMT/CommandLineSummary.java FAILED: runtime/NMT/CommandLineTurnOffNMT.java FAILED: runtime/NMT/JcmdDiffCallsite.java FAILED: runtime/NMT/JcmdScale.java FAILED: runtime/NMT/JcmdWithNMTDisabled.java FAILED: runtime/NMT/MallocTestType.java FAILED: runtime/NMT/PrintNMTStatistics.java FAILED: runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java FAILED: runtime/NMT/ReleaseCommittedMemory.java FAILED: runtime/NMT/ShutdownTwice.java FAILED: runtime/NMT/SummaryAfterShutdown.java FAILED: runtime/NMT/SummarySanityCheck.java FAILED: runtime/NMT/ThreadedMallocTestType.java FAILED: runtime/NMT/ThreadedVirtualAllocTestType.java FAILED: runtime/NMT/VirtualAllocTestType.java FAILED: sanity/WBApi.java FAILED: serviceability/ParserTest.java Test results: passed: 231; failed: 28; error: 2 Error: Some tests failed or other problems occurred. FAILED: com/oracle/security/ucrypto/TestAES.java FAILED: com/oracle/security/ucrypto/TestRSA.java Error: com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java ... then a window opened up instructing me (after a while) to press Ctrl-C - which aborted the test run. The test problems I've seen all stem from com.oracle.java.testlibrary.* and sun.hotspot.WhiteBox not being available. I'll be happy to help with any further analysis, and I'll (try to) keep this build directory around for a while. -- 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/20130831/43f25abf/attachment.html From andrew at icedtea.classpath.org Sat Aug 31 09:42:31 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Sat, 31 Aug 2013 16:42:31 +0000 Subject: /hg/icedtea6: Backport a number of JPEG fixes from 7u. Message-ID: changeset de0023a3d26d in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=de0023a3d26d author: Andrew John Hughes date: Sat Aug 31 17:42:12 2013 +0100 Backport a number of JPEG fixes from 7u. S4893408: JPEGReader throws IllegalArgException when setting the destination to BYTE_GRAY S6631559: Registration of ImageIO plugins should not cause loading of jpeg.dlli and cmm.dll S6791502: IIOException "Invalid icc profile" on jpeg after update from JDK5 to JDK6 S6793818: JpegImageReader is too greedy creating color profiles S6888215: memory leak in jpeg plugin S6989760: cmm native compiler warnings S6989774: imageio compiler warnings in native code S7013519: [parfait] Integer overflows in 2D code S7018912: [parfait] potential buffer overruns in imageio jpeg S8005194: [parfait] #353 sun/awt/image/jpeg/imageioJPEG.c Memory leak of pointer 'scale' allocated with calloc() S8020983, RH976897: OutOfMemoryError caused by non garbage collected JPEGImageWriter Instances 2013-08-30 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated with new patches. * patches/imageiojpeg_sync.patch: Bring in changes to imageioJPEG.c made between the start of OpenJDK 6 and the start of OpenJDK 7's hg repositories. * patches/libraries.patch: Updated against patches below. * patches/openjdk/4893408-jpegreader_byte_gray.patch, * patches/openjdk/6631559-dont_load_libjpeg_to_register_imageio_plugins.patch, * patches/openjdk/6791502-invalid_icc_profile.patch, * patches/openjdk/6793818-jpegimagereader_too_greedy.patch, * patches/openjdk/6888215-jpeg_memory_leak.patch, * patches/openjdk/6989760-native_warnings.patch, * patches/openjdk/6989774-imageio_compiler_warnings.patch, * patches/openjdk/7013519-integer_overflows.patch, * patches/openjdk/7018912-potential_buffer_overruns_in_jpeg.patch, * patches/openjdk/8005194-scale_memory_leak.patch, * patches/openjdk/8020983-outofmemoryerror_jpegimagewriter.patch: New backports from OpenJDK 7u. diffstat: ChangeLog | 23 + Makefile.am | 14 +- NEWS | 11 + patches/imageiojpeg_sync.patch | 217 ++ patches/libraries.patch | 178 +- patches/openjdk/4893408-jpegreader_byte_gray.patch | 747 ++++++++++ patches/openjdk/6631559-dont_load_libjpeg_to_register_imageio_plugins.patch | 562 +++++++ patches/openjdk/6791502-invalid_icc_profile.patch | 269 +++ patches/openjdk/6793818-jpegimagereader_too_greedy.patch | 228 +++ patches/openjdk/6888215-jpeg_memory_leak.patch | 56 + patches/openjdk/6989760-native_warnings.patch | 42 + patches/openjdk/6989774-imageio_compiler_warnings.patch | 649 ++++++++ patches/openjdk/7013519-integer_overflows.patch | 17 + patches/openjdk/7018912-potential_buffer_overruns_in_jpeg.patch | 21 + patches/openjdk/8005194-scale_memory_leak.patch | 25 + patches/openjdk/8020983-outofmemoryerror_jpegimagewriter.patch | 320 ++++ 16 files changed, 3290 insertions(+), 89 deletions(-) diffs (truncated from 3942 to 500 lines): diff -r 7eeaaf0ac806 -r de0023a3d26d ChangeLog --- a/ChangeLog Fri Aug 30 14:41:42 2013 +0100 +++ b/ChangeLog Sat Aug 31 17:42:12 2013 +0100 @@ -1,3 +1,26 @@ +2013-08-30 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patches. + * NEWS: Updated with new patches. + * patches/imageiojpeg_sync.patch: + Bring in changes to imageioJPEG.c made between + the start of OpenJDK 6 and the start of OpenJDK 7's + hg repositories. + * patches/libraries.patch: Updated against patches below. + * patches/openjdk/4893408-jpegreader_byte_gray.patch, + * patches/openjdk/6631559-dont_load_libjpeg_to_register_imageio_plugins.patch, + * patches/openjdk/6791502-invalid_icc_profile.patch, + * patches/openjdk/6793818-jpegimagereader_too_greedy.patch, + * patches/openjdk/6888215-jpeg_memory_leak.patch, + * patches/openjdk/6989760-native_warnings.patch, + * patches/openjdk/6989774-imageio_compiler_warnings.patch, + * patches/openjdk/7013519-integer_overflows.patch, + * patches/openjdk/7018912-potential_buffer_overruns_in_jpeg.patch, + * patches/openjdk/8005194-scale_memory_leak.patch, + * patches/openjdk/8020983-outofmemoryerror_jpegimagewriter.patch: + New backports from OpenJDK 7u. + 2013-08-29 Andrew John Hughes * Makefile.am: diff -r 7eeaaf0ac806 -r de0023a3d26d Makefile.am --- a/Makefile.am Fri Aug 30 14:41:42 2013 +0100 +++ b/Makefile.am Sat Aug 31 17:42:12 2013 +0100 @@ -489,6 +489,16 @@ patches/openjdk/6693253-security_warning.patch \ patches/openjdk/6444769-windowwithwarningtest.patch \ patches/openjdk/6656651-windows_lcd_glyphs.patch \ + patches/openjdk/6791502-invalid_icc_profile.patch \ + patches/openjdk/6793818-jpegimagereader_too_greedy.patch \ + patches/openjdk/6631559-dont_load_libjpeg_to_register_imageio_plugins.patch \ + patches/openjdk/4893408-jpegreader_byte_gray.patch \ + patches/openjdk/6888215-jpeg_memory_leak.patch \ + patches/openjdk/6989774-imageio_compiler_warnings.patch \ + patches/openjdk/7018912-potential_buffer_overruns_in_jpeg.patch \ + patches/openjdk/6989760-native_warnings.patch \ + patches/openjdk/7013519-integer_overflows.patch \ + patches/openjdk/8020983-outofmemoryerror_jpegimagewriter.patch \ patches/notice-safepoints.patch \ patches/parisc-opt.patch \ patches/lucene-crash.patch \ @@ -740,7 +750,9 @@ patches/alternative_krb5_cache.patch \ patches/alternative_krb5_cache_fixup.patch \ patches/openjdk/8014469-tzdata2013c.patch \ - patches/openjdk/8020054-tzdata2013d.patch + patches/openjdk/8020054-tzdata2013d.patch \ + patches/imageiojpeg_sync.patch \ + patches/openjdk/8005194-scale_memory_leak.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r 7eeaaf0ac806 -r de0023a3d26d NEWS --- a/NEWS Fri Aug 30 14:41:42 2013 +0100 +++ b/NEWS Sat Aug 31 17:42:12 2013 +0100 @@ -21,6 +21,17 @@ - S8009641: OpenJDK 6 build broken via 8007675 fix - OJ4: Backport the new version of copyMemory from OpenJDK 7 to allow Snappy to build - S7022999: Can't build with FORCE_TIERED=0 (bundled HotSpot only) + - S4893408: JPEGReader throws IllegalArgException when setting the destination to BYTE_GRAY + - S6631559: Registration of ImageIO plugins should not cause loading of jpeg.dlli and cmm.dll + - S6791502: IIOException "Invalid icc profile" on jpeg after update from JDK5 to JDK6 + - S6793818: JpegImageReader is too greedy creating color profiles + - S6888215: memory leak in jpeg plugin + - S6989760: cmm native compiler warnings + - S6989774: imageio compiler warnings in native code + - S7013519: [parfait] Integer overflows in 2D code + - S7018912: [parfait] potential buffer overruns in imageio jpeg + - S8005194: [parfait] #353 sun/awt/image/jpeg/imageioJPEG.c Memory leak of pointer 'scale' allocated with calloc() + - S8020983, RH976897: OutOfMemoryError caused by non garbage collected JPEGImageWriter Instances * Bug fixes - PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on armel. - PR1318: Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM. diff -r 7eeaaf0ac806 -r de0023a3d26d patches/imageiojpeg_sync.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/imageiojpeg_sync.patch Sat Aug 31 17:42:12 2013 +0100 @@ -0,0 +1,217 @@ +diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-08-30 18:50:38.238272213 +0100 ++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-08-30 18:57:43.240892673 +0100 +@@ -447,9 +447,6 @@ + pixelBuffer pixelBuf; // Buffer for pixels + + jboolean abortFlag; // Passed down from Java abort method +- +- UINT8 scale[MAX_BANDS][NUM_INPUT_VALUES]; +- int bandSizes[MAX_BANDS]; // For scaling to-from non-8-bit images + } imageIOData, *imageIODataPtr; + + /* +@@ -487,12 +484,6 @@ + + data->abortFlag = JNI_FALSE; + +- for (i = 0; i < MAX_BANDS; i ++) { +- data->bandSizes[i] = 0; +- for (j = 0; j < NUM_INPUT_VALUES; j++) { +- data->scale[i][j] = 0; +- } +- } + return data; + } + +@@ -1978,34 +1969,6 @@ + + (*env)->ReleaseIntArrayElements(env, srcBands, body, JNI_ABORT); + +- bandSize = (*env)->GetIntArrayElements(env, bandSizes, NULL); +- +- for (i = 0; i < numBands; i++) { +- if (bandSize[i] != JPEG_BAND_SIZE) { +- mustScale = TRUE; +- break; +- } +- } +- +- if (mustScale) { +- // Build any scale tables that aren't already OK +- for (i = 0; i < numBands; i++) { +- if (data->bandSizes[i] != bandSize[i]) { +- data->bandSizes[i] = bandSize[i]; +- maxBandValue = (1 << bandSize[i]) - 1; +- halfMaxBandValue = maxBandValue >> 1; +- for (j = 0; j <= maxBandValue; j++) { +- data->scale[i][j] = +- (UINT8)((j*MAX_JPEG_BAND_VALUE +- + halfMaxBandValue)/maxBandValue); +- } +- } +- } +- } +- +- (*env)->ReleaseIntArrayElements(env, bandSizes, +- bandSize, JNI_ABORT); +- + #ifdef DEBUG_IIO_JPEG + printf("---- in reader.read ----\n"); + printf("numBands is %d\n", numBands); +@@ -2028,15 +1991,6 @@ + return data->abortFlag; // We already threw an out of memory exception + } + +- // Allocate a 1-scanline buffer +- if (cinfo->num_components <= 0 || +- cinfo->image_width > (UINT_MAX / (unsigned int)cinfo->num_components)) +- { +- RELEASE_ARRAYS(env, data, src->next_input_byte); +- JNU_ThrowByName(env, "javax/imageio/IIOException", +- "Invalid number of color components"); +- return data->abortFlag; +- } + /* Establish the setjmp return context for sun_jpeg_error_exit to use. */ + jerr = (sun_jpeg_error_ptr) cinfo->err; + +@@ -2154,15 +2108,8 @@ + + // Now mangle it into our buffer + out = data->pixelBuf.buf.bp; +- if (mustScale) { +- for (in = scanLinePtr+sourceXStart*cinfo->num_components; +- in < pixelLimit; +- in += pixelStride) { +- for (i = 0; i < numBands; i++) { +- *out++ = data->scale[i][*(in+bands[i])]; +- } +- } +- } else if (orderedBands && (pixelStride == numBands)) { ++ ++ if (orderedBands && (pixelStride == numBands)) { + // Optimization: The component bands are ordered sequentially, + // so we can simply use memcpy() to copy the intermediate + // scanline buffer into the raster. +@@ -2177,7 +2124,7 @@ + } else { + numBytes = numBands; + for (in = scanLinePtr+sourceXStart*cinfo->output_components; +- in < pixelLimit && ++ in < pixelLimit && + numBytes <= data->pixelBuf.byteBufferLength; + in += pixelStride) { + for (i = 0; i < numBands; i++) { +@@ -2914,9 +2861,10 @@ + jint *scanData; + jint *bandSize; + int maxBandValue, halfMaxBandValue; +- boolean mustScale = FALSE; + imageIODataPtr data = (imageIODataPtr)jlong_to_ptr(ptr); + j_compress_ptr cinfo; ++ UINT8** scale = NULL; ++ + + /* verify the inputs */ + +@@ -2963,24 +2911,32 @@ + + for (i = 0; i < numBands; i++) { + if (bandSize[i] != JPEG_BAND_SIZE) { +- mustScale = TRUE; +- break; +- } +- } ++ if (scale == NULL) { ++ scale = (UINT8**) calloc(numBands, sizeof(UINT8*)); + +- if (mustScale) { +- // Build any scale tables that aren't already OK +- for (i = 0; i < numBands; i++) { +- if (data->bandSizes[i] != bandSize[i]) { +- data->bandSizes[i] = bandSize[i]; +- maxBandValue = (1 << bandSize[i]) - 1; +- halfMaxBandValue = maxBandValue >> 1; +- for (j = 0; j <= maxBandValue; j++) { +- data->scale[i][j] = +- (UINT8)((j*MAX_JPEG_BAND_VALUE +- + halfMaxBandValue)/maxBandValue); ++ if (scale == NULL) { ++ JNU_ThrowByName( env, "java/lang/OutOfMemoryError", ++ "Writing JPEG Stream"); ++ return JNI_FALSE; + } + } ++ ++ maxBandValue = (1 << bandSize[i]) - 1; ++ ++ scale[i] = (UINT8*) malloc((maxBandValue + 1) * sizeof(UINT8)); ++ ++ if (scale[i] == NULL) { ++ JNU_ThrowByName( env, "java/lang/OutOfMemoryError", ++ "Writing JPEG Stream"); ++ return JNI_FALSE; ++ } ++ ++ halfMaxBandValue = maxBandValue >> 1; ++ ++ for (j = 0; j <= maxBandValue; j++) { ++ scale[i][j] = (UINT8) ++ ((j*MAX_JPEG_BAND_VALUE + halfMaxBandValue)/maxBandValue); ++ } + } + } + +@@ -3189,28 +3145,25 @@ + out = scanLinePtr; + pixelLimit = in + ((pixelBufferSize > data->pixelBuf.byteBufferLength) ? + data->pixelBuf.byteBufferLength : pixelBufferSize); +- if (mustScale) { +- for (; (in < pixelLimit) && (out < scanLineLimit); in += pixelStride) { +- for (i = 0; i < numBands; i++) { +- *out++ = data->scale[i][*(in+i)]; ++ for (; (in < pixelLimit) && (out < scanLineLimit); in += pixelStride) { ++ for (i = 0; i < numBands; i++) { ++ if (scale !=NULL && scale[i] != NULL) { ++ *out++ = scale[i][*(in+i)]; + #ifdef DEBUG_IIO_JPEG + if (in == data->pixelBuf.buf.bp){ // Just the first pixel + printf("in %d -> out %d, ", *(in+i), *(out-i-1)); + } + #endif +- } ++ + #ifdef DEBUG_IIO_JPEG + if (in == data->pixelBuf.buf.bp){ // Just the first pixel + printf("\n"); + } + #endif +- } +- } else { +- for (; (in < pixelLimit) && (out < scanLineLimit); in += pixelStride) { +- for (i = 0; i < numBands; i++) { ++ } else { + *out++ = *(in+i); + } +- } ++ } + } + // write it out + jpegwritescanlines(cinfo, (JSAMPARRAY)&scanLinePtr, 1); +@@ -3226,6 +3179,16 @@ + } else { + jpegabort((j_common_ptr)cinfo); + } ++ ++ if (scale != NULL) { ++ for (i = 0; i < numBands; i++) { ++ if (scale[i] != NULL) { ++ free(scale[i]); ++ } ++ } ++ free(scale); ++ } ++ + free(scanLinePtr); + RELEASE_ARRAYS(env, data, NULL); + return data->abortFlag; diff -r 7eeaaf0ac806 -r de0023a3d26d patches/libraries.patch --- a/patches/libraries.patch Fri Aug 30 14:41:42 2013 +0100 +++ b/patches/libraries.patch Sat Aug 31 17:42:12 2013 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile --- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2012-10-26 19:25:40.000000000 +0100 -+++ openjdk/jdk/make/com/sun/java/pack/Makefile 2013-07-22 19:51:20.762208023 +0100 ++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2013-08-30 16:53:14.788401039 +0100 @@ -64,23 +64,21 @@ ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME) @@ -55,7 +55,7 @@ endif #PLATFORM diff -Nru openjdk.orig/jdk/make/common/Program.gmk openjdk/jdk/make/common/Program.gmk --- openjdk.orig/jdk/make/common/Program.gmk 2012-10-26 19:25:40.000000000 +0100 -+++ openjdk/jdk/make/common/Program.gmk 2013-07-22 19:51:20.774208212 +0100 ++++ openjdk/jdk/make/common/Program.gmk 2013-08-30 16:53:14.788401039 +0100 @@ -85,7 +85,7 @@ endif endif @@ -75,7 +75,7 @@ VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"' diff -Nru openjdk.orig/jdk/make/java/jli/Makefile openjdk/jdk/make/java/jli/Makefile --- openjdk.orig/jdk/make/java/jli/Makefile 2012-10-26 19:25:40.000000000 +0100 -+++ openjdk/jdk/make/java/jli/Makefile 2013-07-22 19:51:20.774208212 +0100 ++++ openjdk/jdk/make/java/jli/Makefile 2013-08-30 16:53:14.788401039 +0100 @@ -44,8 +44,6 @@ include $(BUILDDIR)/common/Defs.gmk @@ -127,7 +127,7 @@ diff -Nru openjdk.orig/jdk/make/java/zip/FILES_c.gmk openjdk/jdk/make/java/zip/FILES_c.gmk --- openjdk.orig/jdk/make/java/zip/FILES_c.gmk 2012-10-26 19:25:41.000000000 +0100 -+++ openjdk/jdk/make/java/zip/FILES_c.gmk 2013-07-22 19:51:20.774208212 +0100 ++++ openjdk/jdk/make/java/zip/FILES_c.gmk 2013-08-30 16:53:14.788401039 +0100 @@ -30,15 +30,4 @@ Inflater.c \ ZipFile.c \ @@ -146,7 +146,7 @@ zip_util.c diff -Nru openjdk.orig/jdk/make/java/zip/Makefile openjdk/jdk/make/java/zip/Makefile --- openjdk.orig/jdk/make/java/zip/Makefile 2012-10-26 19:25:41.000000000 +0100 -+++ openjdk/jdk/make/java/zip/Makefile 2013-07-22 19:51:20.774208212 +0100 ++++ openjdk/jdk/make/java/zip/Makefile 2013-08-30 16:53:14.788401039 +0100 @@ -30,8 +30,6 @@ PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk @@ -176,7 +176,7 @@ +OTHER_LDLIBS = $(JVMLIB) -lz diff -Nru openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk openjdk/jdk/make/sun/jpeg/FILES_c.gmk --- openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk 2012-10-26 19:25:41.000000000 +0100 -+++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2013-07-22 19:51:20.774208212 +0100 ++++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2013-08-30 16:53:14.788401039 +0100 @@ -25,51 +25,7 @@ FILES_c = \ @@ -231,9 +231,9 @@ ifndef OPENJDK FILES_c += \ diff -Nru openjdk.orig/jdk/make/sun/jpeg/Makefile openjdk/jdk/make/sun/jpeg/Makefile ---- openjdk.orig/jdk/make/sun/jpeg/Makefile 2012-10-26 19:25:41.000000000 +0100 -+++ openjdk/jdk/make/sun/jpeg/Makefile 2013-07-22 19:51:20.774208212 +0100 -@@ -68,6 +68,8 @@ +--- openjdk.orig/jdk/make/sun/jpeg/Makefile 2013-08-30 16:44:07.551631313 +0100 ++++ openjdk/jdk/make/sun/jpeg/Makefile 2013-08-30 16:53:14.788401039 +0100 +@@ -81,6 +81,8 @@ include $(BUILDDIR)/common/Mapfile-vers.gmk include $(BUILDDIR)/common/Library.gmk @@ -244,7 +244,7 @@ # diff -Nru openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk openjdk/jdk/make/sun/splashscreen/FILES_c.gmk --- openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk 2012-10-26 19:25:42.000000000 +0100 -+++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk 2013-07-22 19:51:20.774208212 +0100 ++++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk 2013-08-30 16:53:14.788401039 +0100 @@ -30,81 +30,5 @@ splashscreen_impl.c \ splashscreen_jpeg.c \ @@ -330,7 +330,7 @@ diff -Nru openjdk.orig/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile --- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2012-10-26 19:25:42.000000000 +0100 -+++ openjdk/jdk/make/sun/splashscreen/Makefile 2013-07-22 19:51:20.774208212 +0100 ++++ openjdk/jdk/make/sun/splashscreen/Makefile 2013-08-30 16:53:14.788401039 +0100 @@ -59,12 +59,12 @@ # C Flags # @@ -362,8 +362,8 @@ ifeq ($(PLATFORM), linux) ifeq ($(ARCH_DATA_MODEL), 64) diff -Nru openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h ---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-07-22 19:49:54.900852754 +0100 -+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-07-22 19:51:20.774208212 +0100 +--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-08-30 16:43:56.687449694 +0100 ++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-08-30 16:53:14.788401039 +0100 @@ -89,11 +89,7 @@ // bytes and byte arrays @@ -378,7 +378,7 @@ typedef DWORDLONG julong; diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c openjdk/jdk/src/share/native/java/util/zip/Adler32.c --- openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c 2012-10-26 19:26:12.000000000 +0100 -+++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c 2013-07-22 19:51:20.774208212 +0100 ++++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c 2013-08-30 16:53:14.788401039 +0100 @@ -29,7 +29,7 @@ #include "jni.h" @@ -390,7 +390,7 @@ diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c openjdk/jdk/src/share/native/java/util/zip/CRC32.c --- openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c 2012-10-26 19:26:12.000000000 +0100 -+++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c 2013-07-22 19:51:20.774208212 +0100 ++++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c 2013-08-30 16:53:14.788401039 +0100 @@ -29,7 +29,7 @@ #include "jni.h" @@ -402,7 +402,7 @@ diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c openjdk/jdk/src/share/native/java/util/zip/Deflater.c --- openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c 2012-10-26 19:26:12.000000000 +0100 -+++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c 2013-07-22 19:51:20.774208212 +0100 ++++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c 2013-08-30 16:53:14.788401039 +0100 @@ -32,7 +32,7 @@ #include "jlong.h" #include "jni.h" @@ -414,7 +414,7 @@ diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c openjdk/jdk/src/share/native/java/util/zip/Inflater.c --- openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c 2012-10-26 19:26:12.000000000 +0100 -+++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c 2013-07-22 19:51:20.774208212 +0100 ++++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c 2013-08-30 16:53:14.788401039 +0100 @@ -35,7 +35,7 @@ #include "jni.h" #include "jvm.h" @@ -425,8 +425,8 @@ #define ThrowDataFormatException(env, msg) \ diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c openjdk/jdk/src/share/native/java/util/zip/zip_util.c ---- openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c 2013-07-22 19:49:56.968885397 +0100 -+++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c 2013-07-22 19:51:20.778208275 +0100 +--- openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c 2013-08-30 16:44:05.355594646 +0100 ++++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c 2013-08-30 16:53:14.788401039 +0100 @@ -44,7 +44,8 @@ #include "io_util.h" #include "io_util_md.h" @@ -438,8 +438,8 @@ /* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */ #ifdef USE_MMAP diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-07-22 19:49:56.160872642 +0100 -+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-07-22 19:51:20.778208275 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-08-30 16:44:07.599632116 +0100 ++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-08-30 16:55:38.374649561 +0100 @@ -52,7 +52,9 @@ /* headers from the JPEG library */ @@ -514,7 +514,7 @@ /* * Defined in jpegdecoder.c. Copy code from there if and * when that disappears. */ -@@ -619,7 +677,7 @@ +@@ -627,7 +685,7 @@ return; } @@ -523,7 +523,7 @@ } -@@ -644,7 +702,7 @@ +@@ -652,7 +710,7 @@ return; } @@ -532,7 +532,7 @@ } -@@ -662,7 +720,7 @@ +@@ -670,7 +728,7 @@ free(cinfo->dest); cinfo->dest = NULL; } @@ -541,7 +541,7 @@ free(info); } } -@@ -702,14 +760,14 @@ +@@ -710,14 +768,14 @@ decomp = (j_decompress_ptr) cinfo; if (decomp->quant_tbl_ptrs[i] == NULL) { decomp->quant_tbl_ptrs[i] = @@ -558,7 +558,7 @@ } quant_ptr = comp->quant_tbl_ptrs[i]; } -@@ -800,14 +858,14 @@