Parsing Test

From jvanek at redhat.com Mon Sep 2 01:45:12 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 02 Sep 2013 10:45:12 +0200 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: <52245018.4080501@redhat.com> On 08/31/2013 12:06 AM, Jacob Wisor wrote: > Hello, > > if I may way in here... Generally spoken good idea to use the map isntead of default location. Reason Why I not suggested it is that I'm not sure how DeploymentConfiguration will work when "misused" like this. However worthy to try. > > "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 would guess this can happen. Although number of reproducers depending on configuration directly is very few. > > 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. Unluckily historical true. I think now its a bit better. > > 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). Yes, the testing on default configuration is the proffered way - mostly from historical reasons, when framework was under development and custom configs were not possible. When you check newer reproducers they are stable, are running on clean configuration, and clean uo after themselves too. Also they are testing various settings - both custom and defaults. >>> A mistake in code (a >>> typo in one of the configuration defaults, for example) should be >>> detected by the reproducers. Not easy task here. But I agree taht tets should not be depending on actual configuration. As I mentioned. Newer tests are fighting with this a bit, and probably general solution like annotation @itw-test (params like config, map, cleanCache...) which will setup clean default/custom environment and then clean up after it may be worthy. >>> >>> 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". > Although I agree with you, I'm hesitating to touch reproducers somehow more - as they are serving well. Andrew A. is looking into them so he may have different opinion - he already refactored some parts of code for more happy live of us. J. From jvanek at redhat.com Mon Sep 2 02:22:15 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 02 Sep 2013 11:22:15 +0200 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: <522458C7.3070505@redhat.com> On 08/30/2013 01:06 PM, Jacob Wisor wrote: > "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. Nope, rather make it public. Anyaway, as others suggested, Can you tray to use DeploymentConfiguration singleton to get real location of cache. If you think it is good idea, then go with it. >> > > 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 ptisnovs at icedtea.classpath.org Mon Sep 2 02:33:47 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 02 Sep 2013 09:33:47 +0000 Subject: /hg/gfx-test: Six new tests added into BitBltAffineIdentityTrans... Message-ID: changeset c91a2ba5cd29 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=c91a2ba5cd29 author: Pavel Tisnovsky date: Mon Sep 02 11:37:29 2013 +0200 Six new tests added into BitBltAffineIdentityTransformOp. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java | 83 ++++++++++ 2 files changed, 88 insertions(+), 0 deletions(-) diffs (112 lines): diff -r cdf5b6539c5f -r c91a2ba5cd29 ChangeLog --- a/ChangeLog Fri Aug 30 11:25:12 2013 +0200 +++ b/ChangeLog Mon Sep 02 11:37:29 2013 +0200 @@ -1,3 +1,8 @@ +2013-09-02 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java: + Six new tests added into BitBltAffineIdentityTransformOp. + 2013-08-30 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r cdf5b6539c5f -r c91a2ba5cd29 src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java --- a/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java Fri Aug 30 11:25:12 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java Mon Sep 02 11:37:29 2013 +0200 @@ -654,6 +654,48 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ + public TestResult testBitBltCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp4(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp4); + } + + /** + * 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 testBitBltCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp5(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp5); + } + + /** + * 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 testBitBltCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp6(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp6); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d) { return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp1); @@ -687,6 +729,47 @@ return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp3); } + /** * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp4(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp4); + } + + /** + * 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 testBitBltDiagonalCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp5(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp5); + } + + /** + * 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 testBitBltDiagonalCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp6(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp6); + } + /** * Entry point to the test suite. * From ptisnovs at icedtea.classpath.org Mon Sep 2 02:51:32 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 02 Sep 2013 09:51:32 +0000 Subject: /hg/rhino-tests: Added new test testCast (that checks Class.cast... Message-ID: changeset e5840a2853aa in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=e5840a2853aa author: Pavel Tisnovsky date: Mon Sep 02 11:55:15 2013 +0200 Added new test testCast (that checks Class.cast() method) into test test suite SimpleScriptContextClassTest. diffstat: ChangeLog | 6 + src/org/RhinoTests/SimpleScriptContextClassTest.java | 198 +++++++++++++++++++ 2 files changed, 204 insertions(+), 0 deletions(-) diffs (221 lines): diff -r e55f8607a4cf -r e5840a2853aa ChangeLog --- a/ChangeLog Fri Aug 30 11:30:45 2013 +0200 +++ b/ChangeLog Mon Sep 02 11:55:15 2013 +0200 @@ -1,3 +1,9 @@ +2013-09-02 Pavel Tisnovsky + + * src/org/RhinoTests/SimpleScriptContextClassTest.java: + Added new test testCast (that checks Class.cast() method) into test + test suite SimpleScriptContextClassTest. + 2013-08-30 Pavel Tisnovsky * src/org/RhinoTests/AbstractScriptEngineClassTest.java: diff -r e55f8607a4cf -r e5840a2853aa src/org/RhinoTests/SimpleScriptContextClassTest.java --- a/src/org/RhinoTests/SimpleScriptContextClassTest.java Fri Aug 30 11:30:45 2013 +0200 +++ b/src/org/RhinoTests/SimpleScriptContextClassTest.java Mon Sep 02 11:55:15 2013 +0200 @@ -1494,6 +1494,204 @@ } /** + * Test for method javax.script.SimpleScriptContext.getClass().cast() + */ + protected void testCast() { + try { + this.simpleScriptContextClass.cast(new javax.script.SimpleScriptContext()); + } + catch (Exception e) { + e.printStackTrace(); + throw new AssertionError(e.getMessage()); + } + + try { + this.simpleScriptContextClass.cast(new Object()); + throw new AssertionError("Class.cast(new Object()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.cast(new Object().getClass()); + throw new AssertionError("Class.cast(new Object().getClass()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.cast(new String()); + throw new AssertionError("Class.cast(new String()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.cast(Boolean.valueOf(true)); + throw new AssertionError("Class.cast(Boolean.valueOf(true)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.cast(Boolean.valueOf(false)); + throw new AssertionError("Class.cast(Boolean.valueOf(false)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.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.simpleScriptContextClass.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.simpleScriptContextClass.cast(Integer.valueOf(42)); + throw new AssertionError("Class.cast(Integer.valueOf(42)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.cast(Long.valueOf(42L)); + throw new AssertionError("Class.cast(Long.valueOf(42L)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.cast(Float.valueOf(42f)); + throw new AssertionError("Class.cast(Float.valueOf(42f)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.cast(Double.valueOf(42.)); + throw new AssertionError("Class.cast(Double.valueOf(42.)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.cast(new Throwable()); + throw new AssertionError("Class.cast(new Throwable()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.cast(new RuntimeException()); + throw new AssertionError("Class.cast(new RuntimeException()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.cast(new Error()); + throw new AssertionError("Class.cast(new Error()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleScriptContextClass.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.simpleScriptContextClass.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.simpleScriptContextClass.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.simpleScriptContextClass.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.simpleScriptContextClass.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.simpleScriptContextClass.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.simpleScriptContextClass.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.simpleScriptContextClass.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.simpleScriptContextClass.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.SimpleScriptContext */ @SuppressWarnings("cast") From andrew at icedtea.classpath.org Mon Sep 2 12:59:30 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 02 Sep 2013 19:59:30 +0000 Subject: /hg/icedtea6: Backport various Makefile changes so -Wno-clobbere... Message-ID: changeset 782a87f782f3 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=782a87f782f3 author: Andrew John Hughes date: Mon Sep 02 20:59:15 2013 +0100 Backport various Makefile changes so -Wno-clobbered is only used with GCC >= 4.3. S6563752: Build and test JDK7 with Sun Studio 12 Express compilers (prep makefiles) S6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2 S6799141: Build with --hash-style=both so that binaries can work on SuSE 10 S6816311: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003 S6974017: Upgrade required Solaris Studio compilers to 5.10 (12 update 1 + patches) S6980281: SWAT: SwingSet2 got core dumped in Solaris-AMD64 using b107 swat build S7000225: Sanity check on sane-alsa-headers is broken S7038711: Fix CC_VER checks for compiler options, fix use of -Wno-clobber 2013-09-02 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new backports. Move disable-cc-incompatible-sanity-checks and freetypeversion to the end. * patches/disable-cc-incompatible-sanity-checks.patch, * patches/freetypeversion.patch: Regenerated to work after new backports. * patches/openjdk/6563752-ss12_support.patch, * patches/openjdk/6729772-opt_cleanup.patch, * patches/openjdk/6799141-split_out_versions.patch, * patches/openjdk/6816311-compiler_name.patch, * patches/openjdk/6974017-minorver_for_solaris.patch, * patches/openjdk/6980281-majorver_for_solaris.patch, * patches/openjdk/7000225-bad_tabs.patch, * patches/openjdk/7038711-fix_no-clobber_usage.patch: Backports from OpenJDK 7 to bring in latest Makefile updates. * NEWS: Update and order backports numerically. diffstat: ChangeLog | 21 + Makefile.am | 15 +- NEWS | 12 +- patches/disable-cc-incompatible-sanity-checks.patch | 54 +- patches/freetypeversion.patch | 23 +- patches/openjdk/6563752-ss12_support.patch | 173 +++ patches/openjdk/6729772-opt_cleanup.patch | 847 ++++++++++++++++++ patches/openjdk/6799141-split_out_versions.patch | 915 ++++++++++++++++++++ patches/openjdk/6816311-compiler_name.patch | 417 +++++++++ patches/openjdk/6974017-minorver_for_solaris.patch | 24 + patches/openjdk/6980281-majorver_for_solaris.patch | 66 + patches/openjdk/7000225-bad_tabs.patch | 48 + patches/openjdk/7038711-fix_no-clobber_usage.patch | 125 ++ 13 files changed, 2682 insertions(+), 58 deletions(-) diffs (truncated from 2878 to 500 lines): diff -r de0023a3d26d -r 782a87f782f3 ChangeLog --- a/ChangeLog Sat Aug 31 17:42:12 2013 +0100 +++ b/ChangeLog Mon Sep 02 20:59:15 2013 +0100 @@ -1,3 +1,24 @@ +2013-09-02 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new backports. Move + disable-cc-incompatible-sanity-checks and freetypeversion + to the end. + * patches/disable-cc-incompatible-sanity-checks.patch, + * patches/freetypeversion.patch: + Regenerated to work after new backports. + * patches/openjdk/6563752-ss12_support.patch, + * patches/openjdk/6729772-opt_cleanup.patch, + * patches/openjdk/6799141-split_out_versions.patch, + * patches/openjdk/6816311-compiler_name.patch, + * patches/openjdk/6974017-minorver_for_solaris.patch, + * patches/openjdk/6980281-majorver_for_solaris.patch, + * patches/openjdk/7000225-bad_tabs.patch, + * patches/openjdk/7038711-fix_no-clobber_usage.patch: + Backports from OpenJDK 7 to bring in latest Makefile + updates. + * NEWS: Update and order backports numerically. + 2013-08-30 Andrew John Hughes * Makefile.am: diff -r de0023a3d26d -r 782a87f782f3 Makefile.am --- a/Makefile.am Sat Aug 31 17:42:12 2013 +0100 +++ b/Makefile.am Mon Sep 02 20:59:15 2013 +0100 @@ -510,7 +510,6 @@ patches/libraries.patch \ $(SPECIAL_SECURITY_PATCH_2) \ patches/uname.patch \ - patches/freetypeversion.patch \ patches/nomotif-6706121.patch \ patches/nomotif.patch \ patches/nomotif-mtoolkit.patch \ @@ -532,7 +531,6 @@ patches/jtreg-jrunscript.patch \ patches/network-unreachable.patch \ patches/dnd-filelists.patch \ - patches/disable-cc-incompatible-sanity-checks.patch \ patches/explicit-target-arch.patch \ patches/parisc.patch \ patches/policy-evaluation.patch \ @@ -752,7 +750,17 @@ patches/openjdk/8014469-tzdata2013c.patch \ patches/openjdk/8020054-tzdata2013d.patch \ patches/imageiojpeg_sync.patch \ - patches/openjdk/8005194-scale_memory_leak.patch + patches/openjdk/8005194-scale_memory_leak.patch \ + patches/openjdk/6563752-ss12_support.patch \ + patches/openjdk/6729772-opt_cleanup.patch \ + patches/openjdk/6799141-split_out_versions.patch \ + patches/freetypeversion.patch \ + patches/openjdk/6816311-compiler_name.patch \ + patches/openjdk/6974017-minorver_for_solaris.patch \ + patches/openjdk/6980281-majorver_for_solaris.patch \ + patches/openjdk/7000225-bad_tabs.patch \ + patches/openjdk/7038711-fix_no-clobber_usage.patch \ + patches/disable-cc-incompatible-sanity-checks.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ @@ -899,7 +907,6 @@ patches/ecj/spp.patch \ patches/ecj/jopt.patch \ patches/ecj/jaxp-dependency.patch \ - patches/ecj/bootver.patch \ patches/ecj/getannotation-cast.patch \ patches/ecj/override.patch \ patches/ecj/xsltproc.patch \ diff -r de0023a3d26d -r 782a87f782f3 NEWS --- a/NEWS Sat Aug 31 17:42:12 2013 +0100 +++ b/NEWS Mon Sep 02 20:59:15 2013 +0100 @@ -18,19 +18,27 @@ - PR1458: Make use of bootstrap tools & -Xbootclasspath patches optional - PR718: Backport LCMS2 support from IcedTea7 * Backports - - 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 + - S6563752: Build and test JDK7 with Sun Studio 12 Express compilers (prep makefiles) - S6631559: Registration of ImageIO plugins should not cause loading of jpeg.dlli and cmm.dll + - S6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2 - S6791502: IIOException "Invalid icc profile" on jpeg after update from JDK5 to JDK6 - S6793818: JpegImageReader is too greedy creating color profiles + - S6799141: Build with --hash-style=both so that binaries can work on SuSE 10 + - S6816311: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003 - S6888215: memory leak in jpeg plugin + - S6974017: Upgrade required Solaris Studio compilers to 5.10 (12 update 1 + patches) + - S6980281: SWAT: SwingSet2 got core dumped in Solaris-AMD64 using b107 swat build - S6989760: cmm native compiler warnings - S6989774: imageio compiler warnings in native code + - S7000225: Sanity check on sane-alsa-headers is broken - S7013519: [parfait] Integer overflows in 2D code - S7018912: [parfait] potential buffer overruns in imageio jpeg + - S7022999: Can't build with FORCE_TIERED=0 (bundled HotSpot only) + - S7038711: Fix CC_VER checks for compiler options, fix use of -Wno-clobber - S8005194: [parfait] #353 sun/awt/image/jpeg/imageioJPEG.c Memory leak of pointer 'scale' allocated with calloc() + - S8009641: OpenJDK 6 build broken via 8007675 fix - S8020983, RH976897: OutOfMemoryError caused by non garbage collected JPEGImageWriter Instances * Bug fixes - PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on armel. diff -r de0023a3d26d -r 782a87f782f3 patches/disable-cc-incompatible-sanity-checks.patch --- a/patches/disable-cc-incompatible-sanity-checks.patch Sat Aug 31 17:42:12 2013 +0100 +++ b/patches/disable-cc-incompatible-sanity-checks.patch Mon Sep 02 20:59:15 2013 +0100 @@ -1,7 +1,7 @@ diff -Nru openjdk.orig/jdk/make/common/Sanity.gmk openjdk/jdk/make/common/Sanity.gmk ---- openjdk.orig/jdk/make/common/Sanity.gmk 2009-10-01 18:31:50.000000000 +0100 -+++ openjdk/jdk/make/common/Sanity.gmk 2009-10-02 17:51:35.000000000 +0100 -@@ -92,8 +92,11 @@ +--- openjdk.orig/jdk/make/common/Sanity.gmk 2012-10-26 19:25:40.000000000 +0100 ++++ openjdk/jdk/make/common/Sanity.gmk 2013-09-02 17:26:52.257169562 +0100 +@@ -91,8 +91,11 @@ sane-ld_options \ sane-ld_run_path \ sane-alt_bootdir \ @@ -15,7 +15,7 @@ ifdef OPENJDK sanity-all:: sane-freetype -@@ -109,17 +112,21 @@ +@@ -108,17 +111,21 @@ # (Which only happens with a full control build. The control makefiles are # the files that set BUILD_MOTIF). # We cannot sanity check something that has not been built yet. @@ -42,64 +42,36 @@ # Always check hotspot binary paths even if we are building them from scratch diff -Nru openjdk.orig/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk ---- openjdk.orig/jdk/make/common/shared/Sanity.gmk 2009-10-02 17:36:09.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Sanity.gmk 2009-10-02 17:52:37.000000000 +0100 -@@ -75,9 +75,14 @@ - fi ) - endif - ifneq ($(ARCH), ia64) -- # dummy program that outputs ALSA's version (created in target sane-alsa-versioncheck) -- ALSA_VERSION_CHECK = $(TEMPDIR)/alsaversioncheck -- ALSA_VERSION = `if [ -f "$(ALSA_VERSION_CHECK)" ] ; then $(ALSA_VERSION_CHECK) ; fi` -+ ifdef CROSS_COMPILATION -+ # assume alsa version is correct and do not check it -+ ALSA_VERSION = 1.0.0 -+ else -+ # dummy program that outputs ALSA's version (created in target sane-alsa-versioncheck) -+ ALSA_VERSION_CHECK = $(TEMPDIR)/alsaversioncheck -+ ALSA_VERSION = `if [ -f "$(ALSA_VERSION_CHECK)" ] ; then $(ALSA_VERSION_CHECK) ; fi` -+ endif - endif - endif - -@@ -120,6 +125,15 @@ +--- openjdk.orig/jdk/make/common/shared/Sanity.gmk 2013-09-02 17:03:28.039330395 +0100 ++++ openjdk/jdk/make/common/shared/Sanity.gmk 2013-09-02 17:32:35.854512833 +0100 +@@ -159,6 +159,11 @@ # Get ALL_SETTINGS defined include $(JDK_MAKE_SHARED_DIR)/Sanity-Settings.gmk +ifndef CROSS_COMPILATION +MORE_PHONY_RULES = \ -+ sane-freetype \ -+ sane-cups \ -+ sane-motif \ -+ sane-alsa-versioncheck \ -+ sane-alsa-headers ++ sane-freetype +endif + .PHONY: \ sane-copyrightyear\ sane-settings \ -@@ -149,8 +163,6 @@ +@@ -187,8 +192,7 @@ sane-outputdir \ sane-alt_bootdir \ sane-bootdir \ - sane-motif \ - sane-cups \ ++ sane-cups \ sane-devtools_path \ sane-compiler_path \ sane-unixcommand_path \ -@@ -168,13 +180,11 @@ - sane-compiler \ - sane-link \ - sane-cacerts \ -- sane-alsa-versioncheck \ -- sane-alsa-headers \ - sane-ant_version \ +@@ -211,7 +215,7 @@ sane-zip_version \ sane-unzip_version \ -- sane-msvcrt_path \ + sane-msvcrt_path \ - sane-freetype -+ sane-msvcrt_path \ -+ $(MORE_PHONY_RULES) ++ $(MORE_PHONY_RULES) ###################################################### # check for COPYRIGHT_YEAR variable diff -r de0023a3d26d -r 782a87f782f3 patches/freetypeversion.patch --- a/patches/freetypeversion.patch Sat Aug 31 17:42:12 2013 +0100 +++ b/patches/freetypeversion.patch Mon Sep 02 20:59:15 2013 +0100 @@ -1,11 +1,12 @@ ---- openjdk/jdk/make/common/shared/Platform.gmk.orig -+++ openjdk/jdk/make/common/shared/Platform.gmk -@@ -94,7 +94,7 @@ - REQUIRED_BOOT_VER = 1.5 - - # If we are using freetype, this is the required version --REQUIRED_FREETYPE_VERSION=2.3.0 -+REQUIRED_FREETYPE_VERSION=2.2.1 - - # - # Prune out all known SCM (Source Code Management) directories +diff -Nru openjdk.orig/jdk/make/common/shared/Defs-versions.gmk openjdk/jdk/make/common/shared/Defs-versions.gmk +--- openjdk.orig/jdk/make/common/shared/Defs-versions.gmk 2013-09-02 15:32:33.490472903 +0100 ++++ openjdk/jdk/make/common/shared/Defs-versions.gmk 2013-09-02 15:33:00.154887749 +0100 +@@ -176,7 +176,7 @@ + # Generic + REQUIRED_ANT_VER = 1.6.3 + REQUIRED_BOOT_VER = 1.5 +-REQUIRED_FREETYPE_VERSION = 2.3.0 ++REQUIRED_FREETYPE_VERSION = 2.2.1 + REQUIRED_MAKE_VER = 3.78 + REQUIRED_UNZIP_VER = 5.12 + REQUIRED_ZIP_VER = 2.2 diff -r de0023a3d26d -r 782a87f782f3 patches/openjdk/6563752-ss12_support.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6563752-ss12_support.patch Mon Sep 02 20:59:15 2013 +0100 @@ -0,0 +1,173 @@ +# HG changeset patch +# User ohair +# Date 1212597498 25200 +# Wed Jun 04 09:38:18 2008 -0700 +# Node ID f9467b4496dc3731d73dbc5a42fd84cc9b1faaab +# Parent b6601ba7f6dfe0d93e40b2891c581c30fdd92289 +6563752: Build and test JDK7 with Sun Studio 12 Express compilers (prep makefiles) +Summary: Changes to support building with SS12. +Reviewed-by: tbell + +diff --git a/make/common/Defs-solaris.gmk b/make/common/Defs-solaris.gmk +--- openjdk/jdk/make/common/Defs-solaris.gmk ++++ openjdk/jdk/make/common/Defs-solaris.gmk +@@ -197,7 +197,6 @@ + + # Lint Flags: + # -Xa ANSI C plus K&R, favor ANSI rules +-# -Xarch=XXX Same as 'cc -xarch=XXX' + # -fd report on old style func defs + # -errchk=structarg report on 64bit struct args by value + # -errchk=longptr64 report on 64bit to 32bit issues (ignores casts) +@@ -206,6 +205,7 @@ + # -x suppress unused externs + # -u suppress extern func/vars used/defined + # -errfmt=simple use one line errors with position info ++# $(LINT_XARCH_OPTION) See Compiler-sun.gwk + + LINTFLAGS_COMMON = -Xa + LINTFLAGS_COMMON += -fd +@@ -224,42 +224,12 @@ + # Tell the compilers to never generate globalized names, all the time. + CFLAGS_COMMON += -W0,-noglobal + +-# Arch specific settings (determines type of .o files and instruction set) +-ifeq ($(ARCH_FAMILY), sparc) +- ifdef VIS_NEEDED +- XARCH_VALUE/32=v8plusa +- XARCH_VALUE/64=v9a +- else +- # Someday this should change to improve optimization on UltraSPARC +- # and abandon the old v8-only machines like the SPARCstation 10. +- # Indications with Mustang is that alacrity runs do not show a +- # big improvement using v8plus over v8, but other benchmarks might. +- XARCH_VALUE/32=v8 +- XARCH_VALUE/64=v9 +- endif +-endif +-ifeq ($(ARCH_FAMILY), i586) +- XARCH_VALUE/64=amd64 +- XARCH_VALUE/32= +-endif +- +-# Arch value based on current data model being built +-XARCH_VALUE=$(XARCH_VALUE/$(ARCH_DATA_MODEL)) +-ifneq ($(XARCH_VALUE), ) +- # The actual compiler -xarch options to use +- XARCH_OPTION/32 = -xarch=$(XARCH_VALUE/32) +- XARCH_OPTION/64 = -xarch=$(XARCH_VALUE/64) +- XARCH_OPTION = $(XARCH_OPTION/$(ARCH_DATA_MODEL)) +-endif +- +-# If we have a specific -xarch value to use, add it +-ifdef XARCH_OPTION +- CFLAGS_COMMON += $(XARCH_OPTION) +- CXXFLAGS_COMMON += $(XARCH_OPTION) +- ASFLAGS_COMMON += $(XARCH_OPTION) +- EXTRA_LIBS += $(XARCH_OPTION) +- LINTFLAGS_COMMON += -Xarch=$(XARCH_VALUE) +-endif ++# If we have a specific arch value to use, add it ++CFLAGS_COMMON += $(XARCH_OPTION) ++CXXFLAGS_COMMON += $(XARCH_OPTION) ++ASFLAGS_COMMON += $(AS_XARCH_OPTION) ++EXTRA_LIBS += $(XARCH_OPTION) ++LINTFLAGS_COMMON += $(LINT_XARCH_OPTION) + + # + # uncomment the following to build with PERTURBALOT set +diff --git a/make/common/shared/Compiler-sun.gmk b/make/common/shared/Compiler-sun.gmk +--- openjdk/jdk/make/common/shared/Compiler-sun.gmk ++++ openjdk/jdk/make/common/shared/Compiler-sun.gmk +@@ -31,6 +31,9 @@ + + # Sun Studio Compiler settings specific to Solaris + ifeq ($(PLATFORM), solaris) ++ # FIXUP: Change to SS12 when validated ++ #COMPILER_VERSION=SS12 ++ #REQUIRED_CC_VER=5.9 + COMPILER_VERSION=SS11 + REQUIRED_CC_VER=5.8 + CC = $(COMPILER_PATH)cc +@@ -51,8 +54,8 @@ + # Sun Studio Compiler settings specific to Linux + ifeq ($(PLATFORM), linux) + # This has not been tested +- COMPILER_VERSION=SS11 +- REQUIRED_CC_VER=5.8 ++ COMPILER_VERSION=SS12 ++ REQUIRED_CC_VER=5.9 + CC = $(COMPILER_PATH)cc + CPP = $(COMPILER_PATH)cc -E + CXX = $(COMPILER_PATH)CC +@@ -74,3 +77,58 @@ + _CC_VER :=$(shell $(CC) -V 2>&1 | $(HEAD) -n 1) + CC_VER :=$(call GetVersion,"$(_CC_VER)") + ++# Arch specific settings (determines type of .o files and instruction set) ++# Starting in SS12 (5.9), the arch options changed. ++# The assembler /usr/ccs/bin/as wants older SS11 (5.8) style options. ++# Note: We need to have both 32 and 64 values at all times for awt Makefiles. ++# ++XARCH_OPTION_OLD/32 = ++XARCH_OPTION_OLD/64 = ++XARCH_OPTION_NEW/32 = -m32 ++XARCH_OPTION_NEW/64 = -m64 ++# Lint options are slightly different ++LINT_XARCH_OPTION_OLD/32 = ++LINT_XARCH_OPTION_OLD/64 = ++LINT_XARCH_OPTION_NEW/32 = -m32 ++LINT_XARCH_OPTION_NEW/64 = -m64 ++ifeq ($(ARCH_FAMILY), sparc) ++ ifdef VIS_NEEDED ++ XARCH_OPTION_OLD/32 += -xarch=v8plusa ++ XARCH_OPTION_OLD/64 += -xarch=v9a ++ XARCH_OPTION_NEW/32 += -xarch=sparcvis ++ XARCH_OPTION_NEW/64 += -xarch=sparcvis ++ else ++ # Someday this should change to improve optimization on UltraSPARC ++ # and abandon v8, even change to sparcvis or sparcvis2, this ++ # abandons machines like the SPARCstation 10. ++ # Indications with jdk6 is that alacrity runs do not show a ++ # big improvement using v8plus over v8, but other benchmarks might. ++ XARCH_OPTION_OLD/32 += -xarch=v8 ++ XARCH_OPTION_OLD/64 += -xarch=v9 ++ # Note that this new option (SS12+) effectively means v8plus ++ XARCH_OPTION_NEW/32 += -xarch=sparc ++ XARCH_OPTION_NEW/64 += -xarch=sparc ++ endif ++ LINT_XARCH_OPTION_OLD/64 += -Xarch=v9 ++endif ++ifeq ($(ARCH_FAMILY), i586) ++ XARCH_OPTION_OLD/64 += -xarch=amd64 ++ LINT_XARCH_OPTION_OLD/64 += -Xarch=amd64 ++endif ++# Pick the options we want based on the compiler being used. ++ifeq ($(shell expr $(CC_VER) \>= 5.9), 1) ++ XARCH_OPTION/32 = $(XARCH_OPTION_NEW/32) ++ XARCH_OPTION/64 = $(XARCH_OPTION_NEW/64) ++ LINT_XARCH_OPTION/32 = $(LINT_XARCH_OPTION_NEW/32) ++ LINT_XARCH_OPTION/64 = $(LINT_XARCH_OPTION_NEW/64) ++else ++ XARCH_OPTION/32 = $(XARCH_OPTION_OLD/32) ++ XARCH_OPTION/64 = $(XARCH_OPTION_OLD/64) ++ LINT_XARCH_OPTION/32 = $(LINT_XARCH_OPTION_OLD/32) ++ LINT_XARCH_OPTION/64 = $(LINT_XARCH_OPTION_OLD/64) ++endif ++XARCH_OPTION = $(XARCH_OPTION/$(ARCH_DATA_MODEL)) ++LINT_XARCH_OPTION = $(LINT_XARCH_OPTION/$(ARCH_DATA_MODEL)) ++# The /usr/ccs/bin/as assembler always wants the older SS11 (5.8) options. ++AS_XARCH_OPTION = $(XARCH_OPTION_OLD/$(ARCH_DATA_MODEL)) ++ +diff --git a/make/jdk_generic_profile.sh b/make/jdk_generic_profile.sh +--- openjdk/jdk/make/jdk_generic_profile.sh ++++ openjdk/jdk/make/jdk_generic_profile.sh +@@ -119,7 +119,7 @@ + # System place where JDK installed images are stored? + jdk_instances=/usr/jdk/instances + +- # Get the SS11 compilers (and latest patches for them too) ++ # Get the Sun Studio compilers (and latest patches for them too) + if [ "${ALT_COMPILER_PATH}" = "" ] ; then + ALT_COMPILER_PATH=/opt/SUNWspro/bin + export ALT_COMPILER_PATH diff -r de0023a3d26d -r 782a87f782f3 patches/openjdk/6729772-opt_cleanup.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6729772-opt_cleanup.patch Mon Sep 02 20:59:15 2013 +0100 @@ -0,0 +1,847 @@ +# HG changeset patch +# User ohair +# Date 1217472057 25200 +# Wed Jul 30 19:40:57 2008 -0700 +# Node ID b374f6174534071d4305a91fbc2b913e7bc64396 +# Parent b7474b739d13bacd9972f88ac91f6350b7b0be12 +6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2 +Reviewed-by: tbell + +diff --git a/make/common/Defs-linux.gmk b/make/common/Defs-linux.gmk +--- openjdk/jdk/make/common/Defs-linux.gmk ++++ openjdk/jdk/make/common/Defs-linux.gmk +@@ -86,18 +86,22 @@ + # + # Default optimization + # +-CC_HIGHEST_OPT = -O3 +-CC_HIGHER_OPT = -O3 +-CC_LOWER_OPT = -O2 +-CC_NO_OPT = + +-ifeq ($(PRODUCT), java) +- _OPT = $(CC_HIGHER_OPT) +-else +- _OPT = $(CC_LOWER_OPT) +- CPPFLAGS_DBG += -DLOGGING ++ifndef OPTIMIZATION_LEVEL ++ ifeq ($(PRODUCT), java) ++ OPTIMIZATION_LEVEL = HIGHER ++ else ++ OPTIMIZATION_LEVEL = LOWER ++ endif + endif + ++CC_OPT/NONE = ++CC_OPT/LOWER = -O2 ++CC_OPT/HIGHER = -O3 ++CC_OPT/HIGHEST = -O3 ++ ++CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL)) ++ + # For all platforms, do not omit the frame pointer register usage. + # 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 +@@ -112,18 +116,6 @@ + CFLAGS_REQUIRED = $(CFLAGS_REQUIRED_$(ARCH)) + LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH)) + +-# Add in platform specific optimizations for all opt levels +-CC_HIGHEST_OPT += $(_OPT_$(ARCH)) +-CC_HIGHER_OPT += $(_OPT_$(ARCH)) +-CC_LOWER_OPT += $(_OPT_$(ARCH)) +- +-# If NO_OPTIMIZATIONS is defined in the environment, turn all optimzations off +-ifdef NO_OPTIMIZATIONS +- CC_HIGHEST_OPT = $(CC_NO_OPT) +- CC_HIGHER_OPT = $(CC_NO_OPT) +- CC_LOWER_OPT = $(CC_NO_OPT) +-endif +- + # + # Selection of warning messages + # +@@ -163,19 +155,19 @@ + endif + endif + +-CFLAGS_OPT = $(POPT) ++CFLAGS_OPT = $(CC_OPT) + CFLAGS_DBG = $(DEBUG_FLAG) + CFLAGS_COMMON += $(CFLAGS_REQUIRED) + + CXXFLAGS_COMMON = $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS) +-CXXFLAGS_OPT = $(POPT) ++CXXFLAGS_OPT = $(CC_OPT) + CXXFLAGS_DBG = $(DEBUG_FLAG) + CXXFLAGS_COMMON += $(CFLAGS_REQUIRED) + + # FASTDEBUG: Optimize the code in the -g versions, gives us a faster debug java + ifeq ($(FASTDEBUG), true) +- CFLAGS_DBG += $(CC_LOWER_OPT) +- CXXFLAGS_DBG += $(CC_LOWER_OPT) ++ CFLAGS_DBG += $(CC_OPT/LOWER) ++ CXXFLAGS_DBG += $(CC_OPT/LOWER) + endif + + CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DLINUX $(VERSION_DEFINES) \ +@@ -187,6 +179,9 @@ From ptisnovs at icedtea.classpath.org Tue Sep 3 01:09:56 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 03 Sep 2013 08:09:56 +0000 Subject: /hg/rhino-tests: Added new test testCast (that checks Class.cast... Message-ID: changeset 242771777388 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=242771777388 author: Pavel Tisnovsky date: Tue Sep 03 10:13:38 2013 +0200 Added new test testCast (that checks Class.cast() method) into test test suite SimpleBindingsClassTest. diffstat: ChangeLog | 6 + src/org/RhinoTests/SimpleBindingsClassTest.java | 198 ++++++++++++++++++++++++ 2 files changed, 204 insertions(+), 0 deletions(-) diffs (221 lines): diff -r e5840a2853aa -r 242771777388 ChangeLog --- a/ChangeLog Mon Sep 02 11:55:15 2013 +0200 +++ b/ChangeLog Tue Sep 03 10:13:38 2013 +0200 @@ -1,3 +1,9 @@ +2013-09-03 Pavel Tisnovsky + + * src/org/RhinoTests/SimpleBindingsClassTest.java: + Added new test testCast (that checks Class.cast() method) into test + test suite SimpleBindingsClassTest. + 2013-09-02 Pavel Tisnovsky * src/org/RhinoTests/SimpleScriptContextClassTest.java: diff -r e5840a2853aa -r 242771777388 src/org/RhinoTests/SimpleBindingsClassTest.java --- a/src/org/RhinoTests/SimpleBindingsClassTest.java Mon Sep 02 11:55:15 2013 +0200 +++ b/src/org/RhinoTests/SimpleBindingsClassTest.java Tue Sep 03 10:13:38 2013 +0200 @@ -1288,6 +1288,204 @@ } /** + * Test for method javax.script.SimpleBindings.getClass().cast() + */ + protected void testCast() { + try { + this.simpleBindingsClass.cast(new javax.script.SimpleBindings()); + } + catch (Exception e) { + e.printStackTrace(); + throw new AssertionError(e.getMessage()); + } + + try { + this.simpleBindingsClass.cast(new Object()); + throw new AssertionError("Class.cast(new Object()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleBindingsClass.cast(new Object().getClass()); + throw new AssertionError("Class.cast(new Object().getClass()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleBindingsClass.cast(new String()); + throw new AssertionError("Class.cast(new String()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleBindingsClass.cast(Boolean.valueOf(true)); + throw new AssertionError("Class.cast(Boolean.valueOf(true)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleBindingsClass.cast(Boolean.valueOf(false)); + throw new AssertionError("Class.cast(Boolean.valueOf(false)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleBindingsClass.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.simpleBindingsClass.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.simpleBindingsClass.cast(Integer.valueOf(42)); + throw new AssertionError("Class.cast(Integer.valueOf(42)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleBindingsClass.cast(Long.valueOf(42L)); + throw new AssertionError("Class.cast(Long.valueOf(42L)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleBindingsClass.cast(Float.valueOf(42f)); + throw new AssertionError("Class.cast(Float.valueOf(42f)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleBindingsClass.cast(Double.valueOf(42.)); + throw new AssertionError("Class.cast(Double.valueOf(42.)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleBindingsClass.cast(new Throwable()); + throw new AssertionError("Class.cast(new Throwable()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleBindingsClass.cast(new RuntimeException()); + throw new AssertionError("Class.cast(new RuntimeException()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleBindingsClass.cast(new Error()); + throw new AssertionError("Class.cast(new Error()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.simpleBindingsClass.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.simpleBindingsClass.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.simpleBindingsClass.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.simpleBindingsClass.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.simpleBindingsClass.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.simpleBindingsClass.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.simpleBindingsClass.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.simpleBindingsClass.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.simpleBindingsClass.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.SimpleBindings */ @SuppressWarnings("cast") From ptisnovs at icedtea.classpath.org Tue Sep 3 04:09:57 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 03 Sep 2013 11:09:57 +0000 Subject: /hg/gfx-test: Another six new tests added into BitBltAffineIdent... Message-ID: changeset e28aa6bfbc2e in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=e28aa6bfbc2e author: Pavel Tisnovsky date: Tue Sep 03 12:06:01 2013 +0200 Another six new tests added into BitBltAffineIdentityTransformOp. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java | 96 +++++++++- 2 files changed, 95 insertions(+), 6 deletions(-) diffs (160 lines): diff -r c91a2ba5cd29 -r e28aa6bfbc2e ChangeLog --- a/ChangeLog Mon Sep 02 11:37:29 2013 +0200 +++ b/ChangeLog Tue Sep 03 12:06:01 2013 +0200 @@ -1,3 +1,8 @@ +2013-09-03 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java: + Another six new tests added into BitBltAffineIdentityTransformOp. + 2013-09-02 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java: diff -r c91a2ba5cd29 -r e28aa6bfbc2e src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java --- a/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java Mon Sep 02 11:37:29 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java Tue Sep 03 12:06:01 2013 +0200 @@ -268,7 +268,7 @@ } /** - * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * 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 @@ -282,7 +282,7 @@ } /** - * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * 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 @@ -296,7 +296,7 @@ } /** - * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * 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 @@ -310,7 +310,7 @@ } /** - * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * 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 @@ -324,7 +324,7 @@ } /** - * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * 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 @@ -338,7 +338,7 @@ } /** - * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * 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 @@ -604,6 +604,90 @@ } /** + * Test basic BitBlt operation for empty buffered image with type TYPE_CUSTOM. + * + * @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 testBitBltEmptyBufferedImageTypeCustomIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeCustom(image, graphics2d, IdentifyTranspormationOp1); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_CUSTOM. + * + * @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 testBitBltEmptyBufferedImageTypeCustomIdentifyTranspormationOp2(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeCustom(image, graphics2d, IdentifyTranspormationOp2); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_CUSTOM. + * + * @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 testBitBltEmptyBufferedImageTypeCustomIdentifyTranspormationOp3(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeCustom(image, graphics2d, IdentifyTranspormationOp3); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_CUSTOM. + * + * @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 testBitBltEmptyBufferedImageTypeCustomIdentifyTranspormationOp4(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeCustom(image, graphics2d, IdentifyTranspormationOp4); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_CUSTOM. + * + * @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 testBitBltEmptyBufferedImageTypeCustomIdentifyTranspormationOp5(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeCustom(image, graphics2d, IdentifyTranspormationOp5); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_CUSTOM. + * + * @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 testBitBltEmptyBufferedImageTypeCustomIdentifyTranspormationOp6(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeCustom(image, graphics2d, IdentifyTranspormationOp6); + } + + /** * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. * * @param image From jvanek at redhat.com Tue Sep 3 05:00:32 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 03 Sep 2013 14:00:32 +0200 Subject: [icedtea-web] Regression after refactoring for XDG specification In-Reply-To: <201307301614.r6UGErq1009615@mail-web01.excite.co.jp> References: <201307301614.r6UGErq1009615@mail-web01.excite.co.jp> Message-ID: <5225CF60.7030902@redhat.com> On 07/30/2013 06:14 PM, Jacob Wisor wrote: > "Jiri Vanek" wrote: >> On 07/29/2013 03:00 PM, Jacob Wisor wrote: >>> "Jiri Vanek" wrote: >>>> On 07/27/2013 02:43 PM, Jiri Vanek wrote: >>>>> On 07/27/2013 01:49 AM, Jacob Wisor wrote: >>>>>> Hello, >>>>>> >>>>>> I get the following regression since the code has been refactored to conform to the XDG specification, at least on Windows, but it should apply to Un*x systems too. >>>>>> >>>>>> Exception occurred during event dispatching: >>>>>> java.lang.NullPointerException >>>>>> at net.sourceforge.jnlp.cache.CacheDirectory.getDirStructure(CacheDirect >>>>>> ory.java:56) >>>>>> at net.sourceforge.jnlp.controlpanel.CachePane.generateData(CachePane.ja >>>>>> va:360) >>>>>> at net.sourceforge.jnlp.controlpanel.CachePane.populateTable(CachePane.j >>>>>> ava:343) >>>>>> at net.sourceforge.jnlp.controlpanel.CachePane.access$500(CachePane.java >>>>>> :66) >>>>>> at net.sourceforge.jnlp.controlpanel.CachePane$8.run(CachePane.java:312) >>>>>> >>>>>> at java.awt.event.InvocationEvent.dispatch(Unknown Source) >>>>>> at java.awt.EventQueue.dispatchEventImpl(Unknown Source) >>>>>> at java.awt.EventQueue.access$400(Unknown Source) >>>>>> at java.awt.EventQueue$2.run(Unknown Source) >>>>>> at java.awt.EventQueue$2.run(Unknown Source) >>>>>> at java.security.AccessController.doPrivileged(Native Method) >>>>>> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown >>>>>> Source) >>>>>> at java.awt.EventQueue.dispatchEvent(Unknown Source) >>>>>> at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source) >>>>>> at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) >>>>>> at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) >>>>>> at java.awt.Dialog$1.run(Unknown Source) >>>>>> at java.awt.Dialog$3.run(Unknown Source) >>>>>> at java.security.AccessController.doPrivileged(Native Method) >>>>>> at java.awt.Dialog.show(Unknown Source) >>>>>> at java.awt.Component.show(Unknown Source) >>>>>> at java.awt.Component.setVisible(Unknown Source) >>>>>> at java.awt.Window.setVisible(Unknown Source) >>>>>> at java.awt.Dialog.setVisible(Unknown Source) >>>>>> at net.sourceforge.jnlp.controlpanel.CacheViewer.showCacheDialog(CacheVi >>>>>> ewer.java:149) >>>>>> at net.sourceforge.jnlp.controlpanel.TemporaryInternetFilesPanel$4.actio >>>>>> nPerformed(TemporaryInternetFilesPanel.java:206) >>>>>> at javax.swing.AbstractButton.fireActionPerformed(Unknown Source) >>>>>> at javax.swing.AbstractButton$Handler.actionPerformed(Unknown Source) >>>>>> at javax.swing.DefaultButtonModel.fireActionPerformed(Unknown Source) >>>>>> at javax.swing.DefaultButtonModel.setPressed(Unknown Source) >>>>>> at javax.swing.plaf.basic.BasicButtonListener.mouseReleased(Unknown Sour >>>>>> ce) >>>>>> at java.awt.Component.processMouseEvent(Unknown Source) >>>>>> at javax.swing.JComponent.processMouseEvent(Unknown Source) >>>>>> at java.awt.Component.processEvent(Unknown Source) >>>>>> at java.awt.Container.processEvent(Unknown Source) >>>>>> at java.awt.Component.dispatchEventImpl(Unknown Source) >>>>>> at java.awt.Container.dispatchEventImpl(Unknown Source) >>>>>> at java.awt.Component.dispatchEvent(Unknown Source) >>>>>> at java.awt.LightweightDispatcher.retargetMouseEvent(Unknown Source) >>>>>> at java.awt.LightweightDispatcher.processMouseEvent(Unknown Source) >>>>>> at java.awt.LightweightDispatcher.dispatchEvent(Unknown Source) >>>>>> at java.awt.Container.dispatchEventImpl(Unknown Source) >>>>>> at java.awt.Window.dispatchEventImpl(Unknown Source) >>>>>> at java.awt.Component.dispatchEvent(Unknown Source) >>>>>> at java.awt.EventQueue.dispatchEventImpl(Unknown Source) >>>>>> at java.awt.EventQueue.access$400(Unknown Source) >>>>>> at java.awt.EventQueue$2.run(Unknown Source) >>>>>> at java.awt.EventQueue$2.run(Unknown Source) >>>>>> at java.security.AccessController.doPrivileged(Native Method) >>>>>> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown >>>>>> Source) >>>>>> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown >>>>>> Source) >>>>>> at java.awt.EventQueue$3.run(Unknown Source) >>>>>> at java.awt.EventQueue$3.run(Unknown Source) >>>>>> at java.security.AccessController.doPrivileged(Native Method) >>>>>> at java.security.AccessControlContext$1.doIntersectionPrivilege(Unknown >>>>>> Source) >>>>>> at java.awt.EventQueue.dispatchEvent(Unknown Source) >>>>>> at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source) >>>>>> at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) >>>>>> at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source) >>>>>> at java.awt.EventDispatchThread.pumpEvents(Unknown Source) >>>>>> at java.awt.EventDispatchThread.pumpEvents(Unknown Source) >>>>>> at java.awt.EventDispatchThread.run(Unknown Source) >>>>>> >>>>>> The cause of this NullPointerException is a missing %USERPROFILE%.cacheicedtea-webcache or ~/.cache/icedtea-web/cache folder. There should be check for existance before trying to list files in this folder, if non-existent it should be created. Btw. since net.sourceforge.jnlp.cache.CacheDirectory.getDirStructure(DirectoryNode) is public, it should check the root parameter for null. >>>>>> I would have fixed this myself, but because I have not refactored the code to conform to the XDG specification, I did not want to touch it, while not knowing what to possibly touch as well and hence add perhaps even more damage. >>>>>> >>>>>> To reproduce: Delete %USERPROFILE%.cacheicedtea-webcache or ~/.cache/icedtea-web/cache and then open the cache viewer (perhaps refresh). >>>>> >>>>> Thenx for report. Gave sense. I think I will "force" the creation of ~/.cache/icedtea-web and ~/.config/icedtea-web at startup. >>>>> >>>> >>>> Ok. There was simple usecase when the directories were not esured. Fixed by this patch. >>>>> >>>>> J. >>> >>> It's almost working. Only %USERPROFILE%.cacheicedtea-web or ~/.cache/icedtea-web gets created. It is neccessary to create all parent folders too. Please note that currently IcedTea-Web's default cache folder is %USERPROFILE%.cacheicedtea-webcache ~/.cache/icedtea-web/cache. I do not know whether this is desired, since it is a kind of tautology. >>> The problem is that when NetX is run for the first time the default cache folder is already setup although it may not exist. It should get created either when setting up the cache folder on the cache tab is done or at least when the OK button is pressed, perhaps even earlier when the cache tab is selected so that opening the cache viewer does not break anything. >>> >>> + File f1 = new File(Defaults.USER_CONFIG_HOME); >>> + File f2 = new File(Defaults.USER_CACHE_HOME); >>> >>> Another nit: Please give those local variables some meaningful names like cacheDirectory and configDirectory for better readability. >> >> ook O:) >>> >>> Jacob >>> >> >> Looks like issue is a bit more widespread. What do you think now? > > Looks good. Just one other thing: > > + File f = new File(value); > + if (f.exists()) { > + if (JNLPRuntime.isDebug()) { > + System.out.println("OK: key " + key + " value: " + value + " exists"); > + } > + continue; > + } > + if (!f.mkdirs()) { > + if (JNLPRuntime.isDebug()) { > + System.out.println("ERROR: key " + key + " value: " + value + " not existed, and was NOT created"); > > This text should probably be written to stderr. > > + } > + } else { > + if (JNLPRuntime.isDebug()) { > + System.out.println("OK: key " + key + " value: " + value + " not existed, and was created"); > + } > + } > > If the folder is a file that already exists, the folder in which the folder is created is write protected or the current user has no permission to write to it, or the path is for some reason not available (e.g. failed network connectivity) this circumstance is not handled gracefully and the user is not notified that his/her configuration cannot be saved. All that a user will get is a possibly cryptic exception on stderr that some value or property cannot be saved when clicking OK. The exact same exception pops up when the .cache folder could not have been silently created and then the cache viewer is opend. This is similar to the backup problem. > Ok.Here it is. I think it is working pretty fine. The only thing I'm afraid is behaviour of some reproducers. But with some luck this check will remain silent (== passed) and so no dialogue will be raised - not even under most terrific testcases;) > This may seem as nit picking, but it actually adds greatly to the usability of the application in case of an error or unusual system configuration. > > Nevertheless, thank you for addressing this issue, so please keep up the good work. > > Regards, > Jacob -------------- next part -------------- A non-text attachment was scrubbed... Name: xdgForcingDirs3.patch Type: text/x-patch Size: 11170 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130903/93255ba4/xdgForcingDirs3.patch From jvanek at redhat.com Tue Sep 3 07:11:11 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 03 Sep 2013 16:11:11 +0200 Subject: [rfc][icedtea-web] Temporary files location chooser cleanup In-Reply-To: <201308011514.r71FE1Mr024623@mail-web02.excite.co.jp> References: <201308011514.r71FE1Mr024623@mail-web02.excite.co.jp> Message-ID: <5225EDFF.8040707@redhat.com> On 08/01/2013 05:14 PM, 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 Thank you, such an "make it looks better" contributions are more then welcomed! > > @Jiri > Please add a cs translation for the new "TIFPFileChooserChooseButton" message. It will be "Vybrat", but I prefer to sync the translations in longer time periods in bulk. > > Regards, > Jacob > > > Temporary files FileChooser cleanup.patch > > > diff -r f1eaa1ee7891 netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java > --- a/netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java > +++ b/netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java > @@ -109,10 +109,12 @@ > bLocation.addActionListener(new ActionListener() { > @Override > public void actionPerformed(ActionEvent e) { > - JFileChooser fileChooser = new JFileChooser(); > + JFileChooser fileChooser = new JFileChooser(location.getText()); Tehre maybe should be some check if the location give sense. But The jefilechooser is probably handling this. > fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); > fileChooser.setFileHidingEnabled(false); > - if (fileChooser.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) { > + fileChooser.setAcceptAllFileFilterUsed(false); Why this? Isn't selection restricted enough by JFileChooser.DIRECTORIES_ONLY ? > + fileChooser.setDialogTitle(Translator.R("TIFPLocationLabel")); > + if (fileChooser.showDialog(null, Translator.R("TIFPFileChooserChooseButton")) == JFileChooser.APPROVE_OPTION) { > // Check if we have permission to write to that location. > String result = fileChooser.getSelectedFile().getAbsolutePath(); > File dirLocation = new File(result); > @@ -242,4 +244,4 @@ > > config.setProperty(properties[2], spCacheSize.getValue().toString()); > } > -} > +} > \ No newline at end of file > diff -r f1eaa1ee7891 netx/net/sourceforge/jnlp/resources/Messages.properties > --- a/netx/net/sourceforge/jnlp/resources/Messages.properties > +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties > @@ -291,7 +292,7 @@ > CVUser=User > CVSystem=System > > -#KeyStores: see KeyStores.java > +# KeyStores: see KeyStores.java > KS=KeyStore > KSCerts=Trusted Certificates > KSJsseCerts=Trusted JSSE Certificates > @@ -461,6 +462,7 @@ > TIFPCacheSize=Set the amount of disk space for storing temporary files > TIFPDeleteFiles=Delete files > TIFPViewFiles=View files... > +TIFPFileChooserChooseButton=Choose It will be "Vybrat" > > # Control Panel - Cache Viewer > CVCPDialogTitle=Cache Viewer > diff -r f1eaa1ee7891 netx/net/sourceforge/jnlp/resources/Messages_cs.properties > --- a/netx/net/sourceforge/jnlp/resources/Messages_cs.properties > +++ b/netx/net/sourceforge/jnlp/resources/Messages_cs.properties > @@ -278,6 +278,7 @@ > CVUser=U\u017eivatel > CVSystem=Syst\u00e9m > > +# KeyStores: see KeyStores.java > KS=\u00dalo\u017ei\u0161t\u011b kl\u00ed\u010d\u016f > KSCerts=D\u016fv\u011bryhodn\u00e9 certifik\u00e1ty > KSJsseCerts=D\u016fv\u011bryhodn\u00e9 certifik\u00e1ty JSSE > diff -r f1eaa1ee7891 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 > @@ -193,9 +194,10 @@ > BOAbout=Zeigt eine Beispielanwendung. > BONosecurity=Deaktiviert die sichere Laufzeitumgebung. > BONoupdate=Deaktiviert die Pr\u00fcfung nach Aktualisierungen. > -BOHeadless=Deaktiviert Herunterladefenster, andere Benutzeroberfl\u00e4chen. > +BOHeadless=Deaktiviert Herunterladefenster und andere\n Benutzeroberfl\u00e4chen. hmhmh, this.. "andere\n Benutzeroberfl" loong space is caused by reason? Was it intentional split by "\n" or unwilling action? I would rather prefer single lines, as it is already an custom in itw properties. > BOStrict=Aktiviert die strikte Pr\u00fcfung des JNLP-Dateiformats. > BOViewer=Zeigt die Ansicht der vertrauensw\u00fcrdigen Zertifikate. > +BOXml=Verwendet einen strikten XML-Parser f\u00fcr die JNLP-Datei. > BXnofork=Keine weitere JVM erstellen. > BXclearcache=Den JNLP-Anwendungszwischenspeicher s\u00e4ubern. > BXignoreheaders=Die Pr\u00fcfung der Metadaten von Jar-Dateien auslassen. > @@ -285,6 +287,7 @@ > CVUser=Benutzer > CVSystem=System > > +# KeyStores: see KeyStores.java > KS=Schl\u00fcsselspeicher > KSCerts=Vertrauensw\u00fcrdige Zertifikate > KSJsseCerts=Vertrauensw\u00fcrdige JSSE Zertifikate > @@ -454,6 +457,7 @@ > TIFPCacheSize=Menge des Plattenplatzes zur Speicherung tempor\u00e4rer Dateien > TIFPDeleteFiles=Dateien l\u00f6schen > TIFPViewFiles=Dateien anzeigen... > +TIFPFileChooserChooseButton=Ausw\u00e4hlen > > # Control Panel - Cache Viewer > CVCPDialogTitle=Zwischenspeicheranzeige > diff -r f1eaa1ee7891 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 > @@ -196,6 +197,7 @@ > BOHeadless=Wy\u0142\u0105cza okno pobierania i inne interfejsy graficzne > BOStrict=W\u0142\u0105cza \u015bcis\u0142e sprawdzanie format pliku JNLP > BOViewer=Pokazuje podgl\u0105d zaufanych certyfikat\u00f3w > +BOXml=Stosuje \u015bcis\u0142y analizator sk\u0142adniowy XML do analizy\n pliku JNLP > BXnofork=Nie tw\u00f3rz nast\u0119pnej JVM > BXclearcache=Wyczy\u015b\u0107 pami\u0119\u0107 podr\u0119czn\u0105 aplikacji JNLP > BXignoreheaders=Pomijaj weryfikacj\u0119 nag\u0142\u00f3wk\u00f3w plik\u00f3w jar > @@ -285,6 +287,7 @@ > CVUser=U\u017cytkownik > CVSystem=System > > +# KeyStores: see KeyStores.java > KS=Baza kluczy > KSCerts=Zaufane certyfikaty > KSJsseCerts=Zaufane certyfikaty JSSE > @@ -454,6 +457,7 @@ > TIFPCacheSize=Nastaw wielko\u015b\u0107 miejsca na dysku do sk\u0142adowania plik\u00f3w tymczasowych > TIFPDeleteFiles=Usu\u0144 pliki > TIFPViewFiles=Przegl\u0105daj pliki... > +TIFPFileChooserChooseButton=Wybierz > > # Control Panel - Cache Viewer > CVCPDialogTitle=Podgl\u0105d pami\u0119ci podr\u0119cznej Thank you very much to stitch with it and sorry for nits! J. From jvanek at redhat.com Tue Sep 3 07:33:12 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 03 Sep 2013 16:33:12 +0200 Subject: [rfc][icedtea-web] Fix NPE on Applet launch due to missing AppletStub In-Reply-To: <52025B5E.7040704@redhat.com> References: <201308062112.r76LC1ae023806@mail-web01.excite.co.jp> <52025B5E.7040704@redhat.com> Message-ID: <5225F328.2030406@redhat.com> On 08/07/2013 04:36 PM, Adam Domurad wrote: > 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 > I'm o with it as it is. I'm not sure if Adam is able of push anymore, if not, I will push at the end of the week. J. From gitne at excite.co.jp Tue Sep 3 07:38:50 2013 From: gitne at excite.co.jp (=?ISO-2022-JP?B?SmFjb2IgV2lzb3I=?=) Date: Tue, 3 Sep 2013 23:38:50 +0900 Subject: =?ISO-2022-JP?B?UmU6IFtyZmNdW2ljZWR0ZWEtd2ViXSBUZW1wb3JhcnkgZmlsZXMgbG9jYXRpb24gY2hvb3NlciBjbGVhbnVw?= Message-ID: <201309031438.r83EcorB012970@mail-web03.excite.co.jp> "Jiri Vanek" wrote: > On 08/01/2013 05:14 PM, 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 > > Thank you, such an "make it looks better" contributions are more then welcomed! > > > > @Jiri > > Please add a cs translation for the new "TIFPFileChooserChooseButton" message. > > It will be "Vybrat", but I prefer to sync the translations in longer time periods in bulk. I understand. Please see further down. > > > > > > Temporary files FileChooser cleanup.patch > > > > > > diff -r f1eaa1ee7891 netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java > > --- a/netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java > > +++ b/netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java > > @@ -109,10 +109,12 @@ > > bLocation.addActionListener(new ActionListener() { > > @Override > > public void actionPerformed(ActionEvent e) { > > - JFileChooser fileChooser = new JFileChooser(); > > + JFileChooser fileChooser = new JFileChooser(location.getText()); > > Tehre maybe should be some check if the location give sense. But The jefilechooser is probably handling this. This UI code should not check the location.getText()'s value. If anyone were to blame, it should be the job of the configuration loader/saver. And, as you have mentioned correctly JFileChooser will either not get constructed when its parameter value is not a correct path or it is going to be constructed with JFileChooser's default path (e.g. "My documents" on Windows or "~" on Un*x systems). > > > fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); > > fileChooser.setFileHidingEnabled(false); > > - if (fileChooser.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) { > > + fileChooser.setAcceptAllFileFilterUsed(false); > > Why this? Isn't selection restricted enough by JFileChooser.DIRECTORIES_ONLY ? Because JFileChooser does not actually present a pure directory-chooser (like in Win32 API for example) when JFileChooser.DIRECTORIES_ONLY is set. The usual (swing) JFileChooser for files is being displayed. And, although AllFilesFilter does not present files even when selected it is simply misleading in this case. As always, the rule of thumb is to display as little UI elements as possible but enough as necessary only. > > + fileChooser.setDialogTitle(Translator.R("TIFPLocationLabel")); > > + if (fileChooser.showDialog(null, Translator.R("TIFPFileChooserChooseButton")) == JFileChooser.APPROVE_OPTION) { > > // Check if we have permission to write to that location. > > String result = fileChooser.getSelectedFile().getAbsolutePath(); > > File dirLocation = new File(result); > > @@ -242,4 +244,4 @@ > > > > config.setProperty(properties[2], spCacheSize.getValue().toString()); > > } > > -} > > +} > > No newline at end of file > > diff -r f1eaa1ee7891 netx/net/sourceforge/jnlp/resources/Messages.properties > > --- a/netx/net/sourceforge/jnlp/resources/Messages.properties > > +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties > > @@ -291,7 +292,7 @@ > > CVUser=User > > CVSystem=System > > > > -#KeyStores: see KeyStores.java > > +# KeyStores: see KeyStores.java > > KS=KeyStore > > KSCerts=Trusted Certificates > > KSJsseCerts=Trusted JSSE Certificates > > @@ -461,6 +462,7 @@ > > TIFPCacheSize=Set the amount of disk space for storing temporary files > > TIFPDeleteFiles=Delete files > > TIFPViewFiles=View files... > > +TIFPFileChooserChooseButton=Choose > > > It will be "Vybrat" Thank you, I am going to add this since it is no big issue. > > # Control Panel - Cache Viewer > > CVCPDialogTitle=Cache Viewer > > diff -r f1eaa1ee7891 netx/net/sourceforge/jnlp/resources/Messages_cs.properties > > --- a/netx/net/sourceforge/jnlp/resources/Messages_cs.properties > > +++ b/netx/net/sourceforge/jnlp/resources/Messages_cs.properties > > @@ -278,6 +278,7 @@ > > CVUser=Uu017eivatel > > CVSystem=Systu00e9m > > > > +# KeyStores: see KeyStores.java > > KS=u00dalou017eiu0161tu011b klu00edu010du016f > > KSCerts=Du016fvu011bryhodnu00e9 certifiku00e1ty > > KSJsseCerts=Du016fvu011bryhodnu00e9 certifiku00e1ty JSSE > > diff -r f1eaa1ee7891 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 > > @@ -193,9 +194,10 @@ > > BOAbout=Zeigt eine Beispielanwendung. > > BONosecurity=Deaktiviert die sichere Laufzeitumgebung. > > BONoupdate=Deaktiviert die Pru00fcfung nach Aktualisierungen. > > -BOHeadless=Deaktiviert Herunterladefenster, andere Benutzeroberflu00e4chen. > > +BOHeadless=Deaktiviert Herunterladefenster und anderen Benutzeroberflu00e4chen. > > > hmhmh, this.. "anderen Benutzeroberfl" loong space is caused by reason? Was it intentional split by "n" or unwilling action? > I would rather prefer single lines, as it is already an custom in itw properties. The reason for adding those spaces is because these messages are meant or supposed to be limited to 72 or 80 (don't recall the exact number while writing this email anymore) chars, but some do not fit this limit and have to be extended nicely. It simply looks cleaner when long messages are wrapped manually on that boundry instead of bluntly continuing without perhaps proper hyphenation. > > BOStrict=Aktiviert die strikte Pru00fcfung des JNLP-Dateiformats. > > BOViewer=Zeigt die Ansicht der vertrauenswu00fcrdigen Zertifikate. > > +BOXml=Verwendet einen strikten XML-Parser fu00fcr die JNLP-Datei. > > BXnofork=Keine weitere JVM erstellen. > > BXclearcache=Den JNLP-Anwendungszwischenspeicher su00e4ubern. > > BXignoreheaders=Die Pru00fcfung der Metadaten von Jar-Dateien auslassen. > > @@ -285,6 +287,7 @@ > > CVUser=Benutzer > > CVSystem=System > > > > +# KeyStores: see KeyStores.java > > KS=Schlu00fcsselspeicher > > KSCerts=Vertrauenswu00fcrdige Zertifikate > > KSJsseCerts=Vertrauenswu00fcrdige JSSE Zertifikate > > @@ -454,6 +457,7 @@ > > TIFPCacheSize=Menge des Plattenplatzes zur Speicherung temporu00e4rer Dateien > > TIFPDeleteFiles=Dateien lu00f6schen > > TIFPViewFiles=Dateien anzeigen... > > +TIFPFileChooserChooseButton=Auswu00e4hlen > > > > # Control Panel - Cache Viewer > > CVCPDialogTitle=Zwischenspeicheranzeige > > diff -r f1eaa1ee7891 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 > > @@ -196,6 +197,7 @@ > > BOHeadless=Wyu0142u0105cza okno pobierania i inne interfejsy graficzne > > BOStrict=Wu0142u0105cza u015bcisu0142e sprawdzanie format pliku JNLP > > BOViewer=Pokazuje podglu0105d zaufanych certyfikatu00f3w > > +BOXml=Stosuje u015bcisu0142y analizator sku0142adniowy XML do analizyn pliku JNLP > > BXnofork=Nie twu00f3rz nastu0119pnej JVM > > BXclearcache=Wyczyu015bu0107 pamiu0119u0107 podru0119cznu0105 aplikacji JNLP > > BXignoreheaders=Pomijaj weryfikacju0119 nagu0142u00f3wku00f3w pliku00f3w jar > > @@ -285,6 +287,7 @@ > > CVUser=Uu017cytkownik > > CVSystem=System > > > > +# KeyStores: see KeyStores.java > > KS=Baza kluczy > > KSCerts=Zaufane certyfikaty > > KSJsseCerts=Zaufane certyfikaty JSSE > > @@ -454,6 +457,7 @@ > > TIFPCacheSize=Nastaw wielkou015bu0107 miejsca na dysku do sku0142adowania pliku00f3w tymczasowych > > TIFPDeleteFiles=Usuu0144 pliki > > TIFPViewFiles=Przeglu0105daj pliki... > > +TIFPFileChooserChooseButton=Wybierz > > > > # Control Panel - Cache Viewer > > CVCPDialogTitle=Podglu0105d pamiu0119ci podru0119cznej > > Thank you very much to stitch with it and sorry for nits! No problem and thank you for reviewing. After all, I will take this as a "yes to push". Regards, Jacob From jvanek at redhat.com Tue Sep 3 07:53:53 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 03 Sep 2013 16:53:53 +0200 Subject: [rfc][icedtea-web] PR1271, Handle 'javascript:' urls, with tests In-Reply-To: <520153AC.1010000@redhat.com> References: <520153AC.1010000@redhat.com> Message-ID: <5225F801.4070001@redhat.com> Moreover ok, except one improvement. On 08/06/2013 09:51 PM, 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 > > > JavascriptURLProtocol.patch > > > diff --git a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > @@ -115,6 +115,7 @@ import net.sourceforge.jnlp.security.app > 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 @@ public class PluginAppletViewer extends > 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; > + } This seems to me a bit redundant. I would rather see this in handler. See below > try { > Long reference = getRequestIdentifier(); > write("reference " + reference + " LoadURL " + UrlUtil.encode(url.toString(), "UTF-8") + " " + target); > diff --git a/plugin/icedteanp/java/sun/applet/PluginMain.java b/plugin/icedteanp/java/sun/applet/PluginMain.java > --- a/plugin/icedteanp/java/sun/applet/PluginMain.java > +++ b/plugin/icedteanp/java/sun/applet/PluginMain.java > @@ -66,11 +66,15 @@ import java.io.File; > 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,24 @@ public class PluginMain { > // 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()); As we are installing handler here, maybe we can install not-so-dummy one, but extend sun.net.www.protocol.http.Handler to handle the String evalString = url.toString().substring("javascript:".length()); more "inside" But maybe it is not (easily) possible. > + } catch (Exception e) { > + PluginDebug.debug("Unable to install 'javascript:' URL protocol handler!"); > + } > + } > + > /** > * The main entry point into AppletViewer. > */ > @@ -99,6 +121,8 @@ public class PluginMain { > 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 --git a/tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.html b/tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.html > new file mode 100644 > --- /dev/null > +++ b/tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.html > @@ -0,0 +1,50 @@ > + > + > + > + > + + id = "applet" > + code = "JavascriptProtocol.class" > + archive = "JavascriptURLProtocol.jar"> > + > + > + > + > diff --git a/tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.js b/tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.js > new file mode 100644 > --- /dev/null > +++ b/tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.js > @@ -0,0 +1,6 @@ > +var applet = document.getElementById('applet') > + > +function runSomeJS() { > + applet.print("Javascript URL string was evaluated.") > + applet.state = "HasRun"; > +} > diff --git a/tests/reproducers/simple/JavascriptURLProtocol/srcs/JavascriptProtocol.java b/tests/reproducers/simple/JavascriptURLProtocol/srcs/JavascriptProtocol.java > new file mode 100644 > --- /dev/null > +++ b/tests/reproducers/simple/JavascriptURLProtocol/srcs/JavascriptProtocol.java > @@ -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 --git a/tests/reproducers/simple/JavascriptURLProtocol/testcases/JavascriptProtocolTest.java b/tests/reproducers/simple/JavascriptURLProtocol/testcases/JavascriptProtocolTest.java > new file mode 100644 > --- /dev/null > +++ b/tests/reproducers/simple/JavascriptURLProtocol/testcases/JavascriptProtocolTest.java > @@ -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 jvanek at redhat.com Tue Sep 3 08:06:50 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 03 Sep 2013 17:06:50 +0200 Subject: [rfc][icedtea-web] Temporary files location chooser cleanup In-Reply-To: <201309031438.r83EcorB012970@mail-web03.excite.co.jp> References: <201309031438.r83EcorB012970@mail-web03.excite.co.jp> Message-ID: <5225FB0A.4080504@redhat.com> On 09/03/2013 04:38 PM, Jacob Wisor wrote: > "Jiri Vanek" wrote: >> On 08/01/2013 05:14 PM, 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 >> >> Thank you, such an "make it looks better" contributions are more then welcomed! >>> >>> @Jiri >>> Please add a cs translation for the new "TIFPFileChooserChooseButton" message. >> >> It will be "Vybrat", but I prefer to sync the translations in longer time periods in bulk. > > I understand. Please see further down. > >>> >>> >>> Temporary files FileChooser cleanup.patch >>> >>> >>> diff -r f1eaa1ee7891 netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java >>> --- a/netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java >>> +++ b/netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java >>> @@ -109,10 +109,12 @@ >>> bLocation.addActionListener(new ActionListener() { >>> @Override >>> public void actionPerformed(ActionEvent e) { >>> - JFileChooser fileChooser = new JFileChooser(); >>> + JFileChooser fileChooser = new JFileChooser(location.getText()); >> >> Tehre maybe should be some check if the location give sense. But The jefilechooser is probably handling this. > > This UI code should not check the location.getText()'s value. If anyone were to blame, it should be the job of the configuration loader/saver. And, as you have mentioned correctly JFileChooser will either not get constructed when its parameter value is not a correct path or it is going to be constructed with JFileChooser's default path (e.g. "My documents" on Windows or "~" on Un*x systems). > >> >>> fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); >>> fileChooser.setFileHidingEnabled(false); >>> - if (fileChooser.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) { >>> + fileChooser.setAcceptAllFileFilterUsed(false); >> >> Why this? Isn't selection restricted enough by JFileChooser.DIRECTORIES_ONLY ? > > Because JFileChooser does not actually present a pure directory-chooser (like in Win32 API for example) when JFileChooser.DIRECTORIES_ONLY is set. The usual (swing) JFileChooser for files is being displayed. And, although AllFilesFilter does not present files even when selected it is simply misleading in this case. As always, the rule of thumb is to display as little UI elements as possible but enough as necessary only. > >>> + fileChooser.setDialogTitle(Translator.R("TIFPLocationLabel")); >>> + if (fileChooser.showDialog(null, Translator.R("TIFPFileChooserChooseButton")) == JFileChooser.APPROVE_OPTION) { >>> // Check if we have permission to write to that location. >>> String result = fileChooser.getSelectedFile().getAbsolutePath(); >>> File dirLocation = new File(result); >>> @@ -242,4 +244,4 @@ >>> >>> config.setProperty(properties[2], spCacheSize.getValue().toString()); >>> } >>> -} >>> +} >>> No newline at end of file >>> diff -r f1eaa1ee7891 netx/net/sourceforge/jnlp/resources/Messages.properties >>> --- a/netx/net/sourceforge/jnlp/resources/Messages.properties >>> +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties >>> @@ -291,7 +292,7 @@ >>> CVUser=User >>> CVSystem=System >>> >>> -#KeyStores: see KeyStores.java >>> +# KeyStores: see KeyStores.java >>> KS=KeyStore >>> KSCerts=Trusted Certificates >>> KSJsseCerts=Trusted JSSE Certificates >>> @@ -461,6 +462,7 @@ >>> TIFPCacheSize=Set the amount of disk space for storing temporary files >>> TIFPDeleteFiles=Delete files >>> TIFPViewFiles=View files... >>> +TIFPFileChooserChooseButton=Choose >> >> >> It will be "Vybrat" > > Thank you, I am going to add this since it is no big issue. > >>> # Control Panel - Cache Viewer >>> CVCPDialogTitle=Cache Viewer >>> diff -r f1eaa1ee7891 netx/net/sourceforge/jnlp/resources/Messages_cs.properties >>> --- a/netx/net/sourceforge/jnlp/resources/Messages_cs.properties >>> +++ b/netx/net/sourceforge/jnlp/resources/Messages_cs.properties >>> @@ -278,6 +278,7 @@ >>> CVUser=Uu017eivatel >>> CVSystem=Systu00e9m >>> >>> +# KeyStores: see KeyStores.java >>> KS=u00dalou017eiu0161tu011b klu00edu010du016f >>> KSCerts=Du016fvu011bryhodnu00e9 certifiku00e1ty >>> KSJsseCerts=Du016fvu011bryhodnu00e9 certifiku00e1ty JSSE >>> diff -r f1eaa1ee7891 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 >>> @@ -193,9 +194,10 @@ >>> BOAbout=Zeigt eine Beispielanwendung. >>> BONosecurity=Deaktiviert die sichere Laufzeitumgebung. >>> BONoupdate=Deaktiviert die Pru00fcfung nach Aktualisierungen. >>> -BOHeadless=Deaktiviert Herunterladefenster, andere Benutzeroberflu00e4chen. >>> +BOHeadless=Deaktiviert Herunterladefenster und anderen Benutzeroberflu00e4chen. >> >> >> hmhmh, this.. "anderen Benutzeroberfl" loong space is caused by reason? Was it intentional split by "n" or unwilling action? >> I would rather prefer single lines, as it is already an custom in itw properties. > > The reason for adding those spaces is because these messages are meant or supposed to be limited to 72 or 80 (don't recall the exact number while writing this email anymore) chars, but some do not fit this limit and have to be extended nicely. It simply looks cleaner when long messages are wrapped manually on that boundry instead of bluntly continuing without perhaps proper hyphenation. > >>> BOStrict=Aktiviert die strikte Pru00fcfung des JNLP-Dateiformats. >>> BOViewer=Zeigt die Ansicht der vertrauenswu00fcrdigen Zertifikate. >>> +BOXml=Verwendet einen strikten XML-Parser fu00fcr die JNLP-Datei. >>> BXnofork=Keine weitere JVM erstellen. >>> BXclearcache=Den JNLP-Anwendungszwischenspeicher su00e4ubern. >>> BXignoreheaders=Die Pru00fcfung der Metadaten von Jar-Dateien auslassen. >>> @@ -285,6 +287,7 @@ >>> CVUser=Benutzer >>> CVSystem=System >>> >>> +# KeyStores: see KeyStores.java >>> KS=Schlu00fcsselspeicher >>> KSCerts=Vertrauenswu00fcrdige Zertifikate >>> KSJsseCerts=Vertrauenswu00fcrdige JSSE Zertifikate >>> @@ -454,6 +457,7 @@ >>> TIFPCacheSize=Menge des Plattenplatzes zur Speicherung temporu00e4rer Dateien >>> TIFPDeleteFiles=Dateien lu00f6schen >>> TIFPViewFiles=Dateien anzeigen... >>> +TIFPFileChooserChooseButton=Auswu00e4hlen >>> >>> # Control Panel - Cache Viewer >>> CVCPDialogTitle=Zwischenspeicheranzeige >>> diff -r f1eaa1ee7891 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 >>> @@ -196,6 +197,7 @@ >>> BOHeadless=Wyu0142u0105cza okno pobierania i inne interfejsy graficzne >>> BOStrict=Wu0142u0105cza u015bcisu0142e sprawdzanie format pliku JNLP >>> BOViewer=Pokazuje podglu0105d zaufanych certyfikatu00f3w >>> +BOXml=Stosuje u015bcisu0142y analizator sku0142adniowy XML do analizyn pliku JNLP >>> BXnofork=Nie twu00f3rz nastu0119pnej JVM >>> BXclearcache=Wyczyu015bu0107 pamiu0119u0107 podru0119cznu0105 aplikacji JNLP >>> BXignoreheaders=Pomijaj weryfikacju0119 nagu0142u00f3wku00f3w pliku00f3w jar >>> @@ -285,6 +287,7 @@ >>> CVUser=Uu017cytkownik >>> CVSystem=System >>> >>> +# KeyStores: see KeyStores.java >>> KS=Baza kluczy >>> KSCerts=Zaufane certyfikaty >>> KSJsseCerts=Zaufane certyfikaty JSSE >>> @@ -454,6 +457,7 @@ >>> TIFPCacheSize=Nastaw wielkou015bu0107 miejsca na dysku do sku0142adowania pliku00f3w tymczasowych >>> TIFPDeleteFiles=Usuu0144 pliki >>> TIFPViewFiles=Przeglu0105daj pliki... >>> +TIFPFileChooserChooseButton=Wybierz >>> >>> # Control Panel - Cache Viewer >>> CVCPDialogTitle=Podglu0105d pamiu0119ci podru0119cznej >> >> Thank you very much to stitch with it and sorry for nits! > > No problem and thank you for reviewing. After all, I will take this as a "yes to push". Please post final version of patch to this list. (with "Vvybrat") and with not-splitted lines. Unless you heavily insists. But I would rather stay with "as is properties style" Otherwise I'm happy with patch. J. From andrew at icedtea.classpath.org Tue Sep 3 16:13:37 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 03 Sep 2013 23:13:37 +0000 Subject: /hg/release/icedtea6-1.11: 10 new changesets Message-ID: changeset 2ef554b75510 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=2ef554b75510 author: Andrew John Hughes date: Tue Sep 03 15:27:53 2013 +0100 Fix .hgignore not to hide patches and add missing ones. 2013-02-17 Andrew John Hughes * .hgignore: Fix so the cacao patches directory isn't hidden. changeset c8b86d52aabc in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=c8b86d52aabc author: Andrew John Hughes date: Tue Sep 03 15:52:04 2013 +0100 Add backport for HotSpot suggested by Xerxes. 2013-03-26 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new backport. * patches/openjdk/6840152-jvm_crashes_with_heavyweight_monitors.patch: Backport suggested by Xerxes for hs20. changeset ec88ef4eca25 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=ec88ef4eca25 author: Andrew John Hughes date: Tue Sep 03 17:10:47 2013 +0100 S7022999: Can't build with FORCE_TIERED=0. 2013-04-26 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new backport. * NEWS: Updated. * patches/hotspot/original/7022999-fastlocking_compiler1_only.patch: Backport fix to make Zero build work following 6840152. changeset 1efdc95c9ae0 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=1efdc95c9ae0 author: Xerxes Ranby date: Tue Sep 03 18:10:04 2013 +0100 PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on armel. 2013-05-28 Xerxes Ranby PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on armel. * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (POPF1): The POPF1 macro used wrong destination register r0 instead of r1 on ARM armel causing issues with the frem bytecode. The frem bytecode was the only bytecode using the defect macro. * NEWS: Updated. changeset c93101925a2e in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=c93101925a2e author: Andrew John Hughes date: Tue Sep 03 18:35:49 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 44c41a07b14d in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=44c41a07b14d author: Andrew John Hughes date: Tue Sep 03 18:37:53 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 ab73a2646f3c in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=ab73a2646f3c author: Andrew John Hughes date: Tue Sep 03 18:39:49 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 3c193afea5f3 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=3c193afea5f3 author: Andrew John Hughes date: Tue Sep 03 18:43: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. changeset 222321136c48 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=222321136c48 author: Andrew John Hughes date: Tue Sep 03 20:08:26 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. changeset 88ad9f715193 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=88ad9f715193 author: Andrew John Hughes date: Wed Sep 04 00:13:08 2013 +0100 Backport various Makefile changes so -Wno-clobbered is only used with GCC >= 4.3. S6563752: Build and test JDK7 with Sun Studio 12 Express compilers (prep makefiles) S6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2 S6799141: Build with --hash-style=both so that binaries can work on SuSE 10 S6816311: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003 S6974017: Upgrade required Solaris Studio compilers to 5.10 (12 update 1 + patches) S6980281: SWAT: SwingSet2 got core dumped in Solaris-AMD64 using b107 swat build S7000225: Sanity check on sane-alsa-headers is broken S7038711: Fix CC_VER checks for compiler options, fix use of -Wno-clobber 2013-09-02 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new backports. Move disable-cc-incompatible-sanity-checks and freetypeversion to the end. * patches/disable-cc-incompatible-sanity-checks.patch, * patches/freetypeversion.patch: Regenerated to work after new backports. * patches/openjdk/6563752-ss12_support.patch, * patches/openjdk/6729772-opt_cleanup.patch, * patches/openjdk/6799141-split_out_versions.patch, * patches/openjdk/6816311-compiler_name.patch, * patches/openjdk/6974017-minorver_for_solaris.patch, * patches/openjdk/6980281-majorver_for_solaris.patch, * patches/openjdk/7000225-bad_tabs.patch, * patches/openjdk/7038711-fix_no-clobber_usage.patch: Backports from OpenJDK 7 to bring in latest Makefile updates. * NEWS: Update and order backports numerically. diffstat: .hgignore | 7 +- ChangeLog | 110 + Makefile.am | 38 +- NEWS | 25 + arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 2 +- patches/disable-cc-incompatible-sanity-checks.patch | 54 +- patches/freetypeversion.patch | 23 +- patches/imageiojpeg_sync.patch | 217 ++ patches/libraries.patch | 176 +- patches/openjdk/4893408-jpegreader_byte_gray.patch | 747 ++++++++ patches/openjdk/6563752-ss12_support.patch | 173 + patches/openjdk/6631559-dont_load_libjpeg_to_register_imageio_plugins.patch | 562 ++++++ patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch | 24 + patches/openjdk/6636370-appcontext_simplification.patch | 178 + patches/openjdk/6729772-opt_cleanup.patch | 847 +++++++++ patches/openjdk/6791502-invalid_icc_profile.patch | 269 ++ patches/openjdk/6793818-jpegimagereader_too_greedy.patch | 228 ++ patches/openjdk/6799141-split_out_versions.patch | 915 ++++++++++ patches/openjdk/6816311-compiler_name.patch | 417 ++++ patches/openjdk/6840152-jvm_crashes_with_heavyweight_monitors.patch | 32 + patches/openjdk/6888215-jpeg_memory_leak.patch | 56 + patches/openjdk/6893617-cnctx_always_uses_default_orb.patch | 234 ++ patches/openjdk/6974017-minorver_for_solaris.patch | 24 + patches/openjdk/6980281-majorver_for_solaris.patch | 66 + patches/openjdk/6989760-native_warnings.patch | 42 + patches/openjdk/6989774-imageio_compiler_warnings.patch | 649 +++++++ patches/openjdk/7000225-bad_tabs.patch | 48 + patches/openjdk/7013519-integer_overflows.patch | 17 + patches/openjdk/7018912-potential_buffer_overruns_in_jpeg.patch | 21 + patches/openjdk/7022999-fastlocking_compiler1_only.patch | 25 + patches/openjdk/7038711-fix_no-clobber_usage.patch | 125 + patches/openjdk/7196533-timezone_bottleneck.patch | 66 + patches/openjdk/8005194-scale_memory_leak.patch | 25 + 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 +++ patches/openjdk/8020983-outofmemoryerror_jpegimagewriter.patch | 320 +++ 38 files changed, 7241 insertions(+), 208 deletions(-) diffs (truncated from 8181 to 500 lines): diff -r 898aa9174be7 -r 88ad9f715193 .hgignore --- a/.hgignore Wed Jul 10 21:24:54 2013 +0100 +++ b/.hgignore Wed Sep 04 00:13:08 2013 +0100 @@ -4,10 +4,6 @@ missing aclocal.m4 autom4te.cache -cacao -netbeans -visualvm -bootstrap build debian lib @@ -52,3 +48,6 @@ syntax: regexp ^openjdk +^cacao +^bootstrap +^jamvm diff -r 898aa9174be7 -r 88ad9f715193 ChangeLog --- a/ChangeLog Wed Jul 10 21:24:54 2013 +0100 +++ b/ChangeLog Wed Sep 04 00:13:08 2013 +0100 @@ -1,3 +1,113 @@ +2013-09-02 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new backports. Move + disable-cc-incompatible-sanity-checks and freetypeversion + to the end. + * patches/disable-cc-incompatible-sanity-checks.patch, + * patches/freetypeversion.patch: + Regenerated to work after new backports. + * patches/openjdk/6563752-ss12_support.patch, + * patches/openjdk/6729772-opt_cleanup.patch, + * patches/openjdk/6799141-split_out_versions.patch, + * patches/openjdk/6816311-compiler_name.patch, + * patches/openjdk/6974017-minorver_for_solaris.patch, + * patches/openjdk/6980281-majorver_for_solaris.patch, + * patches/openjdk/7000225-bad_tabs.patch, + * patches/openjdk/7038711-fix_no-clobber_usage.patch: + Backports from OpenJDK 7 to bring in latest Makefile + updates. + * NEWS: Update and order backports numerically. + +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: + (ICEDTEA_PATCHES): Add new timezone data patches. + * patches/openjdk/8014469-tzdata2013c.patch, + * patches/openjdk/8020054-tzdata2013d.patch: + Latest tzdata updates. + +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-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-05-28 Xerxes R??nby + + PR1188: ASM Interpreter and Thumb2 JIT javac miscompile + modulo reminder on armel. + * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S + (POPF1): The POPF1 macro used wrong destination register + r0 instead of r1 on ARM armel causing issues with the frem bytecode. + The frem bytecode was the only bytecode using the defect macro. + * NEWS: Updated. + +2013-04-26 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new backport. + * NEWS: Updated. + * patches/hotspot/original/7022999-fastlocking_compiler1_only.patch: + Backport fix to make Zero build work following + 6840152. + +2013-03-26 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new backport. + * patches/openjdk/6840152-jvm_crashes_with_heavyweight_monitors.patch: + Backport suggested by Xerxes for hs20. + +2013-02-17 Andrew John Hughes + + * .hgignore: Fix so the cacao patches directory + isn't hidden. + 2013-07-10 Andrew John Hughes * configure.ac: Set to 1.11.13pre. diff -r 898aa9174be7 -r 88ad9f715193 Makefile.am --- a/Makefile.am Wed Jul 10 21:24:54 2013 +0100 +++ b/Makefile.am Wed Sep 04 00:13:08 2013 +0100 @@ -424,6 +424,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 \ @@ -441,7 +451,6 @@ patches/lcms.patch \ patches/print_lsb_release.patch \ patches/uname.patch \ - patches/freetypeversion.patch \ patches/nomotif-6706121.patch \ patches/nomotif.patch \ patches/nomotif-mtoolkit.patch \ @@ -468,7 +477,6 @@ patches/jtreg-jrunscript.patch \ patches/network-unreachable.patch \ patches/dnd-filelists.patch \ - patches/disable-cc-incompatible-sanity-checks.patch \ patches/explicit-target-arch.patch \ patches/openjdk/7019808-stack_noexec.patch \ patches/parisc.patch \ @@ -630,7 +638,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 \ @@ -651,8 +659,27 @@ 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/8014469-tzdata2013c.patch \ + patches/openjdk/8020054-tzdata2013d.patch \ + patches/openjdk/6840152-jvm_crashes_with_heavyweight_monitors.patch \ + patches/openjdk/7022999-fastlocking_compiler1_only.patch \ + patches/openjdk/7196533-timezone_bottleneck.patch \ + patches/openjdk/6636370-appcontext_simplification.patch \ + patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch \ + patches/openjdk/6893617-cnctx_always_uses_default_orb.patch \ + patches/imageiojpeg_sync.patch \ + patches/openjdk/8005194-scale_memory_leak.patch \ + patches/openjdk/6563752-ss12_support.patch \ + patches/openjdk/6729772-opt_cleanup.patch \ + patches/openjdk/6799141-split_out_versions.patch \ + patches/freetypeversion.patch \ + patches/openjdk/6816311-compiler_name.patch \ + patches/openjdk/6974017-minorver_for_solaris.patch \ + patches/openjdk/6980281-majorver_for_solaris.patch \ + patches/openjdk/7000225-bad_tabs.patch \ + patches/openjdk/7038711-fix_no-clobber_usage.patch \ + patches/disable-cc-incompatible-sanity-checks.patch if WITH_RHINO ICEDTEA_PATCHES += \ @@ -708,7 +735,6 @@ patches/ecj/spp.patch \ patches/ecj/jopt.patch \ patches/ecj/jaxp-dependency.patch \ - patches/ecj/bootver.patch \ patches/ecj/getannotation-cast.patch \ patches/ecj/override.patch \ patches/ecj/xsltproc.patch \ diff -r 898aa9174be7 -r 88ad9f715193 NEWS --- a/NEWS Wed Jul 10 21:24:54 2013 +0100 +++ b/NEWS Wed Sep 04 00:13:08 2013 +0100 @@ -13,6 +13,31 @@ New in release 1.11.13 (2013-XX-XX): +* Backports + - S4893408: JPEGReader throws IllegalArgException when setting the destination to BYTE_GRAY + - S6563752: Build and test JDK7 with Sun Studio 12 Express compilers (prep makefiles) + - S6631559: Registration of ImageIO plugins should not cause loading of jpeg.dlli and cmm.dll + - S6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2 + - S6791502: IIOException "Invalid icc profile" on jpeg after update from JDK5 to JDK6 + - S6793818: JpegImageReader is too greedy creating color profiles + - S6799141: Build with --hash-style=both so that binaries can work on SuSE 10 + - S6816311: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003 + - S6840152: JVM crashes when heavyweight monitors are used + - S6888215: memory leak in jpeg plugin + - S6974017: Upgrade required Solaris Studio compilers to 5.10 (12 update 1 + patches) + - S6980281: SWAT: SwingSet2 got core dumped in Solaris-AMD64 using b107 swat build + - S6989760: cmm native compiler warnings + - S6989774: imageio compiler warnings in native code + - S7000225: Sanity check on sane-alsa-headers is broken + - S7013519: [parfait] Integer overflows in 2D code + - S7018912: [parfait] potential buffer overruns in imageio jpeg + - S7022999: Can't build with FORCE_TIERED=0 + - S7038711: Fix CC_VER checks for compiler options, fix use of -Wno-clobber + - 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. + New in release 1.11.12 (2013-07-10): * Security fixes diff -r 898aa9174be7 -r 88ad9f715193 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Wed Jul 10 21:24:54 2013 +0100 +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Wed Sep 04 00:13:08 2013 +0100 @@ -345,7 +345,7 @@ flds s1, [stack, #4] add stack, #4 #else - POP r0 + POP r1 #endif .endm diff -r 898aa9174be7 -r 88ad9f715193 patches/disable-cc-incompatible-sanity-checks.patch --- a/patches/disable-cc-incompatible-sanity-checks.patch Wed Jul 10 21:24:54 2013 +0100 +++ b/patches/disable-cc-incompatible-sanity-checks.patch Wed Sep 04 00:13:08 2013 +0100 @@ -1,7 +1,7 @@ diff -Nru openjdk.orig/jdk/make/common/Sanity.gmk openjdk/jdk/make/common/Sanity.gmk ---- openjdk.orig/jdk/make/common/Sanity.gmk 2009-10-01 18:31:50.000000000 +0100 -+++ openjdk/jdk/make/common/Sanity.gmk 2009-10-02 17:51:35.000000000 +0100 -@@ -92,8 +92,11 @@ +--- openjdk.orig/jdk/make/common/Sanity.gmk 2012-10-26 19:25:40.000000000 +0100 ++++ openjdk/jdk/make/common/Sanity.gmk 2013-09-02 17:26:52.257169562 +0100 +@@ -91,8 +91,11 @@ sane-ld_options \ sane-ld_run_path \ sane-alt_bootdir \ @@ -15,7 +15,7 @@ ifdef OPENJDK sanity-all:: sane-freetype -@@ -109,17 +112,21 @@ +@@ -108,17 +111,21 @@ # (Which only happens with a full control build. The control makefiles are # the files that set BUILD_MOTIF). # We cannot sanity check something that has not been built yet. @@ -42,64 +42,36 @@ # Always check hotspot binary paths even if we are building them from scratch diff -Nru openjdk.orig/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk ---- openjdk.orig/jdk/make/common/shared/Sanity.gmk 2009-10-02 17:36:09.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Sanity.gmk 2009-10-02 17:52:37.000000000 +0100 -@@ -75,9 +75,14 @@ - fi ) - endif - ifneq ($(ARCH), ia64) -- # dummy program that outputs ALSA's version (created in target sane-alsa-versioncheck) -- ALSA_VERSION_CHECK = $(TEMPDIR)/alsaversioncheck -- ALSA_VERSION = `if [ -f "$(ALSA_VERSION_CHECK)" ] ; then $(ALSA_VERSION_CHECK) ; fi` -+ ifdef CROSS_COMPILATION -+ # assume alsa version is correct and do not check it -+ ALSA_VERSION = 1.0.0 -+ else -+ # dummy program that outputs ALSA's version (created in target sane-alsa-versioncheck) -+ ALSA_VERSION_CHECK = $(TEMPDIR)/alsaversioncheck -+ ALSA_VERSION = `if [ -f "$(ALSA_VERSION_CHECK)" ] ; then $(ALSA_VERSION_CHECK) ; fi` -+ endif - endif - endif - -@@ -120,6 +125,15 @@ +--- openjdk.orig/jdk/make/common/shared/Sanity.gmk 2013-09-02 17:03:28.039330395 +0100 ++++ openjdk/jdk/make/common/shared/Sanity.gmk 2013-09-02 17:32:35.854512833 +0100 +@@ -159,6 +159,11 @@ # Get ALL_SETTINGS defined include $(JDK_MAKE_SHARED_DIR)/Sanity-Settings.gmk +ifndef CROSS_COMPILATION +MORE_PHONY_RULES = \ -+ sane-freetype \ -+ sane-cups \ -+ sane-motif \ -+ sane-alsa-versioncheck \ -+ sane-alsa-headers ++ sane-freetype +endif + .PHONY: \ sane-copyrightyear\ sane-settings \ -@@ -149,8 +163,6 @@ +@@ -187,8 +192,7 @@ sane-outputdir \ sane-alt_bootdir \ sane-bootdir \ - sane-motif \ - sane-cups \ ++ sane-cups \ sane-devtools_path \ sane-compiler_path \ sane-unixcommand_path \ -@@ -168,13 +180,11 @@ - sane-compiler \ - sane-link \ - sane-cacerts \ -- sane-alsa-versioncheck \ -- sane-alsa-headers \ - sane-ant_version \ +@@ -211,7 +215,7 @@ sane-zip_version \ sane-unzip_version \ -- sane-msvcrt_path \ + sane-msvcrt_path \ - sane-freetype -+ sane-msvcrt_path \ -+ $(MORE_PHONY_RULES) ++ $(MORE_PHONY_RULES) ###################################################### # check for COPYRIGHT_YEAR variable diff -r 898aa9174be7 -r 88ad9f715193 patches/freetypeversion.patch --- a/patches/freetypeversion.patch Wed Jul 10 21:24:54 2013 +0100 +++ b/patches/freetypeversion.patch Wed Sep 04 00:13:08 2013 +0100 @@ -1,11 +1,12 @@ ---- openjdk/jdk/make/common/shared/Platform.gmk.orig -+++ openjdk/jdk/make/common/shared/Platform.gmk -@@ -94,7 +94,7 @@ - REQUIRED_BOOT_VER = 1.5 - - # If we are using freetype, this is the required version --REQUIRED_FREETYPE_VERSION=2.3.0 -+REQUIRED_FREETYPE_VERSION=2.2.1 - - # - # Prune out all known SCM (Source Code Management) directories +diff -Nru openjdk.orig/jdk/make/common/shared/Defs-versions.gmk openjdk/jdk/make/common/shared/Defs-versions.gmk +--- openjdk.orig/jdk/make/common/shared/Defs-versions.gmk 2013-09-02 15:32:33.490472903 +0100 ++++ openjdk/jdk/make/common/shared/Defs-versions.gmk 2013-09-02 15:33:00.154887749 +0100 +@@ -176,7 +176,7 @@ + # Generic + REQUIRED_ANT_VER = 1.6.3 + REQUIRED_BOOT_VER = 1.5 +-REQUIRED_FREETYPE_VERSION = 2.3.0 ++REQUIRED_FREETYPE_VERSION = 2.2.1 + REQUIRED_MAKE_VER = 3.78 + REQUIRED_UNZIP_VER = 5.12 + REQUIRED_ZIP_VER = 2.2 diff -r 898aa9174be7 -r 88ad9f715193 patches/imageiojpeg_sync.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/imageiojpeg_sync.patch Wed Sep 04 00:13:08 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++) { From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 17:39:11 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 00:39:11 +0000 Subject: [Bug 1539] New: [METABUG] [IcedTea6] Support /etc/os-release Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1539 Bug ID: 1539 Summary: [METABUG] [IcedTea6] Support /etc/os-release Classification: Unclassified Product: IcedTea Version: 6-hg Hardware: all OS: Linux 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 http://www.freedesktop.org/software/systemd/man/os-release.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/20130904/d4c134a2/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 17:39:36 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 00:39:36 +0000 Subject: [Bug 1539] [METABUG] [IcedTea6] Support /etc/os-release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1539 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |1272 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/20130904/a1e99602/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 17:39:36 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 00:39:36 +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| |1539 -- 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/20130904/d5963c69/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 17:42:25 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 00:42:25 +0000 Subject: [Bug 1540] New: [IcedTea6] Font configuration should check /etc/os-release Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1540 Bug ID: 1540 Summary: [IcedTea6] Font configuration should check /etc/os-release Classification: Unclassified Product: IcedTea Version: 6-hg Hardware: all OS: Linux 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 setOsNameAndVersion in jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java checks various distro-dependent version files. It should check the new standard os-release first. -- 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/20130904/a747ed3f/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 17:42:50 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 00:42:50 +0000 Subject: [Bug 1540] [IcedTea6] Font configuration should check /etc/os-release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1540 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |1539 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/20130904/63e5d89a/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 17:42:50 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 00:42:50 +0000 Subject: [Bug 1539] [METABUG] [IcedTea6] Support /etc/os-release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1539 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |1540 -- 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/20130904/1c7d8b49/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 17:45:19 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 00:45:19 +0000 Subject: [Bug 1541] New: [IcedTea6] Sanity check should read /etc/os-release Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1541 Bug ID: 1541 Summary: [IcedTea6] Sanity check should read /etc/os-release Classification: Unclassified Product: IcedTea Version: 6-hg Hardware: all OS: Linux 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 jdk/make/common/shared/Sanity.gmk should check /etc/os-release before distro-specific sources. -- 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/20130904/374a65d9/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 17:45:43 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 00:45:43 +0000 Subject: [Bug 1541] [IcedTea6] Sanity check should read /etc/os-release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1541 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |1539 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/20130904/24b6ab74/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 17:45:43 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 00:45:43 +0000 Subject: [Bug 1539] [METABUG] [IcedTea6] Support /etc/os-release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1539 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |1541 -- 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/20130904/b6eeeea6/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 17:48:05 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 00:48:05 +0000 Subject: [Bug 1542] New: [IcedTea6] autoconf checks should use /etc/os-release in preference to lsb_release Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1542 Bug ID: 1542 Summary: [IcedTea6] autoconf checks should use /etc/os-release in preference to lsb_release Classification: Unclassified Product: IcedTea Version: 6-hg Hardware: all OS: Linux 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 http://0pointer.de/blog/projects/os-release -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130904/6119e0c9/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 17:48:24 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 00:48:24 +0000 Subject: [Bug 1542] [IcedTea6] autoconf checks should use /etc/os-release in preference to lsb_release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1542 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |1539 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/20130904/c036b31c/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 17:48:24 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 00:48:24 +0000 Subject: [Bug 1539] [METABUG] [IcedTea6] Support /etc/os-release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1539 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |1542 -- 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/20130904/0e1f591d/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 17:52:30 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 00:52:30 +0000 Subject: [Bug 1543] New: [METABUG] [IcedTea7] Support /etc/os-release Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1543 Bug ID: 1543 Summary: [METABUG] [IcedTea7] Support /etc/os-release Classification: Unclassified Product: IcedTea Version: 7-hg Hardware: all OS: Linux 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 http://www.freedesktop.org/software/systemd/man/os-release.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/20130904/ba1d389f/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 17:53:02 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 00:53:02 +0000 Subject: [Bug 1543] [METABUG] [IcedTea7] Support /etc/os-release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1543 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |1284 Target Milestone|--- |2.5.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/20130904/6e71ba8c/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 17:53:02 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 00:53:02 +0000 Subject: [Bug 1284] [TRACKER] IcedTea 2.5.0 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1284 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |1543 -- 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/20130904/710a5c31/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 17:55:12 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 00:55:12 +0000 Subject: [Bug 1544] New: [IcedTea7] autoconf checks should use /etc/os-release in preference to lsb_release Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1544 Bug ID: 1544 Summary: [IcedTea7] autoconf checks should use /etc/os-release in preference to lsb_release Classification: Unclassified Product: IcedTea Version: 7-hg Hardware: all OS: Linux 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 http://0pointer.de/blog/projects/os-release -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130904/b2fa2f20/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 17:55:50 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 00:55:50 +0000 Subject: [Bug 1544] [IcedTea7] autoconf checks should use /etc/os-release in preference to lsb_release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1544 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |1543 Target Milestone|--- |2.5.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/20130904/01683c81/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 17:55:50 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 00:55:50 +0000 Subject: [Bug 1543] [METABUG] [IcedTea7] Support /etc/os-release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1543 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |1544 -- 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/20130904/d457d3c3/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 17:58:05 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 00:58:05 +0000 Subject: [Bug 1545] New: [IcedTea7] Font configuration should check /etc/os-release Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1545 Bug ID: 1545 Summary: [IcedTea7] Font configuration should check /etc/os-release Classification: Unclassified Product: IcedTea Version: 7-hg Hardware: all OS: Linux 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 setOsNameAndVersion in jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java and jdk/src/solaris/classes/sun/font/FcFontConfiguration.java checks various distro-dependent version files. It should check the new standard os-release first. -- 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/20130904/d03123eb/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 17:58:25 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 00:58:25 +0000 Subject: [Bug 1545] [IcedTea7] Font configuration should check /etc/os-release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1545 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |1543 Target Milestone|--- |2.5.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/20130904/eac96650/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 17:58:25 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 00:58:25 +0000 Subject: [Bug 1543] [METABUG] [IcedTea7] Support /etc/os-release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1543 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |1545 -- 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/20130904/1163fdcb/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 17:59:05 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 00:59:05 +0000 Subject: [Bug 1546] New: [IcedTea7] Sanity check should read /etc/os-release Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1546 Bug ID: 1546 Summary: [IcedTea7] Sanity check should read /etc/os-release Classification: Unclassified Product: IcedTea Version: 7-hg Hardware: all OS: Linux 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 jdk/make/common/shared/Sanity.gmk should check /etc/os-release before distro-specific sources. -- 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/20130904/caf12273/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 17:59:18 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 00:59:18 +0000 Subject: [Bug 1546] [IcedTea7] Sanity check should read /etc/os-release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1546 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |1543 Target Milestone|--- |2.5.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/20130904/8ab6b81a/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 17:59:18 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 00:59:18 +0000 Subject: [Bug 1543] [METABUG] [IcedTea7] Support /etc/os-release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1543 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |1546 -- 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/20130904/2b469ce1/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 18:19:49 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 01:19:49 +0000 Subject: [Bug 1547] New: [METABUG] [IcedTea8] Support /etc/os-release Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1547 Bug ID: 1547 Summary: [METABUG] [IcedTea8] Support /etc/os-release Classification: Unclassified Product: IcedTea Version: 8-hg Hardware: all OS: Linux 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 http://www.freedesktop.org/software/systemd/man/os-release.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/20130904/c897df71/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 18:20:15 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 01:20:15 +0000 Subject: [Bug 1547] [METABUG] [IcedTea8] Support /etc/os-release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1547 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |1282 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/20130904/49e55b99/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 18:20:15 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 01:20:15 +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| |1547 -- 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/20130904/922d0ba4/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 18:20:58 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 01:20:58 +0000 Subject: [Bug 1548] New: [IcedTea8] autoconf checks should use /etc/os-release in preference to lsb_release Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1548 Bug ID: 1548 Summary: [IcedTea8] autoconf checks should use /etc/os-release in preference to lsb_release Classification: Unclassified Product: IcedTea Version: 8-hg Hardware: all OS: Linux 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 http://0pointer.de/blog/projects/os-release -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130904/ae54f30a/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 18:21:13 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 01:21:13 +0000 Subject: [Bug 1548] [IcedTea8] autoconf checks should use /etc/os-release in preference to lsb_release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1548 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |1547 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/20130904/69dfeed4/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 18:21:13 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 01:21:13 +0000 Subject: [Bug 1547] [METABUG] [IcedTea8] Support /etc/os-release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1547 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |1548 -- 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/20130904/7a865f8a/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 18:23:02 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 01:23:02 +0000 Subject: [Bug 1549] New: [IcedTea8] Font configuration should check /etc/os-release Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1549 Bug ID: 1549 Summary: [IcedTea8] Font configuration should check /etc/os-release Classification: Unclassified Product: IcedTea Version: 8-hg Hardware: all OS: Linux 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 setOsNameAndVersion in jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java and jdk/src/solaris/classes/sun/font/FcFontConfiguration.java checks various distro-dependent version files. It should check the new standard os-release first. -- 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/20130904/0a8286a2/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 18:23:23 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 01:23:23 +0000 Subject: [Bug 1549] [IcedTea8] Font configuration should check /etc/os-release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1549 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |1547 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/20130904/5025c651/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 18:23:23 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 01:23:23 +0000 Subject: [Bug 1547] [METABUG] [IcedTea8] Support /etc/os-release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1547 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |1549 -- 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/20130904/48cf9c18/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 18:23:48 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 01:23:48 +0000 Subject: [Bug 1550] New: [IcedTea8] Sanity check should read /etc/os-release Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1550 Bug ID: 1550 Summary: [IcedTea8] Sanity check should read /etc/os-release Classification: Unclassified Product: IcedTea Version: 8-hg Hardware: all OS: Linux 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 jdk/make/common/shared/Sanity.gmk should check /etc/os-release before distro-specific sources. -- 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/20130904/2137f808/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 18:24:13 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 01:24:13 +0000 Subject: [Bug 1550] [IcedTea8] Sanity check should read /etc/os-release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1550 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |1547 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/20130904/46346d57/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Sep 3 18:24:13 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 01:24:13 +0000 Subject: [Bug 1547] [METABUG] [IcedTea8] Support /etc/os-release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1547 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |1550 -- 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/20130904/58d71266/attachment.html From jvanek at redhat.com Wed Sep 4 01:13:49 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 04 Sep 2013 10:13:49 +0200 Subject: [rfc][icedtea-web] Fix NPE on Applet launch due to missing AppletStub In-Reply-To: <5225F328.2030406@redhat.com> References: <201308062112.r76LC1ae023806@mail-web01.excite.co.jp> <52025B5E.7040704@redhat.com> <5225F328.2030406@redhat.com> Message-ID: <5226EBBD.6000903@redhat.com> On 09/03/2013 04:33 PM, Jiri Vanek wrote: > On 08/07/2013 04:36 PM, Adam Domurad wrote: >> 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 >> > > > I'm o with it as it is. I'm not sure if Adam is able of push anymore, if not, I will push at the > end of the week. Confirmed :( I'm going to push this.; From jvanek at icedtea.classpath.org Wed Sep 4 01:36:05 2013 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Wed, 04 Sep 2013 08:36:05 +0000 Subject: /hg/icedtea-web: netx/net/sourceforge/jnlp/Launcher.java - Fix a... Message-ID: changeset 1ecf2f7928ac in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=1ecf2f7928ac author: Jiri Vanek date: Wed Sep 04 10:35:39 2013 +0200 netx/net/sourceforge/jnlp/Launcher.java - Fix applet context being null during applet init & start, by Adam Domurad diffstat: ChangeLog | 5 +++++ netx/net/sourceforge/jnlp/Launcher.java | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-) diffs (31 lines): diff -r 79bdc074df81 -r 1ecf2f7928ac ChangeLog --- a/ChangeLog Fri Aug 30 11:02:08 2013 -0400 +++ b/ChangeLog Wed Sep 04 10:35:39 2013 +0200 @@ -1,3 +1,8 @@ +2013-09-04 Adam Domurad + + * netx/net/sourceforge/jnlp/Launcher.java: + Fix applet context being null during applet init & start. + 2013-08-29 Omair Majid * tests/netx/unit/net/sourceforge/jnlp/JNLPFileTest.java diff -r 79bdc074df81 -r 1ecf2f7928ac netx/net/sourceforge/jnlp/Launcher.java --- a/netx/net/sourceforge/jnlp/Launcher.java Fri Aug 30 11:02:08 2013 -0400 +++ b/netx/net/sourceforge/jnlp/Launcher.java Wed Sep 04 10:35:39 2013 +0200 @@ -19,6 +19,7 @@ import static net.sourceforge.jnlp.runtime.Translator.R; import java.applet.Applet; +import java.applet.AppletStub; import java.awt.Container; import java.awt.SplashScreen; import java.io.File; @@ -716,6 +717,7 @@ String appletName = file.getApplet().getMainClass(); Class appletClass = loader.loadClass(appletName); Applet applet = (Applet) appletClass.newInstance(); + applet.setStub((AppletStub)cont); // Finish setting up appletInstance. appletInstance.setApplet(applet); appletInstance.getAppletEnvironment().setApplet(applet); From ptisnovs at icedtea.classpath.org Wed Sep 4 02:47:38 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 04 Sep 2013 09:47:38 +0000 Subject: /hg/rhino-tests: Added new test testCast (that checks Class.cast... Message-ID: changeset 8f9079b8db87 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=8f9079b8db87 author: Pavel Tisnovsky date: Wed Sep 04 11:51:21 2013 +0200 Added new test testCast (that checks Class.cast() method) into test test suite BindingsClassTest. diffstat: ChangeLog | 6 + src/org/RhinoTests/BindingsClassTest.java | 190 ++++++++++++++++++++++++++++++ 2 files changed, 196 insertions(+), 0 deletions(-) diffs (213 lines): diff -r 242771777388 -r 8f9079b8db87 ChangeLog --- a/ChangeLog Tue Sep 03 10:13:38 2013 +0200 +++ b/ChangeLog Wed Sep 04 11:51:21 2013 +0200 @@ -1,3 +1,9 @@ +2013-09-04 Pavel Tisnovsky + + * src/org/RhinoTests/BindingsClassTest.java: + Added new test testCast (that checks Class.cast() method) into test + test suite BindingsClassTest. + 2013-09-03 Pavel Tisnovsky * src/org/RhinoTests/SimpleBindingsClassTest.java: diff -r 242771777388 -r 8f9079b8db87 src/org/RhinoTests/BindingsClassTest.java --- a/src/org/RhinoTests/BindingsClassTest.java Tue Sep 03 10:13:38 2013 +0200 +++ b/src/org/RhinoTests/BindingsClassTest.java Wed Sep 04 11:51:21 2013 +0200 @@ -1303,6 +1303,196 @@ } /** + * Test for method javax.script.Bindings.getClass().cast() + */ + protected void testCast() { + try { + this.bindingsClass.cast(new Object()); + throw new AssertionError("Class.cast(new Object()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.cast(new Object().getClass()); + throw new AssertionError("Class.cast(new Object().getClass()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.cast(new String()); + throw new AssertionError("Class.cast(new String()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.cast(Boolean.valueOf(true)); + throw new AssertionError("Class.cast(Boolean.valueOf(true)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.cast(Boolean.valueOf(false)); + throw new AssertionError("Class.cast(Boolean.valueOf(false)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.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.bindingsClass.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.bindingsClass.cast(Integer.valueOf(42)); + throw new AssertionError("Class.cast(Integer.valueOf(42)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.cast(Long.valueOf(42L)); + throw new AssertionError("Class.cast(Long.valueOf(42L)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.cast(Float.valueOf(42f)); + throw new AssertionError("Class.cast(Float.valueOf(42f)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.cast(Double.valueOf(42.)); + throw new AssertionError("Class.cast(Double.valueOf(42.)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.cast(new Throwable()); + throw new AssertionError("Class.cast(new Throwable()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.cast(new RuntimeException()); + throw new AssertionError("Class.cast(new RuntimeException()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.cast(new Error()); + throw new AssertionError("Class.cast(new Error()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.bindingsClass.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.bindingsClass.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.bindingsClass.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.bindingsClass.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.bindingsClass.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.bindingsClass.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.bindingsClass.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.bindingsClass.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.bindingsClass.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.Bindings */ @SuppressWarnings("cast") From ptisnovs at icedtea.classpath.org Wed Sep 4 02:49:47 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 04 Sep 2013 09:49:47 +0000 Subject: /hg/gfx-test: Ten new tests added into BitBltBasicTests test suite. Message-ID: changeset 3939316ef6dd in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=3939316ef6dd author: Pavel Tisnovsky date: Wed Sep 04 11:53:33 2013 +0200 Ten new tests added into BitBltBasicTests test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltBasicTests.java | 150 +++++++++++++++++++++++ 2 files changed, 155 insertions(+), 0 deletions(-) diffs (172 lines): diff -r e28aa6bfbc2e -r 3939316ef6dd ChangeLog --- a/ChangeLog Tue Sep 03 12:06:01 2013 +0200 +++ b/ChangeLog Wed Sep 04 11:53:33 2013 +0200 @@ -1,3 +1,8 @@ +2013-09-04 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + Ten new tests added into BitBltBasicTests test suite. + 2013-09-03 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java: diff -r e28aa6bfbc2e -r 3939316ef6dd src/org/gfxtest/testsuites/BitBltBasicTests.java --- a/src/org/gfxtest/testsuites/BitBltBasicTests.java Tue Sep 03 12:06:01 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Wed Sep 04 11:53:33 2013 +0200 @@ -5672,6 +5672,156 @@ } /** + * 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 testBitBltRGBTexture2BufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture2Image(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 testBitBltRGBTexture2BufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture2Image(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 testBitBltRGBTexture2BufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture2Image(image, graphics2d, BufferedImage.TYPE_INT_ARGB); + } + + /** + * 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 testBitBltRGBTexture2BufferedImageTypeIntARGB_Pre(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture2Image(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 testBitBltRGBTexture2BufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture2Image(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 testBitBltRGBTexture2BufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture2Image(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 testBitBltRGBTexture2BufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture2Image(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 testBitBltRGBTexture3BufferedImageType3ByteBGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture3Image(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 testBitBltRGBTexture3BufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture3Image(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 testBitBltRGBTexture3BufferedImageType4ByteABGR_PRE(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithRGBTexture3Image(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE); + } + + /** * Entry point to the test suite. * * @param args not used in this case From gnu.andrew at redhat.com Wed Sep 4 04:45:40 2013 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Wed, 4 Sep 2013 07:45:40 -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: <1290038735.6807328.1378295140428.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 had to make some further changes. I didn't realise that it was introducing a new library dependency and, indeed, hardcoding -lkrb5. I'd assumed that was already present. http://icedtea.classpath.org/hg/icedtea7-forest/jdk/rev/fd4289593675 -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From aazores at redhat.com Wed Sep 4 07:40:51 2013 From: aazores at redhat.com (Andrew Azores) Date: Wed, 04 Sep 2013 10:40:51 -0400 Subject: [rfc][icedtea-web] Fix CacheReproducerTest In-Reply-To: <522458C7.3070505@redhat.com> References: <201308301106.r7UB6LlE032185@mail-web03.excite.co.jp> <522458C7.3070505@redhat.com> Message-ID: <52274673.3000107@redhat.com> On 09/02/2013 05:22 AM, Jiri Vanek wrote: > Nope, rather make it public. Anyaway, as others suggested, Can you > tray to use DeploymentConfiguration singleton to get real location of > cache. If you think it is good idea, then go with it. I've just gone and put it back to using the value out of the Defaults class. Maybe the DeploymentConfiguration idea can be put into a different test, but for now I'll just leave it with the "safe" Defaults value. Also fixed some indentation and changed ServerAccess.ProcessResult to the non-deprecated ProcessResult - figured I might as well clear out the deprecation warnings while I was tinkering in there. Thanks, -- Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: CacheReproducerTest.patch Type: text/x-patch Size: 8791 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130904/1aa5ce3a/CacheReproducerTest.patch From jvanek at redhat.com Wed Sep 4 07:49:18 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 04 Sep 2013 16:49:18 +0200 Subject: [rfc][icedtea-web] Fix CacheReproducerTest In-Reply-To: <52274673.3000107@redhat.com> References: <201308301106.r7UB6LlE032185@mail-web03.excite.co.jp> <522458C7.3070505@redhat.com> <52274673.3000107@redhat.com> Message-ID: <5227486E.9030109@redhat.com> On 09/04/2013 04:40 PM, Andrew Azores wrote: > On 09/02/2013 05:22 AM, Jiri Vanek wrote: >> >Nope, rather make it public. Anyaway, as others suggested, Can you >> >tray to use DeploymentConfiguration singleton to get real location of >> >cache. If you think it is good idea, then go with it. > I've just gone and put it back to using the value out of the Defaults > class. Maybe the DeploymentConfiguration idea can be put into a > different test, but for now I'll just leave it with the "safe" Defaults Why so? > value. Also fixed some indentation and changed > ServerAccess.ProcessResult to the non-deprecated ProcessResult - figured > I might as well clear out the deprecation warnings while I was tinkering Sure :) > in there. > > Thanks, > > -- Andrew A > > > CacheReproducerTest.patch > > ... > } > @@ -269,7 +271,7 @@ > t.start(); > Thread.sleep(1000); > pr = tryToClearcache(); > - String q = "Can not clear cache at this time"; > + String q = "Can not clear the cache at this time"; To aovid this in future I would suggest to load properties file and search by key. (yes you can directly load messages.properties to local Properties variable) You can find inspiration in Localisation tests. ...snip... Otehrwise looks good. From aazores at redhat.com Wed Sep 4 07:58:47 2013 From: aazores at redhat.com (Andrew Azores) Date: Wed, 04 Sep 2013 10:58:47 -0400 Subject: [rfc][icedtea-web] Very small SecurityDialog refactor In-Reply-To: <521F26AB.5030800@redhat.com> References: <521BB140.80203@redhat.com> <521F26AB.5030800@redhat.com> Message-ID: <52274AA7.9000100@redhat.com> On 08/29/2013 06:47 AM, Jiri Vanek wrote: > 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. Alright, made that new method along with tests, and de-compressed the code a little bit. Maybe it's a little more readable/obvious now than it was as my one-liner :) Thanks, -- Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: SecurityDialog_refactor.patch Type: text/x-patch Size: 7101 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130904/8eec7f7e/SecurityDialog_refactor.patch From jvanek at redhat.com Wed Sep 4 08:11:09 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 04 Sep 2013 17:11:09 +0200 Subject: [rfc][icedtea-web] Very small SecurityDialog refactor In-Reply-To: <52274AA7.9000100@redhat.com> References: <521BB140.80203@redhat.com> <521F26AB.5030800@redhat.com> <52274AA7.9000100@redhat.com> Message-ID: <52274D8D.5070805@redhat.com> On 09/04/2013 04:58 PM, Andrew Azores wrote: > On 08/29/2013 06:47 AM, Jiri Vanek wrote: >> 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. > > Alright, made that new method along with tests, and de-compressed the code a little bit. Maybe it's > a little more readable/obvious now than it was as my one-liner :) > Thank you. Ok for head. From aazores at redhat.com Wed Sep 4 09:15:05 2013 From: aazores at redhat.com (Andrew Azores) Date: Wed, 04 Sep 2013 12:15:05 -0400 Subject: [rfc][icedtea-web] Fix CacheReproducerTest In-Reply-To: <5227486E.9030109@redhat.com> References: <201308301106.r7UB6LlE032185@mail-web03.excite.co.jp> <522458C7.3070505@redhat.com> <52274673.3000107@redhat.com> <5227486E.9030109@redhat.com> Message-ID: <52275C89.400@redhat.com> On 09/04/2013 10:49 AM, Jiri Vanek wrote: > On 09/04/2013 04:40 PM, Andrew Azores wrote: >> On 09/02/2013 05:22 AM, Jiri Vanek wrote: >>>> Nope, rather make it public. Anyaway, as others suggested, Can you >>>> tray to use DeploymentConfiguration singleton to get real location of >>>> cache. If you think it is good idea, then go with it. >> I've just gone and put it back to using the value out of the Defaults >> class. Maybe the DeploymentConfiguration idea can be put into a >> different test, but for now I'll just leave it with the "safe" Defaults > Why so? That way these existing tests should be testing whether or not the caching mechanism in general is working properly, since the path specified in Defaults is very likely to be a workable cache location (read/write allowed for example). I'd like there to be a test using the DeploymentConfiguration values just to ensure that caching truly is working on a system, not just "in theory", but the more I think about it the more it seems like this is an additional responsibility that this test shouldn't necessarily be taking on. > > >> value. Also fixed some indentation and changed >> ServerAccess.ProcessResult to the non-deprecated ProcessResult - figured >> I might as well clear out the deprecation warnings while I was tinkering > Sure :) > >> in there. >> >> Thanks, >> >> -- Andrew A >> >> >> CacheReproducerTest.patch >> >> > ... >> } >> @@ -269,7 +271,7 @@ >> t.start(); >> Thread.sleep(1000); >> pr = tryToClearcache(); >> - String q = "Can not clear cache at this time"; >> + String q = "Can not clear the cache at this time"; > To aovid this in future I would suggest to load properties file and search by key. (yes you can > directly load messages.properties to local Properties variable) You can find inspiration in > Localisation tests. > > ...snip... > > > Otehrwise looks good. > Ah yes, of course. Thanks, added that. -- Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: CacheReproducerTest.patch Type: text/x-patch Size: 9562 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130904/64bf16c4/CacheReproducerTest.patch From jvanek at redhat.com Wed Sep 4 09:21:48 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 04 Sep 2013 18:21:48 +0200 Subject: [rfc][icedtea-web] Fix CacheReproducerTest In-Reply-To: <52275C89.400@redhat.com> References: <201308301106.r7UB6LlE032185@mail-web03.excite.co.jp> <522458C7.3070505@redhat.com> <52274673.3000107@redhat.com> <5227486E.9030109@redhat.com> <52275C89.400@redhat.com> Message-ID: <52275E1C.8030903@redhat.com> On 09/04/2013 06:15 PM, Andrew Azores wrote: > On 09/04/2013 10:49 AM, Jiri Vanek wrote: >> On 09/04/2013 04:40 PM, Andrew Azores wrote: >>> On 09/02/2013 05:22 AM, Jiri Vanek wrote: >>>>> Nope, rather make it public. Anyaway, as others suggested, Can you >>>>> tray to use DeploymentConfiguration singleton to get real location of >>>>> cache. If you think it is good idea, then go with it. >>> I've just gone and put it back to using the value out of the Defaults >>> class. Maybe the DeploymentConfiguration idea can be put into a >>> different test, but for now I'll just leave it with the "safe" Defaults >> Why so? > > That way these existing tests should be testing whether or not the > caching mechanism in general is working properly, since the path > specified in Defaults is very likely to be a workable cache location > (read/write allowed for example). I'd like there to be a test using the > DeploymentConfiguration values just to ensure that caching truly is > working on a system, not just "in theory", but the more I think about it > the more it seems like this is an additional responsibility that this > test shouldn't necessarily be taking on. > More and more I think about it I think the usage of DeploymentConfiguration is the right way even there. But nvm, ok for head. Also I would place the + String messageResourcePath = "net/sourceforge/jnlp/resources/Messages.properties"; + PropertyResourceBundle messageBundle = new PropertyResourceBundle(this.getClass().getClassLoader().getResourceAsStream(messageResourcePath)); as public static (final) (at lease the messageResourcePath made no harm) and messageBundle would be loaded in constructor or in static{} block. But do as you wish. For this test case I do not insist. J. >> >> >>> value. Also fixed some indentation and changed >>> ServerAccess.ProcessResult to the non-deprecated ProcessResult - figured >>> I might as well clear out the deprecation warnings while I was tinkering >> Sure :) >> >>> in there. >>> >>> Thanks, >>> >>> -- Andrew A >>> >>> >>> CacheReproducerTest.patch >>> >>> >> ... >>> } >>> @@ -269,7 +271,7 @@ >>> t.start(); >>> Thread.sleep(1000); >>> pr = tryToClearcache(); >>> - String q = "Can not clear cache at this time"; >>> + String q = "Can not clear the cache at this time"; >> To aovid this in future I would suggest to load properties file and search by key. (yes you can >> directly load messages.properties to local Properties variable) You can find inspiration in >> Localisation tests. >> >> ...snip... >> >> >> Otehrwise looks good. >> > > Ah yes, of course. Thanks, added that. > From aazores at icedtea.classpath.org Wed Sep 4 09:22:28 2013 From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org) Date: Wed, 04 Sep 2013 16:22:28 +0000 Subject: /hg/icedtea-web: 2 new changesets Message-ID: changeset d5eab1484308 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=d5eab1484308 author: Andrew Azores date: Wed Sep 04 12:18:40 2013 -0400 Extracted integer response casting/handling logic in SecurityDialogs to new method, added test for this method changeset 6c0e37585a5e in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=6c0e37585a5e author: Andrew Azores date: Wed Sep 04 12:22:16 2013 -0400 merging diffstat: ChangeLog | 41 + netx/net/sourceforge/jnlp/Launcher.java | 2 + netx/net/sourceforge/jnlp/security/SecurityDialogs.java | 61 +- netx/net/sourceforge/jnlp/services/XFileOpenService.java | 11 +- 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 +- tests/netx/unit/net/sourceforge/jnlp/JNLPFileTest.java | 60 ++ tests/netx/unit/net/sourceforge/jnlp/security/SecurityDialogsTest.java | 70 +++ 12 files changed, 542 insertions(+), 203 deletions(-) diffs (truncated from 1174 to 500 lines): diff -r 94ebabfba6ab -r 6c0e37585a5e ChangeLog --- a/ChangeLog Fri Aug 23 16:35:37 2013 -0400 +++ b/ChangeLog Wed Sep 04 12:22:16 2013 -0400 @@ -1,3 +1,44 @@ +2013-09-04 Andrew Azores + + * netx/net/sourceforge/jnlp/security/SecurityDialogs.java: + (getIntegerResponseAsBoolean) extracted integer response casting/handling + logic into new method + * tests/netx/unit/net/sourceforge/jnlp/security/SecurityDialogsTest.java: + new unit test for SecurityDialogs#getIntegerReponseAsBoolean() + +2013-09-04 Adam Domurad + + * netx/net/sourceforge/jnlp/Launcher.java: + Fix applet context being null during applet init & start. + +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. + * 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 6c0e37585a5e netx/net/sourceforge/jnlp/Launcher.java --- a/netx/net/sourceforge/jnlp/Launcher.java Fri Aug 23 16:35:37 2013 -0400 +++ b/netx/net/sourceforge/jnlp/Launcher.java Wed Sep 04 12:22:16 2013 -0400 @@ -19,6 +19,7 @@ import static net.sourceforge.jnlp.runtime.Translator.R; import java.applet.Applet; +import java.applet.AppletStub; import java.awt.Container; import java.awt.SplashScreen; import java.io.File; @@ -716,6 +717,7 @@ String appletName = file.getApplet().getMainClass(); Class appletClass = loader.loadClass(appletName); Applet applet = (Applet) appletClass.newInstance(); + applet.setStub((AppletStub)cont); // Finish setting up appletInstance. appletInstance.setApplet(applet); appletInstance.getAppletEnvironment().setApplet(applet); diff -r 94ebabfba6ab -r 6c0e37585a5e netx/net/sourceforge/jnlp/security/SecurityDialogs.java --- a/netx/net/sourceforge/jnlp/security/SecurityDialogs.java Fri Aug 23 16:35:37 2013 -0400 +++ b/netx/net/sourceforge/jnlp/security/SecurityDialogs.java Wed Sep 04 12:22:16 2013 -0400 @@ -132,16 +132,7 @@ Object selectedValue = getUserResponse(message); - if (selectedValue == null) { - return false; - } else if (selectedValue instanceof Integer) { - if (((Integer) selectedValue).intValue() == 0) - return true; - else - return false; - } else { - return false; - } + return getIntegerResponseAsBoolean(selectedValue); } /** @@ -164,17 +155,7 @@ Object selectedValue = getUserResponse(message); - if (selectedValue == null) { - return false; - } else if (selectedValue instanceof Integer) { - if (((Integer) selectedValue).intValue() == 0) { - return true; - } else { - return false; - } - } else { - return false; - } + return getIntegerResponseAsBoolean(selectedValue); } /** @@ -224,16 +205,7 @@ Object selectedValue = getUserResponse(message); - if (selectedValue == null) { - return false; - } else if (selectedValue instanceof Integer) { - if (((Integer) selectedValue).intValue() == 0) - return true; - else - return false; - } else { - return false; - } + return getIntegerResponseAsBoolean(selectedValue); } /** @@ -263,11 +235,7 @@ message.extras = new Object[] { host, port, prompt, type }; Object response = getUserResponse(message); - if (response == null) { - return null; - } else { - return (Object[]) response; - } + return (Object[]) response; } /** @@ -286,11 +254,11 @@ Object selectedValue = getUserResponse(message); // result 0 = Yes, 1 = No, 2 = Cancel - if (selectedValue == null) { - return 2; - } else if (selectedValue instanceof Integer) { + if (selectedValue instanceof Integer) { + // If the selected value can be cast to Integer, use that value return ((Integer) selectedValue).intValue(); } else { + // Otherwise default to "cancel" return 2; } } @@ -376,6 +344,21 @@ } /** + * Returns true iff the given Object reference can be cast to Integer and that Integer's + * intValue is 0. + * @param ref the Integer (hopefully) reference + * @return whether the given reference is both an Integer type and has intValue of 0 + */ + public static boolean getIntegerResponseAsBoolean(Object ref) { + boolean isInteger = ref instanceof Integer; + if (isInteger) { + Integer i = (Integer) ref; + return i.intValue() == 0; + } + return false; + } + + /** * Returns whether the current runtime configuration allows prompting user * for security warnings. * diff -r 94ebabfba6ab -r 6c0e37585a5e netx/net/sourceforge/jnlp/services/XFileOpenService.java --- a/netx/net/sourceforge/jnlp/services/XFileOpenService.java Fri Aug 23 16:35:37 2013 -0400 +++ b/netx/net/sourceforge/jnlp/services/XFileOpenService.java Wed Sep 04 12:22:16 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 94ebabfba6ab -r 6c0e37585a5e plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Fri Aug 23 16:35:37 2013 -0400 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Wed Sep 04 12:22:16 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 6c0e37585a5e plugin/icedteanp/IcedTeaPluginUtils.cc --- a/plugin/icedteanp/IcedTeaPluginUtils.cc Fri Aug 23 16:35:37 2013 -0400 +++ b/plugin/icedteanp/IcedTeaPluginUtils.cc Wed Sep 04 12:22:16 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 6c0e37585a5e plugin/icedteanp/IcedTeaPluginUtils.h --- a/plugin/icedteanp/IcedTeaPluginUtils.h Fri Aug 23 16:35:37 2013 -0400 +++ b/plugin/icedteanp/IcedTeaPluginUtils.h Wed Sep 04 12:22:16 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); + } + From bugzilla-daemon at icedtea.classpath.org Wed Sep 4 09:27:43 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 16:27:43 +0000 Subject: [Bug 1551] New: [IcedTea7] Add build support for Zero AArch64 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1551 Bug ID: 1551 Summary: [IcedTea7] Add build support for Zero AArch64 Classification: Unclassified Product: IcedTea Version: 7-hg Hardware: aarch64 OS: Linux 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 -- 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/20130904/70fe36b7/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Sep 4 09:30:53 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 16:30:53 +0000 Subject: [Bug 1551] [IcedTea7] Add build support for Zero AArch64 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1551 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |2.4.2 --- Comment #1 from Andrew John Hughes --- http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-August/024266.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/20130904/44b80980/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Sep 4 09:31:36 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 16:31:36 +0000 Subject: [Bug 1552] New: [IcedTea7] Add -D_LITTLE_ENDIAN for ARM architectures Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1552 Bug ID: 1552 Summary: [IcedTea7] Add -D_LITTLE_ENDIAN for ARM architectures Classification: Unclassified Product: IcedTea Version: 7-hg Hardware: arm OS: Linux 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 http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-August/024266.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/20130904/f99b90b7/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Sep 4 09:33:12 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 16:33:12 +0000 Subject: [Bug 1552] [IcedTea7] Add -D_LITTLE_ENDIAN for ARM architectures In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1552 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED 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/20130904/57d42e9a/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Sep 4 09:37:11 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 16:37:11 +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 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Severity|blocker |normal -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130904/f68171e5/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Sep 4 09:37:50 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 16:37:50 +0000 Subject: [Bug 1531] Idk In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1531 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Target Milestone|--- |2.1.1 -- 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/20130904/9e4fbe40/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Sep 4 09:50:14 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 16:50:14 +0000 Subject: [Bug 1553] New: [IcedTea7] Add Debian AArch64 support Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1553 Bug ID: 1553 Summary: [IcedTea7] Add Debian AArch64 support Classification: Unclassified Product: IcedTea Version: 7-hg Hardware: aarch64 OS: Linux 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 http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-August/024266.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/20130904/5fa36cdc/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Sep 4 09:50:47 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 16:50:47 +0000 Subject: [Bug 1553] [IcedTea7] Add Debian AArch64 support In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1553 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED 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/20130904/90922fcc/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Sep 4 10:19:06 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 17:19:06 +0000 Subject: [Bug 1554] New: [IcedTea7] Fix build on Mac OS X Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1554 Bug ID: 1554 Summary: [IcedTea7] Fix build on Mac OS X Classification: Unclassified Product: IcedTea Version: 7-hg Hardware: x86_64 OS: Mac OS 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 http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-August/024219.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/20130904/c66df3d5/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Sep 4 10:19:31 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 17:19:31 +0000 Subject: [Bug 1554] [IcedTea7] Fix build on Mac OS X In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1554 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED 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/20130904/b2004de4/attachment.html From andrew at icedtea.classpath.org Wed Sep 4 10:22:12 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 04 Sep 2013 17:22:12 +0000 Subject: /hg/release/icedtea7-forest-2.4: 6 new changesets Message-ID: changeset 8773b39be6ac in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=8773b39be6ac author: asaha date: Mon Aug 19 12:18:12 2013 -0700 Added tag jdk7u40-b40 for changeset c9157eb582a5 changeset 3af81bfe320c in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=3af81bfe320c author: katleman date: Wed Aug 21 12:10:40 2013 -0700 Added tag jdk7u40-b41 for changeset 8773b39be6ac changeset 1d53bd8fd2a6 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=1d53bd8fd2a6 author: katleman date: Mon Aug 26 07:41:15 2013 -0700 Added tag jdk7u40-b42 for changeset 3af81bfe320c changeset dc1e099cd62d in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=dc1e099cd62d author: katleman date: Tue Aug 27 08:42:44 2013 -0700 Added tag jdk7u40-b43 for changeset 1d53bd8fd2a6 changeset 6359fa34199c in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=6359fa34199c author: katleman date: Tue Sep 03 22:34:23 2013 -0700 Added tag jdk7u40-b60 for changeset dc1e099cd62d changeset 6125b83238df in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=6125b83238df author: andrew date: Wed Sep 04 16:45:42 2013 +0100 Merge jdk7u40-b60 diffstat: .hgtags | 15 +++++++++++++++ .jcheck/conf | 2 -- make/Defs-internal.gmk | 3 ++- 3 files changed, 17 insertions(+), 3 deletions(-) diffs (111 lines): diff -r c9157eb582a5 -r 6125b83238df .hgtags --- a/.hgtags Mon Aug 12 12:07:28 2013 -0700 +++ b/.hgtags Wed Sep 04 16:45:42 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 @@ -317,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 @@ -327,6 +336,7 @@ ac751f3867ecffca814b25daf5e19d82d83fc755 jdk7u40-b28 dbe42a627813892d1bb59a4240c24f60ef22930a jdk7u40-b29 1c141e6fde911c4974c87e340eb698754607f422 jdk7u40-b30 +ae86c6974e8ee35ef66121810ea9e748b7e677d9 icedtea-2.4.1 58a2a470aa3bccd3eb3624e68bca9397c8cc26a2 jdk7u40-b31 da376fd5e4d68f8a45003a6e175267dc840711cc jdk7u40-b32 3fdfe7f1b06354e11e8af51b7c653c8a0adb3987 jdk7u40-b33 @@ -336,3 +346,8 @@ 5bfb3aa1655e5364a8c1c17343ff84dad7e13f25 jdk7u40-b37 7d3e6ccad487d84e764932802cd42d2afebccd7a jdk7u40-b38 a2ba8e069718677c267b3894df2a719148c15ac8 jdk7u40-b39 +c9157eb582a5deec5bbac671bf628bc45af447d0 jdk7u40-b40 +8773b39be6ac71c06793035b8c72f5c771eb534f jdk7u40-b41 +3af81bfe320c12758234233da6fa27c3c0ffcdc4 jdk7u40-b42 +1d53bd8fd2a62bcf336727ebec377ef7498dd4a6 jdk7u40-b43 +dc1e099cd62d250b4a997ce694b47fe2f50d2905 jdk7u40-b60 diff -r c9157eb582a5 -r 6125b83238df .jcheck/conf --- a/.jcheck/conf Mon Aug 12 12:07:28 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r c9157eb582a5 -r 6125b83238df make/Defs-internal.gmk --- a/make/Defs-internal.gmk Mon Aug 12 12:07:28 2013 -0700 +++ b/make/Defs-internal.gmk Wed Sep 04 16:45:42 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 Sep 4 10:22:19 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 04 Sep 2013 17:22:19 +0000 Subject: /hg/release/icedtea7-forest-2.4/corba: 8 new changesets Message-ID: changeset acb0571052b8 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=acb0571052b8 author: asaha date: Mon Aug 19 12:18:15 2013 -0700 Added tag jdk7u40-b40 for changeset a91b57bf60bd changeset b4a480a039bc in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=b4a480a039bc author: katleman date: Wed Aug 21 12:10:48 2013 -0700 Added tag jdk7u40-b41 for changeset acb0571052b8 changeset e29ea0b297e5 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=e29ea0b297e5 author: katleman date: Mon Aug 26 07:41:19 2013 -0700 Added tag jdk7u40-b42 for changeset b4a480a039bc changeset 08737d863a7a in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=08737d863a7a author: katleman date: Tue Aug 27 08:42:49 2013 -0700 Added tag jdk7u40-b43 for changeset e29ea0b297e5 changeset 504acad33722 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=504acad33722 author: katleman date: Tue Sep 03 22:34:24 2013 -0700 Added tag jdk7u40-b60 for changeset 08737d863a7a changeset 92504ffbb132 in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=92504ffbb132 author: andrew date: Wed Sep 04 16:45:43 2013 +0100 Merge jdk7u40-b60 changeset 7b8261df512f in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=7b8261df512f author: andrew date: Wed Sep 04 17:48:23 2013 +0100 PR1551: Add build support for Zero AArch64 changeset 5ea58899ae9f in /hg/release/icedtea7-forest-2.4/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=5ea58899ae9f author: andrew date: Wed Sep 04 17:52:30 2013 +0100 PR1553: Add Debian AArch64 support diffstat: .hgtags | 15 +++++++++++++++ .jcheck/conf | 2 -- make/Makefile | 2 +- make/common/shared/Defs-java.gmk | 2 +- make/common/shared/Platform.gmk | 9 +++++++++ 5 files changed, 26 insertions(+), 4 deletions(-) diffs (155 lines): diff -r a91b57bf60bd -r 5ea58899ae9f .hgtags --- a/.hgtags Mon Aug 12 12:07:29 2013 -0700 +++ b/.hgtags Wed Sep 04 17:52:30 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 @@ -319,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 @@ -329,6 +338,7 @@ c8b9201f88f4ce417df7a40efcb7fef656d94512 jdk7u40-b28 1ad0a5a3f7b1e9d95670d733d7e70714050ba6bf jdk7u40-b29 651dcadbd9774165e017f8b7d1bde7d7d280ae1d jdk7u40-b30 +23ae4e0e0cce13779c531a704bf95fda1764882b icedtea-2.4.1 3d2b811b8a798ff3b619f8330b08f551f7fdfd80 jdk7u40-b31 c5f85903c49aa716ee3cb93361dd60a3e88d866d jdk7u40-b32 1b7fbfdc31b859097d6a365ad0ba0e8ef92b4063 jdk7u40-b33 @@ -338,3 +348,8 @@ dc9a63376b39223bfb612d9e8efd275023de6399 jdk7u40-b37 8391dff270bbf75dc434e53ed68993ab833475e8 jdk7u40-b38 d7c73fd53c84cbb4333559cf788e554a2ef9326c jdk7u40-b39 +a91b57bf60bd982814bc1616ea46a1069416f5e4 jdk7u40-b40 +acb0571052b8dbef036fc50235ef95c0a46cff6b jdk7u40-b41 +b4a480a039bc19b27bfb5fcbbbf75e651d2718b7 jdk7u40-b42 +e29ea0b297e519010e661603a07bb8d48fa904a2 jdk7u40-b43 +08737d863a7aa5eb39374b26c9585e1770affe92 jdk7u40-b60 diff -r a91b57bf60bd -r 5ea58899ae9f .jcheck/conf --- a/.jcheck/conf Mon Aug 12 12:07:29 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r a91b57bf60bd -r 5ea58899ae9f make/Makefile --- a/make/Makefile Mon Aug 12 12:07:29 2013 -0700 +++ b/make/Makefile Wed Sep 04 17:52:30 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 a91b57bf60bd -r 5ea58899ae9f make/common/shared/Defs-java.gmk --- a/make/common/shared/Defs-java.gmk Mon Aug 12 12:07:29 2013 -0700 +++ b/make/common/shared/Defs-java.gmk Wed Sep 04 17:52:30 2013 +0100 @@ -81,7 +81,7 @@ ifeq ($(ARCH_DATA_MODEL), 32) JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768 else - JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536 + JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664 endif JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%) diff -r a91b57bf60bd -r 5ea58899ae9f make/common/shared/Platform.gmk --- a/make/common/shared/Platform.gmk Mon Aug 12 12:07:29 2013 -0700 +++ b/make/common/shared/Platform.gmk Wed Sep 04 17:52:30 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_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) \ 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 bugzilla-daemon at icedtea.classpath.org Wed Sep 4 10:22:29 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 17:22:29 +0000 Subject: [Bug 1551] [IcedTea7] Add build support for Zero AArch64 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1551 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=7b8261df512f author: andrew date: Wed Sep 04 17:48:23 2013 +0100 PR1551: Add build support for Zero AArch64 -- 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/20130904/305cb428/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Sep 4 10:22:37 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 17:22:37 +0000 Subject: [Bug 1553] [IcedTea7] Add Debian AArch64 support In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1553 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=5ea58899ae9f author: andrew date: Wed Sep 04 17:52:30 2013 +0100 PR1553: Add Debian AArch64 support -- 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/20130904/177fbe07/attachment.html From andrew at icedtea.classpath.org Wed Sep 4 10:22:54 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 04 Sep 2013 17:22:54 +0000 Subject: /hg/release/icedtea7-forest-2.4/jaxp: 6 new changesets Message-ID: changeset 7255fb6c9060 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=7255fb6c9060 author: asaha date: Mon Aug 19 12:18:46 2013 -0700 Added tag jdk7u40-b40 for changeset 6ea57bdf6030 changeset 66363323f14d in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=66363323f14d author: katleman date: Wed Aug 21 12:11:26 2013 -0700 Added tag jdk7u40-b41 for changeset 7255fb6c9060 changeset c0bd71414ea5 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=c0bd71414ea5 author: katleman date: Mon Aug 26 07:41:38 2013 -0700 Added tag jdk7u40-b42 for changeset 66363323f14d changeset 91bc45348512 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=91bc45348512 author: katleman date: Tue Aug 27 08:43:03 2013 -0700 Added tag jdk7u40-b43 for changeset c0bd71414ea5 changeset c500d4ec41ff in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=c500d4ec41ff author: katleman date: Tue Sep 03 22:34:35 2013 -0700 Added tag jdk7u40-b60 for changeset 91bc45348512 changeset 135f46e0e653 in /hg/release/icedtea7-forest-2.4/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=135f46e0e653 author: andrew date: Wed Sep 04 16:45:43 2013 +0100 Merge jdk7u40-b60 diffstat: .hgtags | 15 +++++++++++++++ .jcheck/conf | 2 -- 2 files changed, 15 insertions(+), 2 deletions(-) diffs (98 lines): diff -r 6ea57bdf6030 -r 135f46e0e653 .hgtags --- a/.hgtags Mon Aug 12 12:07:40 2013 -0700 +++ b/.hgtags Wed Sep 04 16:45:43 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 @@ -319,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 @@ -329,6 +338,7 @@ 9186b6efd2b2eafa7fee5be1b043f59f25db12a6 jdk7u40-b28 740942c76fb668a04bf89feccf069f6958651d54 jdk7u40-b29 09b080236bc1a1a68f8b411196cbfa52475c0755 jdk7u40-b30 +5be6b670d08bb0464e0e259ef77fca6adba24b05 icedtea-2.4.1 5b31380e2e0b6f8386dcf0ca122461154f2d2704 jdk7u40-b31 75bb397c4ae26c384e1fcb75bbf4b70479f2c5f7 jdk7u40-b32 ce771024e07d2bb6521735a14ce68745a2376bd8 jdk7u40-b33 @@ -338,3 +348,8 @@ f40f45bd95d4140f691c03132f2ab2c8a0233a8f jdk7u40-b37 680bf140cdd58e7878318ecafc41c9db47ebfacd jdk7u40-b38 322af0a5cdce6cad8421a73c1b9af345361dfba0 jdk7u40-b39 +6ea57bdf603007be4d25568f7759ca0381aa8382 jdk7u40-b40 +7255fb6c9060b0626aeedb1066e73c4bb46b1a7c jdk7u40-b41 +66363323f14d85d4ab28e883a3323b9d72dea5fd jdk7u40-b42 +c0bd71414ea513f54f23965936a837fca093ac91 jdk7u40-b43 +91bc4534851265291bb3b16452a0968d6909979f jdk7u40-b60 diff -r 6ea57bdf6030 -r 135f46e0e653 .jcheck/conf --- a/.jcheck/conf Mon Aug 12 12:07:40 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup From andrew at icedtea.classpath.org Wed Sep 4 10:23:10 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 04 Sep 2013 17:23:10 +0000 Subject: /hg/release/icedtea7-forest-2.4/jaxws: 6 new changesets Message-ID: changeset adc234666397 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=adc234666397 author: asaha date: Mon Aug 19 12:18:50 2013 -0700 Added tag jdk7u40-b40 for changeset cd6971747e7a changeset 89f6c9663d75 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=89f6c9663d75 author: katleman date: Wed Aug 21 12:11:29 2013 -0700 Added tag jdk7u40-b41 for changeset adc234666397 changeset 3ee85b3793de in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=3ee85b3793de author: katleman date: Mon Aug 26 07:41:41 2013 -0700 Added tag jdk7u40-b42 for changeset 89f6c9663d75 changeset cbeef786ce48 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=cbeef786ce48 author: katleman date: Tue Aug 27 08:43:04 2013 -0700 Added tag jdk7u40-b43 for changeset 3ee85b3793de changeset 4ee34d2cf2d8 in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=4ee34d2cf2d8 author: katleman date: Tue Sep 03 22:34:36 2013 -0700 Added tag jdk7u40-b60 for changeset cbeef786ce48 changeset a2ff16e5361f in /hg/release/icedtea7-forest-2.4/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=a2ff16e5361f author: andrew date: Wed Sep 04 16:45:43 2013 +0100 Merge jdk7u40-b60 diffstat: .hgtags | 15 ++++++++++ .jcheck/conf | 2 - src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java | 8 +++++ 3 files changed, 23 insertions(+), 2 deletions(-) diffs (116 lines): diff -r cd6971747e7a -r a2ff16e5361f .hgtags --- a/.hgtags Mon Aug 12 12:07:42 2013 -0700 +++ b/.hgtags Wed Sep 04 16:45:43 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 @@ -319,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 @@ -329,6 +338,7 @@ 016957700ac905ebf3432ae8ba17d3576a51e585 jdk7u40-b28 15a82c84d9f7f6c99310380d4766fc68a3882671 jdk7u40-b29 2f8f617ecc4f0772b090a3be742780d8375c68f6 jdk7u40-b30 +c0e48fdfb6959d4024f49e99321d368810d2d7ef icedtea-2.4.1 f500fd46c18b783f7b4ab22314f64f131f50c5d5 jdk7u40-b31 83a688927f16b69690f707a6b579edbe55b01e25 jdk7u40-b32 3ceef25a8cdd9a27a7a2dea0efd8721100cfa30f jdk7u40-b33 @@ -338,3 +348,8 @@ 918e6c87b006e32c80a937c7b0f2f9c65edbecdb jdk7u40-b37 7ae2e9ed2c448a683f2df8673df145d20f13d585 jdk7u40-b38 4af46770372d3c433811934e6759f5118e5c7648 jdk7u40-b39 +cd6971747e7a56fef9a3d8b10e39590b349e41c4 jdk7u40-b40 +adc234666397f6bdacd295c87be34c6a1a4d7bf2 jdk7u40-b41 +89f6c9663d75d9e4b672aed16f885b84232e9c93 jdk7u40-b42 +3ee85b3793de16855e20272336a3565af8477b6b jdk7u40-b43 +cbeef786ce489096c39ec5effee4f8f9e770b4af jdk7u40-b60 diff -r cd6971747e7a -r a2ff16e5361f .jcheck/conf --- a/.jcheck/conf Mon Aug 12 12:07:42 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r cd6971747e7a -r a2ff16e5361f 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 Mon Aug 12 12:07:42 2013 -0700 +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Wed Sep 04 16:45:43 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 Sep 4 10:23:17 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 04 Sep 2013 17:23:17 +0000 Subject: /hg/release/icedtea7-forest-2.4/langtools: 6 new changesets Message-ID: changeset 95cefc18bea4 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=95cefc18bea4 author: asaha date: Mon Aug 19 12:19:28 2013 -0700 Added tag jdk7u40-b40 for changeset 0e83f513af68 changeset 765bea9bfcfc in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=765bea9bfcfc author: katleman date: Wed Aug 21 12:11:48 2013 -0700 Added tag jdk7u40-b41 for changeset 95cefc18bea4 changeset 988ece7b6865 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=988ece7b6865 author: katleman date: Mon Aug 26 07:41:55 2013 -0700 Added tag jdk7u40-b42 for changeset 765bea9bfcfc changeset a67dbf96bf86 in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=a67dbf96bf86 author: katleman date: Tue Aug 27 08:43:20 2013 -0700 Added tag jdk7u40-b43 for changeset 988ece7b6865 changeset b2e29b79e54e in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=b2e29b79e54e author: katleman date: Tue Sep 03 22:34:46 2013 -0700 Added tag jdk7u40-b60 for changeset a67dbf96bf86 changeset 06ea051f7ffe in /hg/release/icedtea7-forest-2.4/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=06ea051f7ffe author: andrew date: Wed Sep 04 16:45:43 2013 +0100 Merge jdk7u40-b60 diffstat: .hgtags | 15 +++++++++++++++ .jcheck/conf | 2 -- make/Makefile | 4 ++++ make/build.properties | 3 ++- make/build.xml | 2 +- 5 files changed, 22 insertions(+), 4 deletions(-) diffs (137 lines): diff -r 0e83f513af68 -r 06ea051f7ffe .hgtags --- a/.hgtags Mon Aug 12 12:07:51 2013 -0700 +++ b/.hgtags Wed Sep 04 16:45:43 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 @@ -319,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 @@ -329,6 +338,7 @@ 9f2eea2fae59c5242d1bb4cbca967bb6fbb99865 jdk7u40-b28 bfe3575143fddbf71c2e570b580afef007d171e4 jdk7u40-b29 0586afeb2caa0b4595bf5b306657a5dd1f0d121c jdk7u40-b30 +91c95fd8eea822b47bcebd7eed22fdf3c404dd62 icedtea-2.4.1 9c343668b0a95e5510f715014884e5d45df9dfb0 jdk7u40-b31 056f998e75f87a299808671ecc0d96e270f62dca jdk7u40-b32 e36d8f754801c9d17585a9469f9b33f9799167f8 jdk7u40-b33 @@ -338,3 +348,8 @@ 31908290e4c2241ae9a8000c2a80e0f5fbad2a2c jdk7u40-b37 21672c0e6691cfa1a477e7f0065afecb4148ddff jdk7u40-b38 81925e555c94bb19c44bc21ff3e513ea19efbd10 jdk7u40-b39 +0e83f513af688a0b9fd6c9d9389c247ef6fb1afb jdk7u40-b40 +95cefc18bea41615c6c9b85ccbdf62af899174cb jdk7u40-b41 +765bea9bfcfc8c472df0a2daced5e576095f46ac jdk7u40-b42 +988ece7b686564084770e99ca26746c45ffb933f jdk7u40-b43 +a67dbf96bf86989d0392cc5b66e5d4139cbceec7 jdk7u40-b60 diff -r 0e83f513af68 -r 06ea051f7ffe .jcheck/conf --- a/.jcheck/conf Mon Aug 12 12:07:51 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 0e83f513af68 -r 06ea051f7ffe make/Makefile --- a/make/Makefile Mon Aug 12 12:07:51 2013 -0700 +++ b/make/Makefile Wed Sep 04 16:45:43 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 0e83f513af68 -r 06ea051f7ffe make/build.properties --- a/make/build.properties Mon Aug 12 12:07:51 2013 -0700 +++ b/make/build.properties Wed Sep 04 16:45:43 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 0e83f513af68 -r 06ea051f7ffe make/build.xml --- a/make/build.xml Mon Aug 12 12:07:51 2013 -0700 +++ b/make/build.xml Wed Sep 04 16:45:43 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 Sep 4 10:23:25 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 04 Sep 2013 17:23:25 +0000 Subject: /hg/release/icedtea7-forest-2.4/hotspot: 12 new changesets Message-ID: changeset 4445f65c4793 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=4445f65c4793 author: asaha date: Mon Aug 19 12:18:27 2013 -0700 Added tag jdk7u40-b40 for changeset 86673506aeb6 changeset 4e779305ed58 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=4e779305ed58 author: katleman date: Wed Aug 21 12:11:02 2013 -0700 Added tag jdk7u40-b41 for changeset 4445f65c4793 changeset 48193a76dc3a in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=48193a76dc3a author: katleman date: Mon Aug 26 07:41:23 2013 -0700 Added tag jdk7u40-b42 for changeset 4e779305ed58 changeset b006d79fa741 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b006d79fa741 author: amurillo date: Fri Jul 26 12:13:19 2013 -0700 8021565: new hotspot build - hs24-b56 Reviewed-by: jcoomes changeset 84c2eb6a682b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=84c2eb6a682b author: kevinw date: Fri Aug 02 12:26:46 2013 +0100 8020943: Memory leak when GCNotifier uses create_from_platform_dependent_str() Reviewed-by: mgerdin, fparain, dcubed changeset 2bf38259b945 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2bf38259b945 author: amurillo date: Mon Aug 26 11:51:26 2013 -0700 8023751: Need to backout 8020943, was pushed to hs24 without approval Reviewed-by: jcoomes changeset b8d8caf6df74 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b8d8caf6df74 author: amurillo date: Mon Aug 26 11:56:32 2013 -0700 Merge changeset eceae0478243 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=eceae0478243 author: amurillo date: Mon Aug 26 11:56:33 2013 -0700 Added tag hs24-b56 for changeset b8d8caf6df74 changeset af1fc2868a2b in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=af1fc2868a2b author: katleman date: Tue Aug 27 08:42:54 2013 -0700 Added tag jdk7u40-b43 for changeset eceae0478243 changeset bf3a8b634b75 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=bf3a8b634b75 author: katleman date: Tue Sep 03 22:34:28 2013 -0700 Added tag jdk7u40-b60 for changeset af1fc2868a2b changeset 30b96ab0954c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=30b96ab0954c author: andrew date: Wed Sep 04 16:45:43 2013 +0100 Merge jdk7u40-b60 changeset f3f4df30a468 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f3f4df30a468 author: andrew date: Wed Sep 04 18:21:33 2013 +0100 PR1551: Add build support for Zero AArch64 diffstat: .hgtags | 16 + .jcheck/conf | 2 - agent/src/os/linux/Makefile | 11 +- agent/src/os/linux/libproc.h | 29 +- 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 | 61 ++- 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/x86/vm/c2_globals_x86.hpp | 2 +- src/cpu/zero/vm/sharedRuntime_zero.cpp | 4 +- src/os/linux/vm/os_linux.cpp | 62 +++- src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp | 11 +- src/os_cpu/linux_zero/vm/globals_linux_zero.hpp | 2 +- src/share/vm/asm/codeBuffer.hpp | 2 +- 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/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/prims/jni.cpp | 2 +- src/share/vm/prims/jvmtiEnv.cpp | 3 + src/share/vm/runtime/arguments.cpp | 9 +- src/share/vm/runtime/globals.hpp | 2 +- src/share/vm/runtime/os.cpp | 3 + src/share/vm/shark/sharkCompiler.cpp | 4 +- src/share/vm/trace/trace.dtd | 3 - src/share/vm/trace/traceEventClasses.xsl | 2 +- src/share/vm/trace/traceEventIds.xsl | 2 +- src/share/vm/trace/traceTypes.xsl | 2 +- src/share/vm/utilities/bitMap.hpp | 2 +- src/share/vm/utilities/macros.hpp | 8 + src/share/vm/utilities/ostream.cpp | 2 +- src/share/vm/utilities/vmError.cpp | 10 +- test/runtime/7020373/GenOOMCrashClass.java | 157 ++++++++++ test/runtime/7020373/Test7020373.sh | 4 + test/runtime/7020373/testcase.jar | Bin 54 files changed, 481 insertions(+), 147 deletions(-) diffs (truncated from 1613 to 500 lines): diff -r 86673506aeb6 -r f3f4df30a468 .hgtags --- a/.hgtags Mon Aug 12 12:07:33 2013 -0700 +++ b/.hgtags Wed Sep 04 18:21:33 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 @@ -492,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 @@ -512,6 +521,7 @@ 88e43f47a8da8093743a1b6ca1ae4b79d994472a hs24-b49 24f785f94d2f5be0f5c48e80f2a6cc7f8815dd8b jdk7u40-b30 41118cf72ace4f0cee56a9ff437226e98e46e9d7 hs24-b50 +5f53e771711627b23e8c9ac53121e1e8ea9f00b4 icedtea-2.4.1 645b68762a367d82c2b55f76cae431b767bee3ac jdk7u40-b31 2417fa1acf2ba8521f480f2baef9af279ec2bf15 hs24-b51 9658c969b7cf0de256691a80f44dcfe73d72a02f jdk7u40-b32 @@ -544,3 +554,9 @@ 295528bfcdd10051f72572a26bfad2317b7de464 jdk7u40-b37 1f3b0ff9649c4be3b08cc829d37eee98d9c6e605 jdk7u40-b38 74de360e341530494c05af1ea1358abea0be93e0 jdk7u40-b39 +86673506aeb60dfa66d90233e6bbbb06e864589e jdk7u40-b40 +4445f65c4793f8421c12423396776f36765433a8 jdk7u40-b41 +4e779305ed58e21b433626ac06b5eb884055183b jdk7u40-b42 +b8d8caf6df744d5342b5d284376a005e86c0b108 hs24-b56 +eceae04782438987cd747e1c76e4085f50b43a18 jdk7u40-b43 +af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60 diff -r 86673506aeb6 -r f3f4df30a468 .jcheck/conf --- a/.jcheck/conf Mon Aug 12 12:07:33 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 86673506aeb6 -r f3f4df30a468 agent/src/os/linux/Makefile --- a/agent/src/os/linux/Makefile Mon Aug 12 12:07:33 2013 -0700 +++ b/agent/src/os/linux/Makefile Wed Sep 04 18:21:33 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 86673506aeb6 -r f3f4df30a468 agent/src/os/linux/libproc.h --- a/agent/src/os/linux/libproc.h Mon Aug 12 12:07:33 2013 -0700 +++ b/agent/src/os/linux/libproc.h Wed Sep 04 18:21:33 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 86673506aeb6 -r f3f4df30a468 make/hotspot_version --- a/make/hotspot_version Mon Aug 12 12:07:33 2013 -0700 +++ b/make/hotspot_version Wed Sep 04 18:21:33 2013 +0100 @@ -35,7 +35,7 @@ HS_MAJOR_VER=24 HS_MINOR_VER=0 -HS_BUILD_NUMBER=55 +HS_BUILD_NUMBER=56 JDK_MAJOR_VER=1 JDK_MINOR_VER=7 diff -r 86673506aeb6 -r f3f4df30a468 make/linux/makefiles/adlc.make --- a/make/linux/makefiles/adlc.make Mon Aug 12 12:07:33 2013 -0700 +++ b/make/linux/makefiles/adlc.make Wed Sep 04 18:21:33 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 86673506aeb6 -r f3f4df30a468 make/linux/makefiles/buildtree.make --- a/make/linux/makefiles/buildtree.make Mon Aug 12 12:07:33 2013 -0700 +++ b/make/linux/makefiles/buildtree.make Wed Sep 04 18:21:33 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 86673506aeb6 -r f3f4df30a468 make/linux/makefiles/defs.make --- a/make/linux/makefiles/defs.make Mon Aug 12 12:07:33 2013 -0700 +++ b/make/linux/makefiles/defs.make Wed Sep 04 18:21:33 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 86673506aeb6 -r f3f4df30a468 make/linux/makefiles/gcc.make --- a/make/linux/makefiles/gcc.make Mon Aug 12 12:07:33 2013 -0700 +++ b/make/linux/makefiles/gcc.make Wed Sep 04 18:21:33 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 86673506aeb6 -r f3f4df30a468 make/linux/makefiles/jsig.make --- a/make/linux/makefiles/jsig.make Mon Aug 12 12:07:33 2013 -0700 +++ b/make/linux/makefiles/jsig.make Wed Sep 04 18:21:33 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 endif [ -f $(LIBJSIG_G_DEBUGINFO) ] || { ln -s $(LIBJSIG_DEBUGINFO) $(LIBJSIG_G_DEBUGINFO); } - ifeq ($(ZIP_DEBUGINFO_FILES),1) + ifneq ($(STRIP_POLICY),no_strip) + ifeq ($(ZIP_DEBUGINFO_FILES),1) $(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO) $(LIBJSIG_G_DEBUGINFO) $(RM) $(LIBJSIG_DEBUGINFO) $(LIBJSIG_G_DEBUGINFO) [ -f $(LIBJSIG_G_DIZ) ] || { ln -s $(LIBJSIG_DIZ) $(LIBJSIG_G_DIZ); } + endif endif endif diff -r 86673506aeb6 -r f3f4df30a468 make/linux/makefiles/rules.make --- a/make/linux/makefiles/rules.make Mon Aug 12 12:07:33 2013 -0700 +++ b/make/linux/makefiles/rules.make Wed Sep 04 18:21:33 2013 +0100 @@ -143,20 +143,10 @@ include $(GAMMADIR)/make/altsrc.make -# The non-PIC object files are only generated for 32 bit platforms. -ifdef LP64 %.o: %.cpp @echo Compiling $< $(QUIETLY) $(REMOVE_TARGET) $(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE) -else -%.o: %.cpp - @echo Compiling $< - $(QUIETLY) $(REMOVE_TARGET) - $(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \ - $(subst $(VM_PICFLAG), ,$(COMPILE.CXX)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \ - $(COMPILE.CXX) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)) -endif %.o: %.s @echo Assembling $< diff -r 86673506aeb6 -r f3f4df30a468 make/linux/makefiles/saproc.make --- a/make/linux/makefiles/saproc.make Mon Aug 12 12:07:33 2013 -0700 +++ b/make/linux/makefiles/saproc.make Wed Sep 04 18:21:33 2013 +0100 @@ -101,8 +101,11 @@ -lthread_db $(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); } ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) + ifneq ($(STRIP_POLICY),no_strip) $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO) $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@ + [ -f $(LIBSAPROC_G_DEBUGINFO) ] || { ln -s $(LIBSAPROC_DEBUGINFO) $(LIBSAPROC_G_DEBUGINFO); } + endif ifeq ($(STRIP_POLICY),all_strip) $(QUIETLY) $(STRIP) $@ else @@ -111,11 +114,12 @@ # implied else here is no stripping at all endif endif - [ -f $(LIBSAPROC_G_DEBUGINFO) ] || { ln -s $(LIBSAPROC_DEBUGINFO) $(LIBSAPROC_G_DEBUGINFO); } ifeq ($(ZIP_DEBUGINFO_FILES),1) + ifneq ($(STRIP_POLICY),no_strip) $(ZIPEXE) -q -y $(LIBSAPROC_DIZ) $(LIBSAPROC_DEBUGINFO) $(LIBSAPROC_G_DEBUGINFO) $(RM) $(LIBSAPROC_DEBUGINFO) $(LIBSAPROC_G_DEBUGINFO) [ -f $(LIBSAPROC_G_DIZ) ] || { ln -s $(LIBSAPROC_DIZ) $(LIBSAPROC_G_DIZ); } + endif endif endif diff -r 86673506aeb6 -r f3f4df30a468 make/linux/makefiles/vm.make --- a/make/linux/makefiles/vm.make Mon Aug 12 12:07:33 2013 -0700 +++ b/make/linux/makefiles/vm.make Wed Sep 04 18:21:33 2013 +0100 @@ -98,6 +98,10 @@ ${HS_LIB_ARCH} \ ${VM_DISTRO} +ifdef DERIVATIVE_ID +CPPFLAGS += -DDERIVATIVE_ID="\"$(DERIVATIVE_ID)\"" +endif + # This is VERY important! The version define must only be supplied to vm_version.o # If not, ccache will not re-use the cache at all, since the version string might contain # a time and date. @@ -112,6 +116,10 @@ CFLAGS += -DINCLUDE_TRACE=1 endif +ifdef DISTRIBUTION_ID +CPPFLAGS += -DDISTRIBUTION_ID="\"$(DISTRIBUTION_ID)\"" +endif + # CFLAGS_WARN holds compiler options to suppress/enable warnings. CFLAGS += $(CFLAGS_WARN/BYFILE) @@ -244,13 +252,15 @@ vm.def: $(Res_Files) $(Obj_Files) sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@ -ifeq ($(JVM_VARIANT_ZEROSHARK), true) - STATIC_CXX = false -else - ifeq ($(ZERO_LIBARCH), ppc64) +ifeq ($(STATIC_CXX),) + ifeq ($(JVM_VARIANT_ZEROSHARK), true) STATIC_CXX = false else - STATIC_CXX = true + ifeq ($(ZERO_LIBARCH), ppc64) + STATIC_CXX = false + else + STATIC_CXX = true + endif endif endif @@ -276,9 +286,6 @@ LIBS_VM += $(LIBS) endif -ifeq ($(JVM_VARIANT_ZERO), true) - LIBS_VM += $(LIBFFI_LIBS) From bugzilla-daemon at icedtea.classpath.org Wed Sep 4 10:23:32 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 17:23:32 +0000 Subject: [Bug 1551] [IcedTea7] Add build support for Zero AArch64 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1551 --- Comment #3 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f3f4df30a468 author: andrew date: Wed Sep 04 18:21:33 2013 +0100 PR1551: Add build support for Zero AArch64 -- 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/20130904/94e1912b/attachment.html From andrew at icedtea.classpath.org Wed Sep 4 10:23:45 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 04 Sep 2013 17:23:45 +0000 Subject: /hg/release/icedtea7-forest-2.4/jdk: 14 new changesets Message-ID: changeset ae85cfff71e9 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ae85cfff71e9 author: asaha date: Mon Aug 19 12:19:01 2013 -0700 Added tag jdk7u40-b40 for changeset 42b57fb81c39 changeset b479996d5c92 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b479996d5c92 author: katleman date: Wed Aug 21 12:11:37 2013 -0700 Added tag jdk7u40-b41 for changeset ae85cfff71e9 changeset fb25cdef17e9 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=fb25cdef17e9 author: katleman date: Mon Aug 26 07:41:45 2013 -0700 Added tag jdk7u40-b42 for changeset b479996d5c92 changeset ed444a09a5fd in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ed444a09a5fd author: katleman date: Tue Aug 27 08:43:09 2013 -0700 Added tag jdk7u40-b43 for changeset fb25cdef17e9 changeset 168bd87376ea in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=168bd87376ea author: katleman date: Tue Sep 03 22:34:40 2013 -0700 Added tag jdk7u40-b60 for changeset ed444a09a5fd changeset 73dacb7e1e46 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=73dacb7e1e46 author: andrew date: Wed Sep 04 16:45:43 2013 +0100 Merge jdk7u40-b60 changeset 8c32012ed998 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8c32012ed998 author: jgodinez date: Wed Feb 06 14:45:02 2013 -0800 8005194: [parfait] #353 sun/awt/image/jpeg/imageioJPEG.c Memory leak of pointer 'scale' allocated with calloc() Reviewed-by: prr, vadim Contributed-by: jia-hong.chen at oracle.com changeset e48d34b7f242 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e48d34b7f242 author: ebaron date: Wed Aug 14 17:42:50 2013 +0100 Handle alternative Kerberos credential cache locations changeset 5d4700b439fc in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5d4700b439fc author: andrew date: Fri Aug 30 01:00:23 2013 +0100 Fix Kerberos cache support to check for null, fallback on old path support and not hardcode the krb5 library. changeset 4b7642bbc8d7 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4b7642bbc8d7 author: andrew date: Tue Sep 03 15:19:59 2013 +0100 Only define _GNU_SOURCE if not already defined. changeset 560c783d93b3 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=560c783d93b3 author: andrew date: Wed Sep 04 17:28:03 2013 +0100 PR1551: Add build support for Zero AArch64 changeset 9c5337739f79 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9c5337739f79 author: andrew date: Wed Sep 04 17:32:38 2013 +0100 PR1552: Add -D_LITTLE_ENDIAN for ARM architectures. changeset abcc5e95d577 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=abcc5e95d577 author: andrew date: Wed Sep 04 17:53:23 2013 +0100 PR1553: Add Debian AArch64 support changeset b2611b1a750c in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b2611b1a750c author: andrew date: Wed Sep 04 18:20:38 2013 +0100 PR1554: Fix build on Mac OS X Contributed-by: Alex Kasko diffstat: .hgtags | 15 + .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 | 11 +- 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 | 52 + make/jdk_generic_profile.sh | 89 +- 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/jawt/Makefile | 7 + make/sun/jpeg/FILES_c.gmk | 6 +- make/sun/jpeg/Makefile | 11 +- make/sun/lwawt/FILES_c_macosx.gmk | 6 + make/sun/lwawt/Makefile | 7 +- make/sun/native2ascii/Makefile | 2 +- make/sun/net/FILES_java.gmk | 1 + make/sun/nio/cs/Makefile | 2 +- make/sun/security/Makefile | 11 +- make/sun/security/krb5/internal/ccache/Makefile | 49 + 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/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/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/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/Version.java.template | 58 +- 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/krb5/internal/ccache/FileCredentialsCache.java | 96 +- 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/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 | 9 + 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 | 7 +- 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/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/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/security/krb5/internal/ccache/krb5ccache.c | 113 + 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/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/Locale/data/deflocale.sol10 | 1725 ---------- 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/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 ++ 352 files changed, 31827 insertions(+), 30675 deletions(-) diffs (truncated from 70646 to 500 lines): diff -r 42b57fb81c39 -r b2611b1a750c .hgtags --- a/.hgtags Mon Aug 12 12:07:45 2013 -0700 +++ b/.hgtags Wed Sep 04 18:20:38 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 @@ -318,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 @@ -328,6 +337,7 @@ 2043900095890e676f5ed0f959f470e2138c2a9a jdk7u40-b28 d3186a0676dbc7ab80e00fa67f952b67933d5a35 jdk7u40-b29 60d52db33828bf0355a94be2a82df90c901592f3 jdk7u40-b30 +65d95818d79e340d042457ee1a8155d7658e86b6 icedtea-2.4.1 c2522d149ff6663ed1d3602c88c286cff25a43a7 jdk7u40-b31 b9f86896cd0aa9b83e472a90b20ae7c253fba633 jdk7u40-b32 419939ecee8311c8a38ff624ae67e473f8c60e51 jdk7u40-b33 @@ -337,3 +347,8 @@ 04036faa7fc4ec11a268c190cf1712d19c77b4ba jdk7u40-b37 070b277e1b43cc4b6a4e1ae419d1273970f718ed jdk7u40-b38 33921df593eda3d241d0d1322effc21486a6bb94 jdk7u40-b39 +42b57fb81c3958fc98e7c5cd81826565f4cedb91 jdk7u40-b40 +ae85cfff71e95c3a1882177779c5f681d2621410 jdk7u40-b41 +b479996d5c924128c3490165b592bf66a3034932 jdk7u40-b42 +fb25cdef17e9610db5cb89fc35c0c4abef5ad781 jdk7u40-b43 +ed444a09a5fd32237deaef6e43804e20ba4f6352 jdk7u40-b60 diff -r 42b57fb81c39 -r b2611b1a750c .jcheck/conf --- a/.jcheck/conf Mon Aug 12 12:07:45 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 42b57fb81c39 -r b2611b1a750c make/com/sun/java/pack/Makefile --- a/make/com/sun/java/pack/Makefile Mon Aug 12 12:07:45 2013 -0700 +++ b/make/com/sun/java/pack/Makefile Wed Sep 04 18:20:38 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 42b57fb81c39 -r b2611b1a750c make/com/sun/nio/sctp/Makefile --- a/make/com/sun/nio/sctp/Makefile Mon Aug 12 12:07:45 2013 -0700 +++ b/make/com/sun/nio/sctp/Makefile Wed Sep 04 18:20:38 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 42b57fb81c39 -r b2611b1a750c make/common/Defs-linux.gmk --- a/make/common/Defs-linux.gmk Mon Aug 12 12:07:45 2013 -0700 +++ b/make/common/Defs-linux.gmk Wed Sep 04 18:20:38 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 42b57fb81c39 -r b2611b1a750c make/common/Library.gmk --- a/make/common/Library.gmk Mon Aug 12 12:07:45 2013 -0700 +++ b/make/common/Library.gmk Wed Sep 04 18:20:38 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 42b57fb81c39 -r b2611b1a750c make/common/Program.gmk --- a/make/common/Program.gmk Mon Aug 12 12:07:45 2013 -0700 +++ b/make/common/Program.gmk Wed Sep 04 18:20:38 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 42b57fb81c39 -r b2611b1a750c make/common/Release.gmk --- a/make/common/Release.gmk Mon Aug 12 12:07:45 2013 -0700 +++ b/make/common/Release.gmk Wed Sep 04 18:20:38 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 42b57fb81c39 -r b2611b1a750c make/common/shared/Compiler-gcc.gmk --- a/make/common/shared/Compiler-gcc.gmk Mon Aug 12 12:07:45 2013 -0700 +++ b/make/common/shared/Compiler-gcc.gmk Wed Sep 04 18:20:38 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 + REQUIRED_CC_VER = 3.2 + REQUIRED_GCC_VER = 2.9[56789].* + endif + ifneq ("$(findstring m68k,$(ARCH))", "") + # m68k + REQUIRED_CC_VER = 3.2 + REQUIRED_GCC_VER = 3.2.* + endif + ifneq ("$(findstring mips,$(ARCH))", "") + # mips + REQUIRED_CC_VER = 3.2 + REQUIRED_GCC_VER = 3.2.* + endif + ifneq ("$(findstring parisc,$(ARCH))", "") + # mips + REQUIRED_CC_VER = 4.4 + REQUIRED_GCC_VER = 4.4.* From bugzilla-daemon at icedtea.classpath.org Wed Sep 4 10:23:51 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 17:23:51 +0000 Subject: [Bug 1551] [IcedTea7] Add build support for Zero AArch64 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1551 --- Comment #4 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=560c783d93b3 author: andrew date: Wed Sep 04 17:28:03 2013 +0100 PR1551: Add build support for Zero AArch64 -- 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/20130904/faef4c8a/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Sep 4 10:23:56 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 17:23:56 +0000 Subject: [Bug 1552] [IcedTea7] Add -D_LITTLE_ENDIAN for ARM architectures In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1552 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9c5337739f79 author: andrew date: Wed Sep 04 17:32:38 2013 +0100 PR1552: Add -D_LITTLE_ENDIAN for ARM architectures. -- 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/20130904/5e6f2911/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Sep 4 10:24:01 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 17:24:01 +0000 Subject: [Bug 1553] [IcedTea7] Add Debian AArch64 support In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1553 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=abcc5e95d577 author: andrew date: Wed Sep 04 17:53:23 2013 +0100 PR1553: Add Debian AArch64 support -- 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/20130904/6a69f1c4/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Sep 4 10:24:06 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 17:24:06 +0000 Subject: [Bug 1554] [IcedTea7] Fix build on Mac OS X In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1554 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b2611b1a750c author: andrew date: Wed Sep 04 18:20:38 2013 +0100 PR1554: Fix build on Mac OS X Contributed-by: Alex Kasko -- 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/20130904/63bc69e2/attachment.html From aazores at icedtea.classpath.org Wed Sep 4 10:49:09 2013 From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org) Date: Wed, 04 Sep 2013 17:49:09 +0000 Subject: /hg/icedtea-web: Fixed "could not clear cache" message and cache... Message-ID: changeset bb8132ebc241 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=bb8132ebc241 author: Andrew Azores date: Wed Sep 04 13:48:42 2013 -0400 Fixed "could not clear cache" message and cache location in CacheReproducer diffstat: ChangeLog | 8 + netx/net/sourceforge/jnlp/config/Defaults.java | 2 +- tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java | 95 +++++---- 3 files changed, 64 insertions(+), 41 deletions(-) diffs (228 lines): diff -r 6c0e37585a5e -r bb8132ebc241 ChangeLog --- a/ChangeLog Wed Sep 04 12:22:16 2013 -0400 +++ b/ChangeLog Wed Sep 04 13:48:42 2013 -0400 @@ -1,3 +1,11 @@ +2013-09-04 Andrew Azores + + * netx/net/sourceforge/jnlp/config/Defaults.java: (USER_CACHE_HOME) made + public for use in CacheReproducer + * tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest: + updated "could not clear cache" message and cache location. Other minor + cleanup + 2013-09-04 Andrew Azores * netx/net/sourceforge/jnlp/security/SecurityDialogs.java: diff -r 6c0e37585a5e -r bb8132ebc241 netx/net/sourceforge/jnlp/config/Defaults.java --- a/netx/net/sourceforge/jnlp/config/Defaults.java Wed Sep 04 12:22:16 2013 -0400 +++ b/netx/net/sourceforge/jnlp/config/Defaults.java Wed Sep 04 13:48:42 2013 -0400 @@ -55,7 +55,7 @@ final static String SYSTEM_HOME = System.getProperty("java.home"); final static String SYSTEM_SECURITY = SYSTEM_HOME + File.separator + "lib" + File.separator + "security"; final static String USER_CONFIG_HOME; - final static String USER_CACHE_HOME; + public final static String USER_CACHE_HOME; final static String USER_SECURITY; final static String LOCKS_DIR = System.getProperty("java.io.tmpdir") + File.separator + System.getProperty("user.name") + File.separator + "netx" + File.separator diff -r 6c0e37585a5e -r bb8132ebc241 tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java --- a/tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java Wed Sep 04 12:22:16 2013 -0400 +++ b/tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java Wed Sep 04 13:48:42 2013 -0400 @@ -44,11 +44,13 @@ import java.io.UnsupportedEncodingException; import java.util.Arrays; import java.util.List; +import java.util.PropertyResourceBundle; import java.util.regex.Matcher; import java.util.regex.Pattern; import net.sourceforge.jnlp.ServerAccess; -import net.sourceforge.jnlp.ServerAccess.ProcessResult; +import net.sourceforge.jnlp.ProcessResult; import net.sourceforge.jnlp.annotations.KnownToFail; +import net.sourceforge.jnlp.config.Defaults; import org.junit.AfterClass; import org.junit.Assert; @@ -60,24 +62,37 @@ private static final List clear = Arrays.asList(new String[]{server.getJavawsLocation(), "-Xclearcache", ServerAccess.HEADLES_OPTION}); private static final List trustedVerboses = Arrays.asList(new String[]{"-Xtrustall", ServerAccess.HEADLES_OPTION,"-verbose"}); private static final List verbosed = Arrays.asList(new String[]{"-verbose", ServerAccess.HEADLES_OPTION}); - private static final String home = System.getProperty("user.home"); - private static final String name = System.getProperty("user.name"); - private static final String tmp = System.getProperty("java.io.tmpdir"); - private static final File icedteaDir = new File(home + "/" + ".icedtea"); - private static final File icedteaCache = new File(icedteaDir, "cache"); - private static final File icedteaCacheFile = new File(icedteaCache, "recently_used"); - private static final File netxLock = new File(tmp + "/" + name + "/netx/locks/netx_running"); + private static final String lre = "LruCacheException"; private static final String ioobe = "IndexOutOfBoundsException"; private static final String corruptRegex = "\\d{13}"; private static final Pattern corruptPatern = Pattern.compile(corruptRegex); private static final String corruptString = "156dsf1562kd5"; - String testS = "#netx file\n" - + "#Mon Dec 12 16:20:46 CET 2011\n" - + "1323703236508,0=/home/xp13/.icedtea/cache/0/http/localhost/ReadPropertiesBySignedHack.jnlp\n" - + "1323703243086,2=/home/xp14/.icedtea/cache/2/http/localhost/ReadProperties.jar\n" - + "1323703243082,1=/home/xp15/.icedtea/cache/1/http/localhost/ReadPropertiesBySignedHack.jar"; + private static final File icedteaCache = new File(Defaults.USER_CACHE_HOME, "cache"); + private static final File icedteaCacheFile = new File(icedteaCache, "recently_used"); + private static final File netxLock = new File(System.getProperty("java.io.tmpdir"), + System.getProperty("user.name") + File.separator + + "netx" + File.separator + + "locks" + File.separator + + "netx_running"); + + private static final String messageResourcePath = "net/sourceforge/jnlp/resources/Messages.properties"; + private static PropertyResourceBundle messageBundle = null; + + static { + try { + messageBundle = + new PropertyResourceBundle(CacheReproducerTest.class.getClassLoader().getResourceAsStream(messageResourcePath)); + } catch (IOException e) { + } + } + + String testS = "#netx file\n" + + "#Mon Dec 12 16:20:46 CET 2011\n" + + "1323703236508,0=/home/xp13/.icedtea/cache/0/http/localhost/ReadPropertiesBySignedHack.jnlp\n" + + "1323703243086,2=/home/xp14/.icedtea/cache/2/http/localhost/ReadProperties.jar\n" + + "1323703243082,1=/home/xp15/.icedtea/cache/1/http/localhost/ReadPropertiesBySignedHack.jar"; @Test public void cacheIsWorkingTest() throws Exception { @@ -93,20 +108,19 @@ assertCacheIsNotEmpty(); } - private class ParallelSimpleTestRunner extends Thread { - public boolean b=false; - @Override - public void run() { - try { - - ServerAccess.ProcessResult pr = runSimpleTest1(); - evaluateSimpleTest1OkCache(pr); - b=true; - } catch (Exception ex) { - throw new RuntimeException(ex); - } + private class ParallelSimpleTestRunner extends Thread { + public boolean b=false; + @Override + public void run() { + try { + ProcessResult pr = runSimpleTest1(); + evaluateSimpleTest1OkCache(pr); + b=true; + } catch (Exception ex) { + throw new RuntimeException(ex); } - }; + } + } @Test @KnownToFail @@ -260,7 +274,7 @@ @Override public void run() { try { - ServerAccess.ProcessResult pr = server.executeJavawsHeadless(verbosed, "/deadlocktest.jnlp"); + ProcessResult pr = server.executeJavawsHeadless(verbosed, "/deadlocktest.jnlp"); } catch (Exception ex) { throw new RuntimeException(ex); } @@ -269,12 +283,12 @@ t.start(); Thread.sleep(1000); pr = tryToClearcache(); - String q = "Can not clear cache at this time"; - Assert.assertTrue("Stderr should contain " + q + ", but did not.", pr.stderr.contains(q)); + + String cacheClearError = messageBundle.getString("CCannotClearCache"); + Assert.assertTrue("Stderr should contain " + cacheClearError + ", but did not.", pr.stderr.contains(cacheClearError)); assertCacheIsNotEmpty(); } - //next four tests are designed to ensure, that corrupted cache will not break already loaded cached files public static final String CR1 = "CacheReproducer1"; public static final String CR2 = "CacheReproducer2"; @@ -311,6 +325,7 @@ } @Test + @KnownToFail public void testAlreadyLoadedCached11() throws Exception { testsBody(CR11, 1); testsBody(CR11, 2); @@ -337,7 +352,7 @@ if (force) { if (netxLock.isFile()) { boolean b = netxLock.delete(); - junit.framework.Assert.assertTrue(b); + Assert.assertTrue(b); } } @@ -377,7 +392,7 @@ } String sb = breakOne(s, 0); - junit.framework.Assert.assertEquals(s, sb); + Assert.assertEquals(s, sb); for (int x = 1; x <= 3; x++) { String[] sx = breakOne(s, x).split("\n"); for (int i = 0; i < sx.length; i++) { @@ -426,7 +441,7 @@ } private static String breakPaths(String s) { - return s.replaceAll(home+".*", "/ho"); + return s.replaceAll(System.getProperty("user.home") + ".*", "/ho"); } private static void breakCache1() throws IOException { @@ -447,24 +462,24 @@ ServerAccess.saveFile(s, icedteaCacheFile); } - private static ServerAccess.ProcessResult runSimpleTest1() throws Exception { + private static ProcessResult runSimpleTest1() throws Exception { return runSimpleTest1(verbosed, "simpletest1"); } - private static ServerAccess.ProcessResult runSimpleTest1(List args, String s) throws Exception { - ServerAccess.ProcessResult pr2 = server.executeJavawsHeadless(args, "/" + s + ".jnlp"); + private static ProcessResult runSimpleTest1(List args, String s) throws Exception { + ProcessResult pr2 = server.executeJavawsHeadless(args, "/" + s + ".jnlp"); return pr2; } - private static ServerAccess.ProcessResult runSimpleTest1Signed() throws Exception { + private static ProcessResult runSimpleTest1Signed() throws Exception { return runSimpleTestSigned("SimpletestSigned1"); } - private static ServerAccess.ProcessResult runSimpleTestSigned(String id) throws Exception { + private static ProcessResult runSimpleTestSigned(String id) throws Exception { return runSimpleTest1(trustedVerboses, id); } - private static void evaluateSimpleTest1OkCache(ServerAccess.ProcessResult pr2) throws Exception { + private static void evaluateSimpleTest1OkCache(ProcessResult pr2) throws Exception { String s = "Good simple javaws exapmle"; Assert.assertTrue("test stdout should contain " + s + " but didn't", pr2.stdout.contains(s)); Assert.assertFalse(pr2.wasTerminated); @@ -472,7 +487,7 @@ } private static ProcessResult tryToClearcache() throws Exception { - ServerAccess.ProcessResult pr1 = ServerAccess.executeProcess(clear); + ProcessResult pr1 = ServerAccess.executeProcess(clear); return pr1; } } From bugzilla-daemon at icedtea.classpath.org Wed Sep 4 11:35:26 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Sep 2013 18:35:26 +0000 Subject: [Bug 1455] JVM crashing - SSL_write causing the issue In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1455 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Version|6-1.8.13 |6-1.12.5 Severity|critical |normal --- Comment #4 from Andrew John Hughes --- Thanks. What do I need to do to reproduce this? This makes me wonder: #6 0x00007f81d8817b04 in SSL_write () from /opt/sonus/ema/jboss/bin/META-INF/lib/linux2/x64/libssl.so.0.9.8 Have you tried using the system libssl instead? This looks like an error in non-OpenJDK native code which is then causing the VM to crash. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130904/47b65014/attachment.html From andrew at icedtea.classpath.org Wed Sep 4 17:00:26 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 05 Sep 2013 00:00:26 +0000 Subject: /hg/release/icedtea7-2.4: Update to latest 2.4 HEAD (u40b60). Message-ID: changeset 273d9d59b77b in /hg/release/icedtea7-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=273d9d59b77b author: Andrew John Hughes date: Thu Sep 05 00:21:03 2013 +0100 Update to latest 2.4 HEAD (u40b60). 2013-09-04 Andrew John Hughes * Makefile.am, (OPENJDK_VERSION): Bump to b60. (CORBA_CHANGESET): Update to IcedTea 2.4 branch 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. * hotspot.map: Update to IcedTea 2.4 branch HotSpot HEAD. diffstat: ChangeLog | 19 +++++++++++++++++++ Makefile.am | 26 +++++++++++++------------- hotspot.map | 2 +- 3 files changed, 33 insertions(+), 14 deletions(-) diffs (72 lines): diff -r 415c72468152 -r 273d9d59b77b ChangeLog --- a/ChangeLog Tue Jul 30 19:46:00 2013 +0100 +++ b/ChangeLog Thu Sep 05 00:21:03 2013 +0100 @@ -1,3 +1,22 @@ +2013-09-04 Andrew John Hughes + + * Makefile.am, + (OPENJDK_VERSION): Bump to b60. + (CORBA_CHANGESET): Update to IcedTea 2.4 branch 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. + * hotspot.map: Update to IcedTea 2.4 branch HotSpot + HEAD. + 2013-07-30 Andrew John Hughes * Makefile.am: diff -r 415c72468152 -r 273d9d59b77b Makefile.am --- a/Makefile.am Tue Jul 30 19:46:00 2013 +0100 +++ b/Makefile.am Thu Sep 05 00:21:03 2013 +0100 @@ -1,22 +1,22 @@ # Dependencies -OPENJDK_VERSION = b34 +OPENJDK_VERSION = b60 JDK_UPDATE_VERSION = 40 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = 74ca39d558e8 -JAXP_CHANGESET = 7d8341df70fe -JAXWS_CHANGESET = 92dab5233b50 -JDK_CHANGESET = 4a2244a0e816 -LANGTOOLS_CHANGESET = f3ef419fe842 -OPENJDK_CHANGESET = b5f2715442df +CORBA_CHANGESET = 5ea58899ae9f +JAXP_CHANGESET = 135f46e0e653 +JAXWS_CHANGESET = a2ff16e5361f +JDK_CHANGESET = b2611b1a750c +LANGTOOLS_CHANGESET = 06ea051f7ffe +OPENJDK_CHANGESET = 6125b83238df -CORBA_SHA256SUM = 0f05df309e52837491274963e90232894838ef695880ebc6029dcb7c11d5d349 -JAXP_SHA256SUM = e74c92df177ace833e18d610dff33c04cd498a4da608ed177d3de9a9ed85387d -JAXWS_SHA256SUM = 4d6af21a16945b9241b22f20695719b68bb131f69d2c34c2e60bbb699a64e8e6 -JDK_SHA256SUM = 0f51d28ddc41eb54faa8ecda496153ce9fe844c02f4c87ed107b743555fc064f -LANGTOOLS_SHA256SUM = 6459ae92d498b60d5b49da889a509e6961616524cc90d5c18cd86a099e71b10c -OPENJDK_SHA256SUM = 07b6c6e45f000c60f8d6179756958d4298998bd410869171df390c3c5d1301f9 +CORBA_SHA256SUM = 41fc9041d7804bbd519290325c0a21b48405ed96ccf557037189b007391d33a8 +JAXP_SHA256SUM = 3e043ea822cf18232fb0897431a2c900c8d29dce59e33bd8e3236ed1ac6c8fde +JAXWS_SHA256SUM = ac21931af93267188fb6dac8ed5eb44121e25e55fe432c19184c20c17cc9ceda +JDK_SHA256SUM = e6475b1db792fa58530cef272b1aad6176eca8bd4822f6a58ed27f4d84df2437 +LANGTOOLS_SHA256SUM = d2de1d2e98ebea56d2367f0003e5f4b5031d55ed529a7c524df8eba9da08c735 +OPENJDK_SHA256SUM = bc5703a7c31a6f1de53259768f613fa1f451d721d3301c58a59513dc3953d95b CACAO_VERSION = e215e36be9fc CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab diff -r 415c72468152 -r 273d9d59b77b hotspot.map --- a/hotspot.map Tue Jul 30 19:46:00 2013 +0100 +++ b/hotspot.map Thu Sep 05 00:21:03 2013 +0100 @@ -1,2 +1,2 @@ # version url changeset sha256sum -default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot 71498f89324b ddc89554a6e0d768a4af81610c20c71545850184ad8c608e689917166cfaf188 +default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot f3f4df30a468 f066237f60cb154880b2702dc2a6ec52f53069ea85a89690cbf9a92eb3b62b2b From jvanek at redhat.com Thu Sep 5 00:55:17 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 05 Sep 2013 09:55:17 +0200 Subject: /hg/icedtea-web: Fixed "could not clear cache" message and cache... In-Reply-To: References: Message-ID: <522838E5.2060404@redhat.com> On 09/04/2013 07:49 PM, aazores at icedtea.classpath.org wrote: > changeset bb8132ebc241 in /hg/icedtea-web > details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=bb8132ebc241 > author: Andrew Azores > date: Wed Sep 04 13:48:42 2013 -0400 > > Fixed "could not clear cache" message and cache location in CacheReproducer > > > diffstat: > > ChangeLog | 8 + > netx/net/sourceforge/jnlp/config/Defaults.java | 2 +- > tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java | 95 +++++---- > 3 files changed, 64 insertions(+), 41 deletions(-) > > diffs (228 lines): > > diff -r 6c0e37585a5e -r bb8132ebc241 ChangeLog > --- a/ChangeLog Wed Sep 04 12:22:16 2013 -0400 > +++ b/ChangeLog Wed Sep 04 13:48:42 2013 -0400 > @@ -1,3 +1,11 @@ > +2013-09-04 Andrew Azores > + > + * netx/net/sourceforge/jnlp/config/Defaults.java: (USER_CACHE_HOME) made > + public for use in CacheReproducer > + * tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest: > + updated "could not clear cache" message and cache location. Other minor > + cleanup > + > 2013-09-04 Andrew Azores > > * netx/net/sourceforge/jnlp/security/SecurityDialogs.java: > diff -r 6c0e37585a5e -r bb8132ebc241 netx/net/sourceforge/jnlp/config/Defaults.java > --- a/netx/net/sourceforge/jnlp/config/Defaults.java Wed Sep 04 12:22:16 2013 -0400 > +++ b/netx/net/sourceforge/jnlp/config/Defaults.java Wed Sep 04 13:48:42 2013 -0400 > @@ -55,7 +55,7 @@ > final static String SYSTEM_HOME = System.getProperty("java.home"); > final static String SYSTEM_SECURITY = SYSTEM_HOME + File.separator + "lib" + File.separator + "security"; > final static String USER_CONFIG_HOME; > - final static String USER_CACHE_HOME; > + public final static String USER_CACHE_HOME; > final static String USER_SECURITY; > final static String LOCKS_DIR = System.getProperty("java.io.tmpdir") + File.separator > + System.getProperty("user.name") + File.separator + "netx" + File.separator > diff -r 6c0e37585a5e -r bb8132ebc241 tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java > --- a/tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java Wed Sep 04 12:22:16 2013 -0400 > +++ b/tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java Wed Sep 04 13:48:42 2013 -0400 > @@ -44,11 +44,13 @@ > import java.io.UnsupportedEncodingException; > import java.util.Arrays; > import java.util.List; > +import java.util.PropertyResourceBundle; > import java.util.regex.Matcher; > import java.util.regex.Pattern; > import net.sourceforge.jnlp.ServerAccess; > -import net.sourceforge.jnlp.ServerAccess.ProcessResult; > +import net.sourceforge.jnlp.ProcessResult; > import net.sourceforge.jnlp.annotations.KnownToFail; > +import net.sourceforge.jnlp.config.Defaults; > import org.junit.AfterClass; > import org.junit.Assert; > > @@ -60,24 +62,37 @@ > private static final List clear = Arrays.asList(new String[]{server.getJavawsLocation(), "-Xclearcache", ServerAccess.HEADLES_OPTION}); > private static final List trustedVerboses = Arrays.asList(new String[]{"-Xtrustall", ServerAccess.HEADLES_OPTION,"-verbose"}); > private static final List verbosed = Arrays.asList(new String[]{"-verbose", ServerAccess.HEADLES_OPTION}); > - private static final String home = System.getProperty("user.home"); > - private static final String name = System.getProperty("user.name"); > - private static final String tmp = System.getProperty("java.io.tmpdir"); > - private static final File icedteaDir = new File(home + "/" + ".icedtea"); > - private static final File icedteaCache = new File(icedteaDir, "cache"); > - private static final File icedteaCacheFile = new File(icedteaCache, "recently_used"); > - private static final File netxLock = new File(tmp + "/" + name + "/netx/locks/netx_running"); > + > private static final String lre = "LruCacheException"; > private static final String ioobe = "IndexOutOfBoundsException"; > private static final String corruptRegex = "\\d{13}"; > private static final Pattern corruptPatern = Pattern.compile(corruptRegex); > private static final String corruptString = "156dsf1562kd5"; > > - String testS = "#netx file\n" > - + "#Mon Dec 12 16:20:46 CET 2011\n" > - + "1323703236508,0=/home/xp13/.icedtea/cache/0/http/localhost/ReadPropertiesBySignedHack.jnlp\n" > - + "1323703243086,2=/home/xp14/.icedtea/cache/2/http/localhost/ReadProperties.jar\n" > - + "1323703243082,1=/home/xp15/.icedtea/cache/1/http/localhost/ReadPropertiesBySignedHack.jar"; > + private static final File icedteaCache = new File(Defaults.USER_CACHE_HOME, "cache"); > + private static final File icedteaCacheFile = new File(icedteaCache, "recently_used"); > + private static final File netxLock = new File(System.getProperty("java.io.tmpdir"), > + System.getProperty("user.name") + File.separator + > + "netx" + File.separator + > + "locks" + File.separator + > + "netx_running"); > + > + private static final String messageResourcePath = "net/sourceforge/jnlp/resources/Messages.properties"; > + private static PropertyResourceBundle messageBundle = null; > + > + static { > + try { > + messageBundle = > + new PropertyResourceBundle(CacheReproducerTest.class.getClassLoader().getResourceAsStream(messageResourcePath)); > + } catch (IOException e) { > + } > + } > + Pleae NEVER consume an exception. In this case the } catch (IOException ex) { throw new RuntimeException(ex); } Would be the best. You can push this without any other review (unless you think about different fix) J. From ptisnovs at icedtea.classpath.org Thu Sep 5 01:39:01 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 05 Sep 2013 08:39:01 +0000 Subject: /hg/gfx-test: Ten new tests added into BitBltUsingBgColor test s... Message-ID: changeset 2f476a912028 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=2f476a912028 author: Pavel Tisnovsky date: Thu Sep 05 10:42:39 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 3939316ef6dd -r 2f476a912028 ChangeLog --- a/ChangeLog Wed Sep 04 11:53:33 2013 +0200 +++ b/ChangeLog Thu Sep 05 10:42:39 2013 +0200 @@ -1,3 +1,8 @@ +2013-09-05 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Ten new tests added into BitBltUsingBgColor test suite. + 2013-09-04 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBasicTests.java: diff -r 3939316ef6dd -r 2f476a912028 src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Wed Sep 04 11:53:33 2013 +0200 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Thu Sep 05 10:42:39 2013 +0200 @@ -3452,6 +3452,156 @@ } /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB. + * 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 testBitBltCheckerBufferedImageTypeIntARGBbackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, Color.white); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB_PRE. + * 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 testBitBltCheckerBufferedImageTypeIntARGB_Pre_backgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGBPre(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB_PRE. + * 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 testBitBltCheckerBufferedImageTypeIntARGB_Pre_backgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGBPre(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB_PRE. + * 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 testBitBltCheckerBufferedImageTypeIntARGB_Pre_backgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGBPre(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB_PRE. + * 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 testBitBltCheckerBufferedImageTypeIntARGB_Pre_backgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGBPre(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB_PRE. + * 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 testBitBltCheckerBufferedImageTypeIntARGB_Pre_backgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGBPre(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB_PRE. + * 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 testBitBltCheckerBufferedImageTypeIntARGB_Pre_backgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGBPre(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB_PRE. + * 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 testBitBltCheckerBufferedImageTypeIntARGB_Pre_backgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGBPre(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB_PRE. + * 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 testBitBltCheckerBufferedImageTypeIntARGB_Pre_backgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeIntARGBPre(image, graphics2d, Color.white); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_BINARY. + * 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 testBitBltCheckerBufferedImageTypeByteBinaryBackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltCheckerBufferedImageTypeByteBinary(image, graphics2d, Color.black); + } + + /** * Entry point to the test suite. * * @param args not used in this case From ptisnovs at icedtea.classpath.org Thu Sep 5 01:42:02 2013 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 05 Sep 2013 08:42:02 +0000 Subject: /hg/rhino-tests: Added new test testCast (that checks Class.cast... Message-ID: changeset 07f91a0d8ed5 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=07f91a0d8ed5 author: Pavel Tisnovsky date: Thu Sep 05 10:45:48 2013 +0200 Added new test testCast (that checks Class.cast() method) into test test suite CompilableClassTest. diffstat: ChangeLog | 6 + src/org/RhinoTests/CompilableClassTest.java | 190 ++++++++++++++++++++++++++++ 2 files changed, 196 insertions(+), 0 deletions(-) diffs (213 lines): diff -r 8f9079b8db87 -r 07f91a0d8ed5 ChangeLog --- a/ChangeLog Wed Sep 04 11:51:21 2013 +0200 +++ b/ChangeLog Thu Sep 05 10:45:48 2013 +0200 @@ -1,3 +1,9 @@ +2013-09-05 Pavel Tisnovsky + + * src/org/RhinoTests/CompilableClassTest.java: + Added new test testCast (that checks Class.cast() method) into test + test suite CompilableClassTest. + 2013-09-04 Pavel Tisnovsky * src/org/RhinoTests/BindingsClassTest.java: diff -r 8f9079b8db87 -r 07f91a0d8ed5 src/org/RhinoTests/CompilableClassTest.java --- a/src/org/RhinoTests/CompilableClassTest.java Wed Sep 04 11:51:21 2013 +0200 +++ b/src/org/RhinoTests/CompilableClassTest.java Thu Sep 05 10:45:48 2013 +0200 @@ -1206,6 +1206,196 @@ } /** + * Test for method javax.script.Compilable.getClass().cast() + */ + protected void testCast() { + try { + this.compilableClass.cast(new Object()); + throw new AssertionError("Class.cast(new Object()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.cast(new Object().getClass()); + throw new AssertionError("Class.cast(new Object().getClass()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.cast(new String()); + throw new AssertionError("Class.cast(new String()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.cast(Boolean.valueOf(true)); + throw new AssertionError("Class.cast(Boolean.valueOf(true)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.cast(Boolean.valueOf(false)); + throw new AssertionError("Class.cast(Boolean.valueOf(false)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.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.compilableClass.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.compilableClass.cast(Integer.valueOf(42)); + throw new AssertionError("Class.cast(Integer.valueOf(42)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.cast(Long.valueOf(42L)); + throw new AssertionError("Class.cast(Long.valueOf(42L)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.cast(Float.valueOf(42f)); + throw new AssertionError("Class.cast(Float.valueOf(42f)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.cast(Double.valueOf(42.)); + throw new AssertionError("Class.cast(Double.valueOf(42.)) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.cast(new Throwable()); + throw new AssertionError("Class.cast(new Throwable()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.cast(new RuntimeException()); + throw new AssertionError("Class.cast(new RuntimeException()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.cast(new Error()); + throw new AssertionError("Class.cast(new Error()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.compilableClass.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.compilableClass.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.compilableClass.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.compilableClass.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.compilableClass.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.compilableClass.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.compilableClass.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.compilableClass.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.compilableClass.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.Compilable */ @SuppressWarnings("cast") From gitne at gmx.de Thu Sep 5 02:28:21 2013 From: gitne at gmx.de (Jacob Wisor) Date: Thu, 05 Sep 2013 11:28:21 +0200 Subject: /hg/icedtea-web: Fixed "could not clear cache" message and cache... In-Reply-To: <522838E5.2060404@redhat.com> References: <522838E5.2060404@redhat.com> Message-ID: <52284EB5.3060500@gmx.de> Jiri Vanek wrote: > On 09/04/2013 07:49 PM, aazores at icedtea.classpath.org wrote: >> changeset bb8132ebc241 in /hg/icedtea-web >> details: >> http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=bb8132ebc241 >> >> author: Andrew Azores >> date: Wed Sep 04 13:48:42 2013 -0400 >> >> Fixed "could not clear cache" message and cache location in >> CacheReproducer >> >> >> diffstat: >> >> >> ChangeLog >> | 8 + >> >> netx/net/sourceforge/jnlp/config/Defaults.java >> | 2 +- >> >> tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java >> | 95 +++++---- >> 3 files changed, 64 insertions(+), 41 deletions(-) >> >> diffs (228 lines): >> >> diff -r 6c0e37585a5e -r bb8132ebc241 ChangeLog >> --- a/ChangeLog Wed Sep 04 12:22:16 2013 -0400 >> +++ b/ChangeLog Wed Sep 04 13:48:42 2013 -0400 >> @@ -1,3 +1,11 @@ >> +2013-09-04 Andrew Azores >> + >> + * netx/net/sourceforge/jnlp/config/Defaults.java: >> (USER_CACHE_HOME) made >> + public for use in CacheReproducer >> + * >> tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest: >> + updated "could not clear cache" message and cache location. Other >> minor >> + cleanup >> + >> 2013-09-04 Andrew Azores >> >> * netx/net/sourceforge/jnlp/security/SecurityDialogs.java: >> diff -r 6c0e37585a5e -r bb8132ebc241 >> netx/net/sourceforge/jnlp/config/Defaults.java >> --- a/netx/net/sourceforge/jnlp/config/Defaults.java Wed Sep 04 >> 12:22:16 2013 -0400 >> +++ b/netx/net/sourceforge/jnlp/config/Defaults.java Wed Sep 04 >> 13:48:42 2013 -0400 >> @@ -55,7 +55,7 @@ >> final static String SYSTEM_HOME = System.getProperty("java.home"); >> final static String SYSTEM_SECURITY = SYSTEM_HOME + >> File.separator + "lib" + File.separator + "security"; >> final static String USER_CONFIG_HOME; >> - final static String USER_CACHE_HOME; >> + public final static String USER_CACHE_HOME; >> final static String USER_SECURITY; >> final static String LOCKS_DIR = >> System.getProperty("java.io.tmpdir") + File.separator >> + System.getProperty("user.name") + File.separator + >> "netx" + File.separator >> diff -r 6c0e37585a5e -r bb8132ebc241 >> tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java >> >> --- >> a/tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java >> Wed Sep 04 12:22:16 2013 -0400 >> +++ >> b/tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java >> Wed Sep 04 13:48:42 2013 -0400 >> @@ -44,11 +44,13 @@ >> import java.io.UnsupportedEncodingException; >> import java.util.Arrays; >> import java.util.List; >> +import java.util.PropertyResourceBundle; >> import java.util.regex.Matcher; >> import java.util.regex.Pattern; >> import net.sourceforge.jnlp.ServerAccess; >> -import net.sourceforge.jnlp.ServerAccess.ProcessResult; >> +import net.sourceforge.jnlp.ProcessResult; >> import net.sourceforge.jnlp.annotations.KnownToFail; >> +import net.sourceforge.jnlp.config.Defaults; >> import org.junit.AfterClass; >> import org.junit.Assert; >> >> @@ -60,24 +62,37 @@ >> private static final List clear = Arrays.asList(new >> String[]{server.getJavawsLocation(), "-Xclearcache", >> ServerAccess.HEADLES_OPTION}); >> private static final List trustedVerboses = >> Arrays.asList(new String[]{"-Xtrustall", >> ServerAccess.HEADLES_OPTION,"-verbose"}); >> private static final List verbosed = Arrays.asList(new >> String[]{"-verbose", ServerAccess.HEADLES_OPTION}); >> - private static final String home = System.getProperty("user.home"); >> - private static final String name = System.getProperty("user.name"); >> - private static final String tmp = >> System.getProperty("java.io.tmpdir"); >> - private static final File icedteaDir = new File(home + "/" + >> ".icedtea"); >> - private static final File icedteaCache = new File(icedteaDir, >> "cache"); >> - private static final File icedteaCacheFile = new >> File(icedteaCache, "recently_used"); >> - private static final File netxLock = new File(tmp + "/" + name + >> "/netx/locks/netx_running"); >> + >> private static final String lre = "LruCacheException"; >> private static final String ioobe = "IndexOutOfBoundsException"; >> private static final String corruptRegex = "\\d{13}"; >> private static final Pattern corruptPatern = >> Pattern.compile(corruptRegex); >> private static final String corruptString = "156dsf1562kd5"; >> >> - String testS = "#netx file\n" >> - + "#Mon Dec 12 16:20:46 CET 2011\n" >> - + >> "1323703236508,0=/home/xp13/.icedtea/cache/0/http/localhost/ReadPropertiesBySignedHack.jnlp\n" >> >> - + >> "1323703243086,2=/home/xp14/.icedtea/cache/2/http/localhost/ReadProperties.jar\n" >> >> - + >> "1323703243082,1=/home/xp15/.icedtea/cache/1/http/localhost/ReadPropertiesBySignedHack.jar"; >> >> + private static final File icedteaCache = new >> File(Defaults.USER_CACHE_HOME, "cache"); >> + private static final File icedteaCacheFile = new >> File(icedteaCache, "recently_used"); >> + private static final File netxLock = new >> File(System.getProperty("java.io.tmpdir"), >> + System.getProperty("user.name") + File.separator + >> + "netx" + File.separator + >> + "locks" + File.separator + >> + "netx_running"); >> + >> + private static final String messageResourcePath = >> "net/sourceforge/jnlp/resources/Messages.properties"; >> + private static PropertyResourceBundle messageBundle = null; >> + >> + static { >> + try { >> + messageBundle = >> + new >> PropertyResourceBundle(CacheReproducerTest.class.getClassLoader().getResourceAsStream(messageResourcePath)); >> >> + } catch (IOException e) { >> + } >> + } >> + > > Pleae NEVER consume an exception. > > In this case the > > } catch (IOException ex) { > throw new RuntimeException(ex); > } Throwing a chained RuntimeException is going to disrupt the program's flow. So, I would rather advise } catch (IOException e) { e.printStackTrace(); } This will make IOException at least visible on stderr and preserve what has been previously intended, namely continuing program execution undisrupted. > Would be the best. You can push this without any other review (unless > you think about different fix) Regards, Jacob From jvanek at redhat.com Thu Sep 5 04:42:20 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 05 Sep 2013 13:42:20 +0200 Subject: [rfc][icedtea-web] RH976833 ClassLoader deadlock In-Reply-To: <520D35CA.9070208@redhat.com> References: <520D35CA.9070208@redhat.com> Message-ID: <52286E1C.8030604@redhat.com> On 08/15/2013 10:10 PM, Andrew Azores wrote: > 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 Can we have an reproducer for this? But those are mostly very hard to reproduce, so do not vaste to much time on it (no metter that reprodcuer can have random behaviour as it "can deadlock") > 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. Sorry for being nitpicker, but please separate refactoring form fix. Both looks good but the readability of patch is strongly reduced by the mixture. Also I'm fan of "refactoring is good time to do an unittest" So the best would be for each method, you touch with "for-loops into fpor-each-loops " refactoring is an excelent candidate for unittest. When I wrote this to Adam an year ago, he stopepd todo this :) So I do not wont to force you to do, but please think about it. > > Thanks, > > -- > Andrew A > > > fix.patch > > > diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > @@ -17,11 +17,6 @@ > > import static net.sourceforge.jnlp.runtime.Translator.R; > > -import java.util.concurrent.locks.ReentrantLock; > - > -import java.util.concurrent.locks.Lock; > - > -import java.io.Closeable; > import java.io.File; > import java.io.FileOutputStream; > import java.io.FileReader; > @@ -59,11 +54,10 @@ > import java.util.TreeSet; > import java.util.Vector; > import java.util.concurrent.ConcurrentHashMap; > +import java.util.concurrent.locks.ReentrantLock; > import java.util.jar.JarEntry; > -import net.sourceforge.jnlp.util.JarFile; > import java.util.jar.Manifest; > > -import net.sourceforge.jnlp.security.appletextendedsecurity.UnsignedAppletTrustConfirmation; > import net.sourceforge.jnlp.AppletDesc; > import net.sourceforge.jnlp.ApplicationDesc; > import net.sourceforge.jnlp.DownloadOptions; > @@ -90,8 +84,9 @@ > import net.sourceforge.jnlp.security.JNLPAppVerifier; > import net.sourceforge.jnlp.security.PluginAppVerifier; > import net.sourceforge.jnlp.security.SecurityDialogs; > +import net.sourceforge.jnlp.security.appletextendedsecurity.UnsignedAppletTrustConfirmation; > import net.sourceforge.jnlp.tools.JarCertVerifier; > -import net.sourceforge.jnlp.util.FileUtils; > +import net.sourceforge.jnlp.util.JarFile; > import net.sourceforge.jnlp.util.StreamUtils; > import sun.misc.JarIndex; > > @@ -166,7 +161,7 @@ > private ArrayList runtimePermissions = new ArrayList(); > > /** all jars not yet part of classloader or active */ > - private List available = new ArrayList(); > + private List available = Collections.synchronizedList(new ArrayList()); > > /** the jar cert verifier tool to verify our jars */ > private final JarCertVerifier jcv; > @@ -174,17 +169,16 @@ > private boolean signing = false; > > /** ArrayList containing jar indexes for various jars available to this classloader */ > - private ArrayList jarIndexes = new ArrayList(); > + private List jarIndexes = Collections.synchronizedList(new ArrayList()); > > /** Set of classpath strings declared in the manifest.mf files */ > - private Set classpaths = new HashSet(); > + private Set classpaths = Collections.synchronizedSet(new HashSet()); > > /** File entries in the jar files available to this classloader */ > - private TreeSet jarEntries = new TreeSet(); > + private Set jarEntries = Collections.synchronizedSet(new TreeSet()); > > /** Map of specific original (remote) CodeSource Urls to securitydesc */ > - private HashMap jarLocationSecurityMap = > - new HashMap(); > + private Map jarLocationSecurityMap = Collections.synchronizedMap(new HashMap()); > > /*Set to prevent once tried-to-get resources to be tried again*/ > private Set alreadyTried = Collections.synchronizedSet(new HashSet()); > @@ -617,18 +611,18 @@ > */ > List initialJars = new ArrayList(); > > - for (int i = 0; i < jars.length; i++) { > + for (JARDesc jar : jars) { > > - available.add(jars[i]); > + available.add(jar); > > - if (jars[i].isEager()) > - initialJars.add(jars[i]); // regardless of part > + if (jar.isEager()) > + initialJars.add(jar); // regardless of part > > - tracker.addResource(jars[i].getLocation(), > - jars[i].getVersion(), > - getDownloadOptionsForJar(jars[i]), > - jars[i].isCacheable() ? JNLPRuntime.getDefaultUpdatePolicy() : UpdatePolicy.FORCE > - ); > + tracker.addResource(jar.getLocation(), > + jar.getVersion(), > + getDownloadOptionsForJar(jar), > + jar.isCacheable() ? JNLPRuntime.getDefaultUpdatePolicy() : UpdatePolicy.FORCE > + ); > } > > //If there are no eager jars, initialize the first jar > @@ -1170,15 +1164,17 @@ > * in the same part). > */ > protected void fillInPartJars(List jars) { > - for (int i = 0; i < jars.size(); i++) { > - String part = jars.get(i).getPart(); > + for (JARDesc jar : jars) { > + String part = jar.getPart(); > > - for (int a = 0; a < available.size(); a++) { > - JARDesc jar = available.get(a); > - > - if (part != null && part.equals(jar.getPart())) > - if (!jars.contains(jar)) > - jars.add(jar); > + synchronized (available) { > + for (JARDesc availJar : available) { > + if (part != null && part.equals(availJar.getPart())) { > + if (!jars.contains(availJar)) { > + jars.add(availJar); > + } > + } > + } > } > } > } > @@ -1199,9 +1195,7 @@ > // transfer the Jars > waitForJars(jars); > > - for (int i = 0; i < jars.size(); i++) { > - JARDesc jar = jars.get(i); > - > + for (JARDesc jar : jars) { > available.remove(jar); > > // add jar > @@ -1429,7 +1423,7 @@ > * classloader, or one of the classloaders for the JNLP file's > * extensions. > */ > - public synchronized Class loadClass(String name) throws ClassNotFoundException { > + public Class loadClass(String name) throws ClassNotFoundException { > > Class result = findLoadedClassAll(name); > > @@ -1457,15 +1451,17 @@ > > // Look in 'Class-Path' as specified in the manifest file > try { > - for (String classpath: classpaths) { > - JARDesc desc; > - try { > - URL jarUrl = new URL(file.getCodeBase(), classpath); > - desc = new JARDesc(jarUrl, null, null, false, true, false, true); > - } catch (MalformedURLException mfe) { > - throw new ClassNotFoundException(name, mfe); > + synchronized (classpaths) { > + for (String classpath : classpaths) { > + JARDesc desc; > + try { > + URL jarUrl = new URL(file.getCodeBase(), classpath); > + desc = new JARDesc(jarUrl, null, null, false, true, false, true); > + } catch (MalformedURLException mfe) { > + throw new ClassNotFoundException(name, mfe); > + } > + addNewJar(desc); > } > - addNewJar(desc); > } > > result = loadClassExt(name); > @@ -1480,31 +1476,33 @@ > > // Currently this loads jars directly from the site. We cannot cache it because this > // call is initiated from within the applet, which does not have disk read/write permissions > - for (JarIndex index : jarIndexes) { > - // Non-generic code in sun.misc.JarIndex > - @SuppressWarnings("unchecked") > - LinkedList jarList = index.get(name.replace('.', '/')); > + synchronized (jarIndexes) { > + for (JarIndex index : jarIndexes) { > + // Non-generic code in sun.misc.JarIndex > + @SuppressWarnings("unchecked") > + LinkedList jarList = index.get(name.replace('.', '/')); > > - if (jarList != null) { > - for (String jarName : jarList) { > - JARDesc desc; > - try { > - desc = new JARDesc(new URL(file.getCodeBase(), jarName), > - null, null, false, true, false, true); > - } catch (MalformedURLException mfe) { > - throw new ClassNotFoundException(name); > - } > - try { > - addNewJar(desc); > - } catch (Exception e) { > - if (JNLPRuntime.isDebug()) { > - e.printStackTrace(); > + if (jarList != null) { > + for (String jarName : jarList) { > + JARDesc desc; > + try { > + desc = new JARDesc(new URL(file.getCodeBase(), jarName), > + null, null, false, true, false, true); > + } catch (MalformedURLException mfe) { > + throw new ClassNotFoundException(name); > + } > + try { > + addNewJar(desc); > + } catch (Exception e) { > + if (JNLPRuntime.isDebug()) { > + e.printStackTrace(); > + } > } > } > + > + // If it still fails, let it error out > + result = loadClassExt(name); > } > - > - // If it still fails, let it error out > - result = loadClassExt(name); > } > } > } > @@ -1661,7 +1659,7 @@ > // add resources until found > while (true) { > JNLPClassLoader addedTo = null; > - > + > try { > addedTo = addNextResource(); > } catch (LaunchException e) { > @@ -1822,7 +1820,7 @@ > * @throws LaunchException Thrown if the signed JNLP file, within the main jar, fails to be verified or does not match > */ > protected JNLPClassLoader addNextResource() throws LaunchException { > - if (available.size() == 0) { > + if (available.isEmpty()) { > for (int i = 1; i < loaders.length; i++) { > JNLPClassLoader result = loaders[i].addNextResource(); > > @@ -1885,22 +1883,24 @@ > */ > > protected SecurityDesc getCodeSourceSecurity(URL source) { > - SecurityDesc sec=jarLocationSecurityMap.get(source); > - if (sec == null && !alreadyTried.contains(source)) { > - alreadyTried.add(source); > - //try to load the jar which is requesting the permissions, but was NOT downloaded by standard way > - if (JNLPRuntime.isDebug()) { > - System.out.println("Application is trying to get permissions for " + source.toString() + ", which was not added by standard way. Trying to download and verify!"); > - } > - try { > - JARDesc des = new JARDesc(source, null, null, false, false, false, false); > - addNewJar(des); > - sec = jarLocationSecurityMap.get(source); > - } catch (Throwable t) { > + SecurityDesc sec = jarLocationSecurityMap.get(source); > + synchronized (alreadyTried) { > + if (sec == null && !alreadyTried.contains(source)) { > + alreadyTried.add(source); > + //try to load the jar which is requesting the permissions, but was NOT downloaded by standard way > if (JNLPRuntime.isDebug()) { > - t.printStackTrace(); > + System.out.println("Application is trying to get permissions for " + source.toString() + ", which was not added by standard way. Trying to download and verify!"); > } > - sec = null; > + try { > + JARDesc des = new JARDesc(source, null, null, false, false, false, false); > + addNewJar(des); > + sec = jarLocationSecurityMap.get(source); > + } catch (Throwable t) { > + if (JNLPRuntime.isDebug()) { > + t.printStackTrace(); > + } > + sec = null; > + } > } > } > if (sec == null){ > @@ -1936,8 +1936,11 @@ > } > > // security descriptors > - for (URL key : extLoader.jarLocationSecurityMap.keySet()) { > - jarLocationSecurityMap.put(key, extLoader.jarLocationSecurityMap.get(key)); > + synchronized (extLoader.jarLocationSecurityMap) { > + Set keys = extLoader.jarLocationSecurityMap.keySet(); > + for (URL key : keys) { > + jarLocationSecurityMap.put(key, extLoader.jarLocationSecurityMap.get(key)); > + } > } > } > > @@ -2186,9 +2189,12 @@ > } > > // Permissions for all remote hosting urls > - for (URL u: jarLocationSecurityMap.keySet()) { > - permissions.add(new SocketPermission(u.getHost(), > - "connect, accept")); > + synchronized (jarLocationSecurityMap) { > + Set keys = jarLocationSecurityMap.keySet(); > + for (URL u : keys) { > + permissions.add(new SocketPermission(u.getHost(), > + "connect, accept")); > + } > } > > // Permissions for codebase urls (if there is a loader) > From aazores at redhat.com Thu Sep 5 06:10:29 2013 From: aazores at redhat.com (Andrew Azores) Date: Thu, 05 Sep 2013 09:10:29 -0400 Subject: /hg/icedtea-web: Fixed "could not clear cache" message and cache... In-Reply-To: <52284EB5.3060500@gmx.de> References: <522838E5.2060404@redhat.com> <52284EB5.3060500@gmx.de> Message-ID: <522882C5.7010501@redhat.com> On 09/05/13 05:28, Jacob Wisor wrote: > Jiri Vanek wrote: >> On 09/04/2013 07:49 PM, aazores at icedtea.classpath.org wrote: >>> changeset bb8132ebc241 in /hg/icedtea-web >>> details: >>> http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=bb8132ebc241 >>> >>> author: Andrew Azores >>> date: Wed Sep 04 13:48:42 2013 -0400 >>> >>> Fixed "could not clear cache" message and cache location in >>> CacheReproducer >>> >>> >>> diffstat: >>> >>> ChangeLog | 8 + >>> netx/net/sourceforge/jnlp/config/Defaults.java | 2 +- >>> tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java >>> | 95 +++++---- >>> 3 files changed, 64 insertions(+), 41 deletions(-) >>> >>> diffs (228 lines): >>> >>> diff -r 6c0e37585a5e -r bb8132ebc241 ChangeLog >>> --- a/ChangeLog Wed Sep 04 12:22:16 2013 -0400 >>> +++ b/ChangeLog Wed Sep 04 13:48:42 2013 -0400 >>> @@ -1,3 +1,11 @@ >>> +2013-09-04 Andrew Azores >>> + >>> + * netx/net/sourceforge/jnlp/config/Defaults.java: >>> (USER_CACHE_HOME) made >>> + public for use in CacheReproducer >>> + * >>> tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest: >>> + updated "could not clear cache" message and cache location. >>> Other minor >>> + cleanup >>> + >>> 2013-09-04 Andrew Azores >>> >>> * netx/net/sourceforge/jnlp/security/SecurityDialogs.java: >>> diff -r 6c0e37585a5e -r bb8132ebc241 >>> netx/net/sourceforge/jnlp/config/Defaults.java >>> --- a/netx/net/sourceforge/jnlp/config/Defaults.java Wed Sep 04 >>> 12:22:16 2013 -0400 >>> +++ b/netx/net/sourceforge/jnlp/config/Defaults.java Wed Sep 04 >>> 13:48:42 2013 -0400 >>> @@ -55,7 +55,7 @@ >>> final static String SYSTEM_HOME = >>> System.getProperty("java.home"); >>> final static String SYSTEM_SECURITY = SYSTEM_HOME + >>> File.separator + "lib" + File.separator + "security"; >>> final static String USER_CONFIG_HOME; >>> - final static String USER_CACHE_HOME; >>> + public final static String USER_CACHE_HOME; >>> final static String USER_SECURITY; >>> final static String LOCKS_DIR = >>> System.getProperty("java.io.tmpdir") + File.separator >>> + System.getProperty("user.name") + File.separator + >>> "netx" + File.separator >>> diff -r 6c0e37585a5e -r bb8132ebc241 >>> tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java >>> >>> --- >>> a/tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java >>> Wed Sep 04 12:22:16 2013 -0400 >>> +++ >>> b/tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java >>> Wed Sep 04 13:48:42 2013 -0400 >>> @@ -44,11 +44,13 @@ >>> import java.io.UnsupportedEncodingException; >>> import java.util.Arrays; >>> import java.util.List; >>> +import java.util.PropertyResourceBundle; >>> import java.util.regex.Matcher; >>> import java.util.regex.Pattern; >>> import net.sourceforge.jnlp.ServerAccess; >>> -import net.sourceforge.jnlp.ServerAccess.ProcessResult; >>> +import net.sourceforge.jnlp.ProcessResult; >>> import net.sourceforge.jnlp.annotations.KnownToFail; >>> +import net.sourceforge.jnlp.config.Defaults; >>> import org.junit.AfterClass; >>> import org.junit.Assert; >>> >>> @@ -60,24 +62,37 @@ >>> private static final List clear = Arrays.asList(new >>> String[]{server.getJavawsLocation(), "-Xclearcache", >>> ServerAccess.HEADLES_OPTION}); >>> private static final List trustedVerboses = >>> Arrays.asList(new String[]{"-Xtrustall", >>> ServerAccess.HEADLES_OPTION,"-verbose"}); >>> private static final List verbosed = Arrays.asList(new >>> String[]{"-verbose", ServerAccess.HEADLES_OPTION}); >>> - private static final String home = >>> System.getProperty("user.home"); >>> - private static final String name = >>> System.getProperty("user.name"); >>> - private static final String tmp = >>> System.getProperty("java.io.tmpdir"); >>> - private static final File icedteaDir = new File(home + "/" + >>> ".icedtea"); >>> - private static final File icedteaCache = new File(icedteaDir, >>> "cache"); >>> - private static final File icedteaCacheFile = new >>> File(icedteaCache, "recently_used"); >>> - private static final File netxLock = new File(tmp + "/" + name >>> + "/netx/locks/netx_running"); >>> + >>> private static final String lre = "LruCacheException"; >>> private static final String ioobe = "IndexOutOfBoundsException"; >>> private static final String corruptRegex = "\\d{13}"; >>> private static final Pattern corruptPatern = >>> Pattern.compile(corruptRegex); >>> private static final String corruptString = "156dsf1562kd5"; >>> >>> - String testS = "#netx file\n" >>> - + "#Mon Dec 12 16:20:46 CET 2011\n" >>> - + >>> "1323703236508,0=/home/xp13/.icedtea/cache/0/http/localhost/ReadPropertiesBySignedHack.jnlp\n" >>> >>> - + >>> "1323703243086,2=/home/xp14/.icedtea/cache/2/http/localhost/ReadProperties.jar\n" >>> >>> - + >>> "1323703243082,1=/home/xp15/.icedtea/cache/1/http/localhost/ReadPropertiesBySignedHack.jar"; >>> >>> + private static final File icedteaCache = new >>> File(Defaults.USER_CACHE_HOME, "cache"); >>> + private static final File icedteaCacheFile = new >>> File(icedteaCache, "recently_used"); >>> + private static final File netxLock = new >>> File(System.getProperty("java.io.tmpdir"), >>> + System.getProperty("user.name") + File.separator + >>> + "netx" + File.separator + >>> + "locks" + File.separator + >>> + "netx_running"); >>> + >>> + private static final String messageResourcePath = >>> "net/sourceforge/jnlp/resources/Messages.properties"; >>> + private static PropertyResourceBundle messageBundle = null; >>> + >>> + static { >>> + try { >>> + messageBundle = >>> + new >>> PropertyResourceBundle(CacheReproducerTest.class.getClassLoader().getResourceAsStream(messageResourcePath)); >>> >>> + } catch (IOException e) { >>> + } >>> + } >>> + >> >> Pleae NEVER consume an exception. >> >> In this case the >> >> } catch (IOException ex) { >> throw new RuntimeException(ex); >> } > > Throwing a chained RuntimeException is going to disrupt the program's > flow. So, I would rather advise > > } catch (IOException e) { > e.printStackTrace(); > } > > This will make IOException at least visible on stderr and preserve > what has been previously intended, namely continuing program execution > undisrupted. > >> Would be the best. You can push this without any other review (unless >> you think about different fix) > > Regards, > Jacob As Jacob says, I'd rather not throw a chained exception here because that would cause the entire reproducer to halt, would it not? But if the messageBundle is not properly instantiated that's only really a blocker for one test (clearCacheUnsucessfully). This exception being consumed would manifest as a NPE in that later test, which would just result in that single test failing. Printing the stack trace is agreeable enough but I don't really think the entire reproducer needs to stop if we're going to be unable to run one test. Thanks, -- Andrew A From aazores at redhat.com Thu Sep 5 07:04:04 2013 From: aazores at redhat.com (Andrew Azores) Date: Thu, 05 Sep 2013 10:04:04 -0400 Subject: [rfc][icedtea-web] RH976833 ClassLoader deadlock In-Reply-To: <52286E1C.8030604@redhat.com> References: <520D35CA.9070208@redhat.com> <52286E1C.8030604@redhat.com> Message-ID: <52288F54.1000907@redhat.com> On 09/05/13 07:42, Jiri Vanek wrote: > On 08/15/2013 10:10 PM, Andrew Azores wrote: >> 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 > > Can we have an reproducer for this? But those are mostly very hard to > reproduce, so do not vaste to much time on it (no metter that > reprodcuer can have random behaviour as it "can deadlock") > I did spend some time previously trying to put together a reproducer, but I wasn't able to recreate the deadlock offline. The deadlock was affecting every webpage with multiple applets on it, however, at least on my system. The two sites I used as "reproducers" were: [1] http://www.browserspy.dk/java.php [2] http://www.cis.upenn.edu/~matuszek/General/JavaVersionTests/JavaTests.html [1] being the site mentioned in the original bug report, and [2] being a site I randomly found by Googling for Java test applets. It has *9* on one page! Excellent for testing this particular scenario :) >> 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. > > > Sorry for being nitpicker, but please separate refactoring form fix. > Both looks good but the readability of patch is strongly reduced by > the mixture. > > Also I'm fan of "refactoring is good time to do an unittest" > So the best would be for each method, you touch with "for-loops into > fpor-each-loops " refactoring is an excelent candidate for unittest. > When I wrote this to Adam an year ago, he stopepd todo this :) So I do > not wont to force you to do, but please think about it. Sure I can separate them out. Unittesting on the refactors might be awkward because the methods containing the loop refactors are things like JNLPClassLoader#initializePermissions(), which takes no parameters and has no return value. It just adds values into a private list, which doesn't seem to be publicly exposed in any way either. I'm not really sure how I can go about testing the refactor of the for-loop into a for-each-loop in that kind of situation without doing even more refactoring and changing the interface of the class, just to support being able to unittest a much simpler refactor. TBH I'd rather just leave the slightly-messier looking for-loops in place in this case. If I had done a more thorough refactor with methods being split/extracted or anything like that then unit testing would seem more feasible. Attached is the fix-only version of the patch, refactoring all removed for the time being. > > (snip) -- Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: fix.patch Type: text/x-patch Size: 10204 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130905/1741b788/fix.patch From andrew at icedtea.classpath.org Thu Sep 5 11:36:47 2013 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 05 Sep 2013 18:36:47 +0000 Subject: /hg/icedtea6: RH995488: Java thinks that the default timezone is... Message-ID: changeset 0dbdbf696a34 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0dbdbf696a34 author: Andrew John Hughes date: Thu Sep 05 19:36:32 2013 +0100 RH995488: Java thinks that the default timezone is Busingen instead of Zurich 2013-09-05 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patch. * patches/rh995488-rhel_tz_fix.patch: Use /etc/sysconfig/clock on RHEL & clones so that they don't search /usr/share/zoneinfo. * NEWS: Mention patch. diffstat: ChangeLog | 9 ++++ Makefile.am | 3 +- NEWS | 1 + patches/rh995488-rhel_tz_fix.patch | 77 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+), 1 deletions(-) diffs (121 lines): diff -r 782a87f782f3 -r 0dbdbf696a34 ChangeLog --- a/ChangeLog Mon Sep 02 20:59:15 2013 +0100 +++ b/ChangeLog Thu Sep 05 19:36:32 2013 +0100 @@ -1,3 +1,12 @@ +2013-09-05 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patch. + * patches/rh995488-rhel_tz_fix.patch: + Use /etc/sysconfig/clock on RHEL & clones + so that they don't search /usr/share/zoneinfo. + * NEWS: Mention patch. + 2013-09-02 Andrew John Hughes * Makefile.am: diff -r 782a87f782f3 -r 0dbdbf696a34 Makefile.am --- a/Makefile.am Mon Sep 02 20:59:15 2013 +0100 +++ b/Makefile.am Thu Sep 05 19:36:32 2013 +0100 @@ -760,7 +760,8 @@ patches/openjdk/6980281-majorver_for_solaris.patch \ patches/openjdk/7000225-bad_tabs.patch \ patches/openjdk/7038711-fix_no-clobber_usage.patch \ - patches/disable-cc-incompatible-sanity-checks.patch + patches/disable-cc-incompatible-sanity-checks.patch \ + patches/rh995488-rhel_tz_fix.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r 782a87f782f3 -r 0dbdbf696a34 NEWS --- a/NEWS Mon Sep 02 20:59:15 2013 +0100 +++ b/NEWS Thu Sep 05 19:36:32 2013 +0100 @@ -46,6 +46,7 @@ - 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 + - RH995488: Java thinks that the default timezone is Busingen instead of Zurich * JamVM - JSR 335: Lambda Expressions - JEP 171: Implement fence methods in sun.misc.Unsafe diff -r 782a87f782f3 -r 0dbdbf696a34 patches/rh995488-rhel_tz_fix.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/rh995488-rhel_tz_fix.patch Thu Sep 05 19:36:32 2013 +0100 @@ -0,0 +1,77 @@ +diff --git a/src/solaris/native/java/util/TimeZone_md.c b/src/solaris/native/java/util/TimeZone_md.c +--- openjdk/jdk/src/solaris/native/java/util/TimeZone_md.c ++++ openjdk/jdk/src/solaris/native/java/util/TimeZone_md.c +@@ -52,6 +52,8 @@ + #ifdef __linux__ + + static const char *ETC_TIMEZONE_FILE = "/etc/timezone"; ++static const char *REDHAT_RELEASE_FILE = "/etc/redhat-release"; ++static const char *SYSCONFIG_CLOCK_FILE = "/etc/sysconfig/clock"; + static const char *ZONEINFO_DIR = "/usr/share/zoneinfo"; + static const char *DEFAULT_ZONEINFO_FILE = "/etc/localtime"; + +@@ -225,6 +227,64 @@ + } + + /* ++ * Next, try the ZONE entry in /etc/sysconfig/clock. ++ */ ++ if ((fp = fopen(REDHAT_RELEASE_FILE, "r")) != NULL) { ++ char id[7]; ++ ++ /* Avoid this file on Fedora as may be buggy; RH489586 */ ++ if (fgets(id, sizeof (id), fp) != NULL && ++ strncmp(id, "Fedora", 6) != 0) { ++ (void) fclose(fp); ++ if ((fp = fopen(SYSCONFIG_CLOCK_FILE, "r")) != NULL) { ++ char line[256]; ++ ++ while (fgets(line, sizeof(line), fp) != NULL) { ++ char *p = line; ++ char *s; ++ ++ SKIP_SPACE(p); ++ if (*p != 'Z') { ++ continue; ++ } ++ if (strncmp(p, "ZONE=\"", 6) == 0) { ++ p += 6; ++ } else { ++ /* ++ * In case we need to parse it token by token. ++ */ ++ if (strncmp(p, "ZONE", 4) != 0) { ++ continue; ++ } ++ p += 4; ++ SKIP_SPACE(p); ++ if (*p++ != '=') { ++ break; ++ } ++ SKIP_SPACE(p); ++ if (*p++ != '"') { ++ break; ++ } ++ } ++ for (s = p; *s && *s != '"'; s++) ++ ; ++ if (*s != '"') { ++ /* this ZONE entry is broken. */ ++ break; ++ } ++ *s = '\0'; ++ tz = strdup(p); ++ break; ++ } ++ (void) fclose(fp); ++ if (tz != NULL) { ++ return tz; ++ } ++ } ++ } ++ } ++ ++ /* + * Next, try /etc/localtime to find the zone ID. + */ + if (lstat(DEFAULT_ZONEINFO_FILE, &statbuf) == -1) { From bugzilla-daemon at icedtea.classpath.org Thu Sep 5 15:06:51 2013 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 05 Sep 2013 22:06: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 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Omair Majid --- 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/20130905/ad475fc3/attachment.html From jvanek at redhat.com Thu Sep 5 23:43:06 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 06 Sep 2013 08:43:06 +0200 Subject: /hg/icedtea6: RH995488: Java thinks that the default timezone is... In-Reply-To: References: Message-ID: <5229797A.3060607@redhat.com> Offlist As we agreed that this is not good patch and is rhel6 specific, is it really good idea to push it to icedtea? On 09/05/2013 08:36 PM, andrew at icedtea.classpath.org wrote: > changeset 0dbdbf696a34 in /hg/icedtea6 > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0dbdbf696a34 > author: Andrew John Hughes > date: Thu Sep 05 19:36:32 2013 +0100 > > RH995488: Java thinks that the default timezone is Busingen instead of Zurich > > 2013-09-05 Andrew John Hughes > > * Makefile.am: > (ICEDTEA_PATCHES): Add new patch. > * patches/rh995488-rhel_tz_fix.patch: > Use /etc/sysconfig/clock on RHEL & clones > so that they don't search /usr/share/zoneinfo. > * NEWS: Mention patch. > > > diffstat: > > ChangeLog | 9 ++++ > Makefile.am | 3 +- > NEWS | 1 + > patches/rh995488-rhel_tz_fix.patch | 77 ++++++++++++++++++++++++++++++++++++++ > 4 files changed, 89 insertions(+), 1 deletions(-) > > diffs (121 lines): > > diff -r 782a87f782f3 -r 0dbdbf696a34 ChangeLog > --- a/ChangeLog Mon Sep 02 20:59:15 2013 +0100 > +++ b/ChangeLog Thu Sep 05 19:36:32 2013 +0100 > @@ -1,3 +1,12 @@ > +2013-09-05 Andrew John Hughes > + > + * Makefile.am: > + (ICEDTEA_PATCHES): Add new patch. > + * patches/rh995488-rhel_tz_fix.patch: > + Use /etc/sysconfig/clock on RHEL & clones > + so that they don't search /usr/share/zoneinfo. > + * NEWS: Mention patch. > + > 2013-09-02 Andrew John Hughes > > * Makefile.am: > diff -r 782a87f782f3 -r 0dbdbf696a34 Makefile.am > --- a/Makefile.am Mon Sep 02 20:59:15 2013 +0100 > +++ b/Makefile.am Thu Sep 05 19:36:32 2013 +0100 > @@ -760,7 +760,8 @@ > patches/openjdk/6980281-majorver_for_solaris.patch \ > patches/openjdk/7000225-bad_tabs.patch \ > patches/openjdk/7038711-fix_no-clobber_usage.patch \ > - patches/disable-cc-incompatible-sanity-checks.patch > + patches/disable-cc-incompatible-sanity-checks.patch \ > + patches/rh995488-rhel_tz_fix.patch > > if WITH_ALT_HSBUILD > ICEDTEA_PATCHES += \ > diff -r 782a87f782f3 -r 0dbdbf696a34 NEWS > --- a/NEWS Mon Sep 02 20:59:15 2013 +0100 > +++ b/NEWS Thu Sep 05 19:36:32 2013 +0100 > @@ -46,6 +46,7 @@ > - 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 > + - RH995488: Java thinks that the default timezone is Busingen instead of Zurich > * JamVM > - JSR 335: Lambda Expressions > - JEP 171: Implement fence methods in sun.misc.Unsafe > diff -r 782a87f782f3 -r 0dbdbf696a34 patches/rh995488-rhel_tz_fix.patch > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/patches/rh995488-rhel_tz_fix.patch Thu Sep 05 19:36:32 2013 +0100 > @@ -0,0 +1,77 @@ > +diff --git a/src/solaris/native/java/util/TimeZone_md.c b/src/solaris/native/java/util/TimeZone_md.c > +--- openjdk/jdk/src/solaris/native/java/util/TimeZone_md.c > ++++ openjdk/jdk/src/solaris/native/java/util/TimeZone_md.c > +@@ -52,6 +52,8 @@ > + #ifdef __linux__ > + > + static const char *ETC_TIMEZONE_FILE = "/etc/timezone"; > ++static const char *REDHAT_RELEASE_FILE = "/etc/redhat-release"; > ++static const char *SYSCONFIG_CLOCK_FILE = "/etc/sysconfig/clock"; > + static const char *ZONEINFO_DIR = "/usr/share/zoneinfo"; > + static const char *DEFAULT_ZONEINFO_FILE = "/etc/localtime"; > + > +@@ -225,6 +227,64 @@ > + } > + > + /* > ++ * Next, try the ZONE entry in /etc/sysconfig/clock. > ++ */ > ++ if ((fp = fopen(REDHAT_RELEASE_FILE, "r")) != NULL) { > ++ char id[7]; > ++ > ++ /* Avoid this file on Fedora as may be buggy; RH489586 */ > ++ if (fgets(id, sizeof (id), fp) != NULL && > ++ strncmp(id, "Fedora", 6) != 0) { > ++ (void) fclose(fp); > ++ if ((fp = fopen(SYSCONFIG_CLOCK_FILE, "r")) != NULL) { > ++ char line[256]; > ++ > ++ while (fgets(line, sizeof(line), fp) != NULL) { > ++ char *p = line; > ++ char *s; > ++ > ++ SKIP_SPACE(p); > ++ if (*p != 'Z') { > ++ continue; > ++ } > ++ if (strncmp(p, "ZONE=\"", 6) == 0) { > ++ p += 6; > ++ } else { > ++ /* > ++ * In case we need to parse it token by token. > ++ */ > ++ if (strncmp(p, "ZONE", 4) != 0) { > ++ continue; > ++ } > ++ p += 4; > ++ SKIP_SPACE(p); > ++ if (*p++ != '=') { > ++ break; > ++ } > ++ SKIP_SPACE(p); > ++ if (*p++ != '"') { > ++ break; > ++ } > ++ } > ++ for (s = p; *s && *s != '"'; s++) > ++ ; > ++ if (*s != '"') { > ++ /* this ZONE entry is broken. */ > ++ break; > ++ } > ++ *s = '\0'; > ++ tz = strdup(p); > ++ break; > ++ } > ++ (void) fclose(fp); > ++ if (tz != NULL) { > ++ return tz; > ++ } > ++ } > ++ } > ++ } > ++ > ++ /* > + * Next, try /etc/localtime to find the zone ID. > + */ > + if (lstat(DEFAULT_ZONEINFO_FILE, &statbuf) == -1) { > From jvanek at redhat.com Fri Sep 6 00:11:03 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 06 Sep 2013 09:11:03 +0200 Subject: /hg/icedtea-web: Fixed "could not clear cache" message and cache... In-Reply-To: <522882C5.7010501@redhat.com> References: <522838E5.2060404@redhat.com> <52284EB5.3060500@gmx.de> <522882C5.7010501@redhat.com> Message-ID: <52298007.4040802@redhat.com> On 09/05/2013 03:10 PM, Andrew Azores wrote: > On 09/05/13 05:28, Jacob Wisor wrote: >> Jiri Vanek wrote: >>> On 09/04/2013 07:49 PM, aazores at icedtea.classpath.org wrote: >>>> changeset bb8132ebc241 in /hg/icedtea-web >>>> details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=bb8132ebc241 >>>> author: Andrew Azores >>>> date: Wed Sep 04 13:48:42 2013 -0400 >>>> >>>> Fixed "could not clear cache" message and cache location in CacheReproducer >>>> >>>> >>>> diffstat: >>>> >>>> ChangeLog | 8 + >>>> netx/net/sourceforge/jnlp/config/Defaults.java | 2 +- >>>> tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java | 95 +++++---- >>>> 3 files changed, 64 insertions(+), 41 deletions(-) >>>> >>>> diffs (228 lines): >>>> >>>> diff -r 6c0e37585a5e -r bb8132ebc241 ChangeLog >>>> --- a/ChangeLog Wed Sep 04 12:22:16 2013 -0400 >>>> +++ b/ChangeLog Wed Sep 04 13:48:42 2013 -0400 >>>> @@ -1,3 +1,11 @@ >>>> +2013-09-04 Andrew Azores >>>> + >>>> + * netx/net/sourceforge/jnlp/config/Defaults.java: (USER_CACHE_HOME) made >>>> + public for use in CacheReproducer >>>> + * tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest: >>>> + updated "could not clear cache" message and cache location. Other minor >>>> + cleanup >>>> + >>>> 2013-09-04 Andrew Azores >>>> >>>> * netx/net/sourceforge/jnlp/security/SecurityDialogs.java: >>>> diff -r 6c0e37585a5e -r bb8132ebc241 netx/net/sourceforge/jnlp/config/Defaults.java >>>> --- a/netx/net/sourceforge/jnlp/config/Defaults.java Wed Sep 04 12:22:16 2013 -0400 >>>> +++ b/netx/net/sourceforge/jnlp/config/Defaults.java Wed Sep 04 13:48:42 2013 -0400 >>>> @@ -55,7 +55,7 @@ >>>> final static String SYSTEM_HOME = System.getProperty("java.home"); >>>> final static String SYSTEM_SECURITY = SYSTEM_HOME + File.separator + "lib" + >>>> File.separator + "security"; >>>> final static String USER_CONFIG_HOME; >>>> - final static String USER_CACHE_HOME; >>>> + public final static String USER_CACHE_HOME; >>>> final static String USER_SECURITY; >>>> final static String LOCKS_DIR = System.getProperty("java.io.tmpdir") + File.separator >>>> + System.getProperty("user.name") + File.separator + "netx" + File.separator >>>> diff -r 6c0e37585a5e -r bb8132ebc241 >>>> tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java >>>> --- a/tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java Wed Sep 04 >>>> 12:22:16 2013 -0400 >>>> +++ b/tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java Wed Sep 04 >>>> 13:48:42 2013 -0400 >>>> @@ -44,11 +44,13 @@ >>>> import java.io.UnsupportedEncodingException; >>>> import java.util.Arrays; >>>> import java.util.List; >>>> +import java.util.PropertyResourceBundle; >>>> import java.util.regex.Matcher; >>>> import java.util.regex.Pattern; >>>> import net.sourceforge.jnlp.ServerAccess; >>>> -import net.sourceforge.jnlp.ServerAccess.ProcessResult; >>>> +import net.sourceforge.jnlp.ProcessResult; >>>> import net.sourceforge.jnlp.annotations.KnownToFail; >>>> +import net.sourceforge.jnlp.config.Defaults; >>>> import org.junit.AfterClass; >>>> import org.junit.Assert; >>>> >>>> @@ -60,24 +62,37 @@ >>>> private static final List clear = Arrays.asList(new >>>> String[]{server.getJavawsLocation(), "-Xclearcache", ServerAccess.HEADLES_OPTION}); >>>> private static final List trustedVerboses = Arrays.asList(new >>>> String[]{"-Xtrustall", ServerAccess.HEADLES_OPTION,"-verbose"}); >>>> private static final List verbosed = Arrays.asList(new String[]{"-verbose", >>>> ServerAccess.HEADLES_OPTION}); >>>> - private static final String home = System.getProperty("user.home"); >>>> - private static final String name = System.getProperty("user.name"); >>>> - private static final String tmp = System.getProperty("java.io.tmpdir"); >>>> - private static final File icedteaDir = new File(home + "/" + ".icedtea"); >>>> - private static final File icedteaCache = new File(icedteaDir, "cache"); >>>> - private static final File icedteaCacheFile = new File(icedteaCache, "recently_used"); >>>> - private static final File netxLock = new File(tmp + "/" + name + "/netx/locks/netx_running"); >>>> + >>>> private static final String lre = "LruCacheException"; >>>> private static final String ioobe = "IndexOutOfBoundsException"; >>>> private static final String corruptRegex = "\\d{13}"; >>>> private static final Pattern corruptPatern = Pattern.compile(corruptRegex); >>>> private static final String corruptString = "156dsf1562kd5"; >>>> >>>> - String testS = "#netx file\n" >>>> - + "#Mon Dec 12 16:20:46 CET 2011\n" >>>> - + >>>> "1323703236508,0=/home/xp13/.icedtea/cache/0/http/localhost/ReadPropertiesBySignedHack.jnlp\n" >>>> - + >>>> "1323703243086,2=/home/xp14/.icedtea/cache/2/http/localhost/ReadProperties.jar\n" >>>> - + >>>> "1323703243082,1=/home/xp15/.icedtea/cache/1/http/localhost/ReadPropertiesBySignedHack.jar"; >>>> + private static final File icedteaCache = new File(Defaults.USER_CACHE_HOME, "cache"); >>>> + private static final File icedteaCacheFile = new File(icedteaCache, "recently_used"); >>>> + private static final File netxLock = new File(System.getProperty("java.io.tmpdir"), >>>> + System.getProperty("user.name") + File.separator + >>>> + "netx" + File.separator + >>>> + "locks" + File.separator + >>>> + "netx_running"); >>>> + >>>> + private static final String messageResourcePath = >>>> "net/sourceforge/jnlp/resources/Messages.properties"; >>>> + private static PropertyResourceBundle messageBundle = null; >>>> + >>>> + static { >>>> + try { >>>> + messageBundle = >>>> + new >>>> PropertyResourceBundle(CacheReproducerTest.class.getClassLoader().getResourceAsStream(messageResourcePath)); >>>> >>>> + } catch (IOException e) { >>>> + } >>>> + } >>>> + >>> >>> Pleae NEVER consume an exception. >>> >>> In this case the >>> >>> } catch (IOException ex) { >>> throw new RuntimeException(ex); >>> } >> >> Throwing a chained RuntimeException is going to disrupt the program's flow. So, I would rather advise >> >> } catch (IOException e) { >> e.printStackTrace(); >> } >> >> This will make IOException at least visible on stderr and preserve what has been previously >> intended, namely continuing program execution undisrupted. >> >>> Would be the best. You can push this without any other review (unless you think about different fix) >> >> Regards, >> Jacob > > As Jacob says, I'd rather not throw a chained exception here because that would cause the entire > reproducer to halt, would it not? But if the messageBundle is not properly instantiated that's only > really a blocker for one test (clearCacheUnsucessfully). This exception being consumed would > manifest as a NPE in that later test, which would just result in that single test failing. Printing > the stack trace is agreeable enough but I don't really think the entire reproducer needs to stop if > we're going to be unable to run one test. > imho nope. If messages.properties would become unavailable, then it is so crucial that I would be happy even for whole test run failure. Also not >> } catch (IOException e) { >> e.printStackTrace(); >> } but >> } catch (IOException e) { ServerAccess.logException(ex); >> } (never use stdout/err in testcases, but always appropriate ServerAccess.log* function) In this particular case do as you wish. My recommendation would lead to separate changeset, where you will create static method getMessage(String key) somewhere in test-extensions/net/sourceforge/jnlp/tools (probably new utility class) which will encapsulate the >>>> + private static final String messageResourcePath = >>>> "net/sourceforge/jnlp/resources/Messages.properties"; >>>> + private static PropertyResourceBundle messageBundle = null; >>>> + >>>> + static { >>>> + try { >>>> + messageBundle = >>>> + new >>>> PropertyResourceBundle(CacheReproducerTest.class.getClassLoader().getResourceAsStream(messageResourcePath)); >>>> >>>> + } catch (IOException e) { with throw here :) >>>> + } >>>> + } and >>>> + String cacheClearError = messageBundle.getString("CCannotClearCache"); parts. The reason for this is, that the hardocded "evaluate string" is wide spread issue, and I believe some of the failures are because of small change in properties file (eg the "the" removal/addition or something like that) Also you can imprve it a bit more for localised messages too, and then make localisation reproducers/unittests much thinner. But this is even another chapter. Anyway I do not insists. From jvanek at redhat.com Fri Sep 6 02:40:17 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 06 Sep 2013 11:40:17 +0200 Subject: [rfc][icedtea-web] Certificate viewer cleanup In-Reply-To: <201308291518.r7TFILBG011772@mail-web03.excite.co.jp> References: <201308291518.r7TFILBG011772@mail-web03.excite.co.jp> Message-ID: <5229A301.1070401@redhat.com> On 08/29/2013 05:18 PM, Jacob Wisor wrote: > "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. > Nice job, thank you! I have finally read it through! As drawback there is bunch of exceptions: java.io.EOFException at java.io.DataInputStream.readInt(DataInputStream.java:392) at sun.security.provider.JavaKeyStore.engineLoad(JavaKeyStore.java:645) at sun.security.provider.JavaKeyStore$JKS.engineLoad(JavaKeyStore.java:55) at java.security.KeyStore.load(KeyStore.java:1214) at net.sourceforge.jnlp.security.KeyStores.createKeyStoreFromFile(KeyStores.java:416) at net.sourceforge.jnlp.security.KeyStores.getKeyStore(KeyStores.java:140) at net.sourceforge.jnlp.security.KeyStores.getKeyStore(KeyStores.java:119) at net.sourceforge.jnlp.security.KeyStores.getClientKeyStores(KeyStores.java:235) at net.sourceforge.jnlp.security.VariableX509TrustManager.(VariableX509TrustManager.java:145) at net.sourceforge.jnlp.security.VariableX509TrustManager.getInstance(VariableX509TrustManager.java:439) at net.sourceforge.jnlp.security.VariableX509TrustManagerJDK7.(VariableX509TrustManagerJDK7.java:53) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) at java.lang.reflect.Constructor.newInstance(Constructor.java:526) at net.sourceforge.jnlp.runtime.JNLPRuntime.getSSLSocketTrustManager(JNLPRuntime.java:319) at net.sourceforge.jnlp.runtime.JNLPRuntime.initialize(JNLPRuntime.java:256) at net.sourceforge.jnlp.security.viewer.CertificateViewer.showCertificateViewer(CertificateViewer.java:103) at net.sourceforge.jnlp.security.viewer.CertificateViewer.main(CertificateViewer.java:126) at net.sourceforge.jnlp.runtime.Boot.main(Boot.java:135) and (more important) java.lang.NullPointerException at net.sourceforge.jnlp.security.viewer.CertificatePane.readKeyStore(CertificatePane.java:316) at net.sourceforge.jnlp.security.viewer.CertificatePane.repopulateTables(CertificatePane.java:344) at net.sourceforge.jnlp.security.viewer.CertificatePane.access$1200(CertificatePane.java:90) at net.sourceforge.jnlp.security.viewer.CertificatePane$CertificateTypeListener.actionPerformed(CertificatePane.java:408) at javax.swing.JComboBox.fireActionEvent(JComboBox.java:1260) at javax.swing.JComboBox.setSelectedItem(JComboBox.java:588) at javax.swing.JComboBox.setSelectedIndex(JComboBox.java:624) at javax.swing.plaf.basic.BasicComboPopup$Handler.mouseReleased(BasicComboPopup.java:835) at java.awt.AWTEventMulticaster.mouseReleased(AWTEventMulticaster.java:290) at java.awt.Component.processMouseEvent(Component.java:6505) at javax.swing.JComponent.processMouseEvent(JComponent.java:3312) at javax.swing.plaf.basic.BasicComboPopup$1.processMouseEvent(BasicComboPopup.java:499) at java.awt.Component.processEvent(Component.java:6270) at java.awt.Container.processEvent(Container.java:2229) at java.awt.Component.dispatchEventImpl(Component.java:4861) at java.awt.Container.dispatchEventImpl(Container.java:2287) at java.awt.Component.dispatchEvent(Component.java:4687) at java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4832) at java.awt.LightweightDispatcher.processMouseEvent(Container.java:4492) at java.awt.LightweightDispatcher.dispatchEvent(Container.java:4422) at java.awt.Container.dispatchEventImpl(Container.java:2273) at java.awt.Window.dispatchEventImpl(Window.java:2719) at java.awt.Component.dispatchEvent(Component.java:4687) at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:735) at java.awt.EventQueue.access$200(EventQueue.java:103) at java.awt.EventQueue$3.run(EventQueue.java:694) at java.awt.EventQueue$3.run(EventQueue.java:692) at java.security.AccessController.doPrivileged(Native Method) at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:76) at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:87) at java.awt.EventQueue$4.run(EventQueue.java:708) at java.awt.EventQueue$4.run(EventQueue.java:706) at java.security.AccessController.doPrivileged(Native Method) at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:76) at java.awt.EventQueue.dispatchEvent(EventQueue.java:705) at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:242) at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:161) at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:154) at java.awt.WaitDispatchSupport$2.run(WaitDispatchSupport.java:182) at java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:251) at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:733) at java.awt.EventQueue.access$200(EventQueue.java:103) at java.awt.EventQueue$3.run(EventQueue.java:694) at java.awt.EventQueue$3.run(EventQueue.java:692) at java.security.AccessController.doPrivileged(Native Method) at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:76) at java.awt.EventQueue.dispatchEvent(EventQueue.java:703) at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:242) at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:161) at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:150) at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:146) at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:138) at java.awt.EventDispatchThread.run(EventDispatchThread.java:91) Both are quite serious as they stop the redrawing of table. Two ideas - when digging in this, maybe to switch ~/icedtea-web-image/bin/javaws -viewer from Dialog to Frame would be nice - at least it will be accesible via alt+tab and maximiseable and so on... - the tool tip text are pretty good {except {0} error) but are hard to be seen. Most people do not hover over disabled button. It would be nice to have them as label on visible(if useful)/invisible paanel eg. between buttons and table. Few nits in inline: > > CertficateViewer_cleanup.patch > > > diff -r 420d72e5cee7 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} Those {0} are never avaluated. > +CVCannotRemove=You can not remove certificates of this type because {0} The CVCannotImport/CVCannotRemove seems to me randomly switched with CVCause. CVCannotImport/CVCannotRemove - are shown when I change certificate type, whether CVCause is shown when user/system tab. I think both are valid at all time, so their concation would be nice. > +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 ...snip... > @@ -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; Its really enough? I did not know this "hack". Interesting :) Please add unittest for anyway. > + } > + ...snip... > * "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"; I must say I'm quite confused by this extensions. What are they needed for now? (as they were not needed before) > > - private final CertificateType[] certificateTypes = new CertificateType[] { > + private final static CertificateType[] certificateTypes = new CertificateType[] { ... > > userTable = new JTable(null); > systemTable = new JTable(null); > - disableForSystem = new ArrayList(); Well I'm not sure about this expansion of array into four separated variables. Althoug disableForSystem will become really irrelevant name. I would go with JComponent[] button = new JComponent{ > + this.importButton = new JButton(); > + this.exportButton = new JButton(); > + this.removeButton = new JButton(); > + this.detailButton = new JButton(); } As I believe there are few cases where iteration will win over duplicate code. > > 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++) { buttonNames.length is definitively better then "5". > + 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); > - } Yup, here is the duplicated code. I know there will be some ifs, but really iteration is preferred way. > + 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); ...snip... > > @@ -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. > } Well, not sure if worthy, but as you wish. I would be proably fan of ex.printstackTrace in case of debug on. But I do not isnisits. > } > > - public static void main(String[] args) throws Exception { > + public static void main(String[] args) { > CertificateViewer.showCertificateViewer(); > } ... > +/** > + * Impementation of a certificate viewer. > + *

> + * The certificate viewer can be accessed via the "Certificates" tab or by I would add * The certificate viewer can be accessed via the "Certificates" tab in itw-settings or by But do not isnists. > + * invoking {@code javaws -viewer} on the command line. > + *

> + * @see net.sourceforge.jnlp.controlpanel.ControlPanel > + */ ...snip... > + > +/** > + * This class provides methods and classes for common and recurring tasks while > + * dealing with the UI that are not provided by the Java SE platform. > + * @since 1.5 > + */ > +public final class UI { > + /** > + * Hide the default constructor from instantiating this class, because it is > + * a mere collection of diverese helper functionalities encapsulated in either > + * static methods or static nested classes. > + */ > + private UI() { > + } > + > + /** > + * Generates corresponding mnemonics to texts of controls like buttons, > + * labels, check boxes, radio buttons, or menu items. This method is primarily > + * useful for applications which control's texts are loaded from localized > + * resources that either lack mnemonics for corresponding controls or when > + * storing mnemonics in resources is not desired. > + *

NOTE:
> + * This method works with Latin, Greek, and Cyrillic alphabets only!

> + * This method may produce multiple identical (recurring) mnemonics if a text > + * does not have enough distinct letters. > + * @todo Add support for right-to-left alphabets and other scripts. > + * @param strings A {@link String} array with all Window's or Dialog's > + * control's texts that shall get mnemonics > + * @return a {@link HashMap} of texts with their corresponding mnemonic characters > + */ Ugh. Although the idea behind this is really _excelent_ I doubt it a bit.Or I doubt its complexity. Before scratching it - few topics: - is really mnemoic based on localisation desired behaviour? I'm in favour that it is not. Mostly one simpli look into menu, and when he used this click and find click to often, he remebers the mneonic. Maybe it is even better when all alnguages have them same. But you know more about localisations then me. - the implementation should allwo default values - especialy for not "Latin, Greek, and Cyrillic " or strings which "does not have enough distinct letters" - I think that the implementation is too complicated according what it do (see inline) - first letters of words should be preffered - it will need unittest;) I'm in grete favour to remove this from this changeset and proceed it as separate patch. > + public static Map generateMnemonics(final String[] strings) { > + if (strings == null) throw new IllegalArgumentException("strings"); At lest "input string was null" ;) > + > + final int stringsLength = strings.length; > + final HashMap hashMap = new HashMap(stringsLength); This to shoudl be final Map hashMap = new HashMap... > + for (int index = 0; index < stringsLength; index++) { > + // Remove all white spaces, because they must not be mnemonics maybe if (strings[index] == null) throw new IllegalArgumentException("strings") too? > + final String s = strings[index], reducedString = s.replaceAll("[^A-Za-z0-9\u0391-\u03A9\u03B1-\u03C9\u0410-\u045F]" /*"[\\s\\p{Punct}\\p{Cntrl}\u0500-\uFFFF]"*/, ""); s.replaceAll("/s","") should do the job ;) - If you really wont to remove only whitespaces, but I see different in regex. - Maybe jsut keep [A-Z,a-z] would be more usefull > + char mnemonic = '\u0000'; > + final int reducedStringLength = reducedString.length(); > + for (int charIndex = 0; charIndex < reducedStringLength && hashMap.containsValue(mnemonic = Character.toUpperCase(reducedString.charAt(charIndex))); charIndex++); interesting line :) > + hashMap.put(s, mnemonic); > + } > + > + return hashMap; > + } > + I would probably move this to separate calss file. Also it would be nice to have some smoke test for this, but as I'm not sure of comlexity I do not isnists. > + /** > + * A table model that is in effect a {@link DefaultTableModel} except for no > + * cell being editable. > + * @see DefaultTableModel > + */ > + public static class NonEditableTableModel extends DefaultTableModel { > + /** > + * Constructs a {@link javax.swing.table.TableModel} that serves only one > + * purpose: make cells of certificate tables not editable. > + * @see DefaultTableModel#DefaultTableModel() > + */ > + public NonEditableTableModel() { > + super(); > + } > + > + /** > + * Constructs a {@link javax.swing.table.TableModel} that serves only one > + * purpose: make cells of certificate tables not editable. > + * @param rowCount the number of rows the table holds > + * @param columnCount the number of columns the table holds > + * @see DefaultTableModel#DefaultTableModel(int,int) > + */ > + public NonEditableTableModel(final int rowCount, final int columnCount) { > + super(rowCount, columnCount); > + } > + > + /** > + * Constructs a {@link javax.swing.table.TableModel} that serves only one > + * purpose: make cells of certificate tables not editable. > + * @param data the data of the table > + * @param columnNames the names of the columns > + * @see DefaultTableModel#DefaultTableModel(Object[][],Object[]) > + */ > + public NonEditableTableModel(final Object[][] data, final Object[] columnNames) { > + super(data, columnNames); > + } > + > + /** > + * Constructs a {@link javax.swing.table.TableModel} that serves only one > + * purpose: make cells of certificate tables not editable. > + * @param columnNames {@code array} containing the names of the new columns; > + * if this is {@code null} then the model has no columns > + * @param rowCount the number of rows the table holds > + * @see DefaultTableModel#DefaultTableModel(Object[],int) > + */ > + public NonEditableTableModel(final Object[] columnNames, final int rowCount) { > + super(columnNames, rowCount); > + } > + > + /** > + * Constructs a {@link javax.swing.table.TableModel} that serves only one > + * purpose: make cells of certificate tables not editable. > + * @param columnNames {@code vector} containing the names of the new columns; > + * if this is {@code null} then the model has no columns > + * @param rowCount the number of rows the table holds > + * @see DefaultTableModel#DefaultTableModel(Vector,int) > + */ > + public NonEditableTableModel(final Vector columnNames, final int rowCount) { > + super(columnNames, rowCount); > + } > + > + /** > + * Constructs a {@link javax.swing.table.TableModel} that serves only one > + * purpose: make cells of certificate tables not editable. > + * @param data the data of the table, a {@code Vector} of {@code Vector}s > + * of {@code Object} values > + * @param columnNames {@code vector} containing the names of the new columns > + * @see DefaultTableModel#DefaultTableModel(Vector,Vector) > + */ > + public NonEditableTableModel(final Vector data, final Vector columnNames) { > + super(data, columnNames); > + } > + > + /** > + * This method always returns {@code false} to make the table's cells not > + * editable. > + * @param row the row whose value to be queried > + * @param column the column whose value to be queried > + * @return always {@code false} > + */ > + @Override > + public boolean isCellEditable(final int row, final int column) { > + return false; > + } > + } > +} > \ No newline at end of file > Again - greate work! Thank you vcery much for it J. From jvanek at redhat.com Fri Sep 6 03:08:09 2013 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 06 Sep 2013 12:08:09 +0200 Subject: [rfc][icedtea-web] RH976833 ClassLoader deadlock In-Reply-To: <52288F54.1000907@redhat.com> References: <520D35CA.9070208@redhat.com> <52286E1C.8030604@redhat.com> <52288F54.1000907@redhat.com> Message-ID: <5229A989.2060203@redhat.com> On 09/05/2013 04:04 PM, Andrew Azores wrote: > On 09/05/13 07:42, Jiri Vanek wrote: >> On 08/15/2013 10:10 PM, Andrew Azores wrote: >>> 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 >> >> Can we have an reproducer for this? But those are mostly very hard to reproduce, so do not vaste >> to much time on it (no metter that reprodcuer can have random behaviour as it "can deadlock") >> > > I did spend some time previously trying to put together a reproducer, but I wasn't able to recreate > the deadlock offline. The deadlock was affecting every webpage with multiple applets on it, however, > at least on my system. The two sites I used as "reproducers" were: > [1] http://www.browserspy.dk/java.php > [2] http://www.cis.upenn.edu/~matuszek/General/JavaVersionTests/JavaTests.html > [1] being the site mentioned in the original bug report, and [2] being a site I randomly found by > Googling for Java test applets. It has *9* on one page! Excellent for testing this particular > scenario :) oh yes, it 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. >> >> >> Sorry for being nitpicker, but please separate refactoring form fix. Both looks good but the >> readability of patch is strongly reduced by the mixture. >> >> Also I'm fan of "refactoring is good time to do an unittest" >> So the best would be for each method, you touch with "for-loops into fpor-each-loops " >> refactoring is an excelent candidate for unittest. When I wrote this to Adam an year ago, he >> stopepd todo this :) So I do not wont to force you to do, but please think about it. > > Sure I can separate them out. thank you. > > Unittesting on the refactors might be awkward because the methods containing the loop refactors are > things like JNLPClassLoader#initializePermissions(), which takes no parameters and has no return > value. It just adds values into a private list, which doesn't seem to be publicly exposed in any way > either. I'm not really sure how I can go about testing the refactor of the for-loop into a > for-each-loop in that kind of situation without doing even more refactoring and changing the > interface of the class, just to support being able to unittest a much simpler refactor. TBH I'd > rather just leave the slightly-messier looking for-loops in place in this case. If I had done a more > thorough refactor with methods being split/extracted or anything like that then unit testing would > seem more feasible. Please, do not abandon issue. When method is absolutely not testable, it means that it is wrong. Eg private void method() which operates some private fields, can be tested by refactoring into private static affectedFieldType method(oroginallySource Type) {} and private void method(){ //do the job affectedFieldType x = method(oroginallySource) //affect private field oroginallySource.getModifiedBy(x) } And of course by extracting hunks from too long methods. Of course similar approaches can not always be done, especially in class like JNLPClasslaoder. So use your judgement to refactor and test what can be, and do not vaste time where can not be. And of course to make me believe that yor changes on code which can not be tested do no harm ;) And well.. it affects also this patch too:( > > Attached is the fix-only version of the patch, refactoring all removed for the time being. > >> Moreover ok. General nit - it would be necessary add javadocs why affected fields have been made synchronised and why affected methods are no longer synchronised. > > > diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > @@ -166,7 +166,7 @@ > private ArrayList runtimePermissions = new ArrayList(); > > /** all jars not yet part of classloader or active */ > - private List available = new ArrayList(); > + private List available = Collections.synchronizedList(new ArrayList()); > > /** the jar cert verifier tool to verify our jars */ > private final JarCertVerifier jcv; > @@ -174,17 +174,17 @@ > private boolean signing = false; > > /** ArrayList containing jar indexes for various jars available to this classloader */ > - private ArrayList jarIndexes = new ArrayList(); > + private List jarIndexes = Collections.synchronizedList(new ArrayList()); > > /** Set of classpath strings declared in the manifest.mf files */ > - private Set classpaths = new HashSet