hg: jdk6/jdk6/jdk: 2 new changesets

[ahughes at redhat.com]

Changeset: 4684c385160e
Author:    ant
Date:      2008-03-26 17:38 +0300
URL:       http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/4684c385160e

6616792: five AWT focus regression tests should be fixed
Summary: Fixed/refactored the tests.
Reviewed-by: volk

! test/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java
! test/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java
! test/java/awt/Focus/FrameJumpingToMouse/FrameJumpingToMouse.java
+ test/java/awt/Focus/NonFocusableWindowTest/NoEventsTest.java
! test/java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java
- test/java/awt/Focus/NonFocusableWindowTest/Test.java
! test/java/awt/Focus/TypeAhead/TestFocusFreeze.java
! test/java/awt/Focus/WrongKeyTypedConsumedTest/WrongKeyTypedConsumedTest.java

Changeset: c3a035784a3a
Author:    andrew
Date:      2010-04-16 09:54 +0100
URL:       http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/c3a035784a3a

6944361: Missing CKR_ values in PKCS11Exception
Summary: Allow native NSS errors to be observed and correctly reported
Reviewed-by: wetmore, valeriep

! src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java
! src/share/classes/sun/security/x509/X509Key.java