hg: jdk7/tl/jdk: 28 new changesets

lana.steuck at oracle.com lana.steuck at oracle.com
Sat May 14 21:59:53 UTC 2011 

Changeset: 10f6986c84ad
Author:    jgodinez
Date:      2011-05-09 12:32 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/10f6986c84ad

Merge

- test/java/beans/XMLEncoder/java_io_File.java

Changeset: 32f53b3cbc65
Author:    asaha
Date:      2011-05-04 11:11 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/32f53b3cbc65

7035172: Reintroduce LICENSE file in JDK/JRE bundle
Reviewed-by: billyh

! make/common/Release.gmk

Changeset: 1eb466ffaccf
Author:    cgruszka
Date:      2011-05-10 17:56 -0400
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/1eb466ffaccf

Merge

! make/common/Release.gmk

Changeset: 89d3aea9daf2
Author:    vinnie
Date:      2011-05-04 20:38 +0100
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/89d3aea9daf2

6738532: Error in Elliptic Curve NamedCurve determination. (related to PKCS11)
Reviewed-by: valeriep

! src/share/classes/java/security/spec/EllipticCurve.java
+ test/java/security/spec/EllipticCurveMatch.java

Changeset: ec6e2b13330f
Author:    ngthomas
Date:      2011-05-10 15:31 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/ec6e2b13330f

Merge

- test/java/beans/XMLEncoder/java_io_File.java

Changeset: 25b72781083c
Author:    ngthomas
Date:      2011-05-10 16:12 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/25b72781083c

Merge


Changeset: 28269923b747
Author:    fparain
Date:      2011-05-06 18:09 +0200
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/28269923b747

7028071: Add two attributes to the OperatingSystemMXBean to provide CPU Load info
Summary: Add getProcessCpuLoad() and getSystemCpuLoad() to the OperatingSystemMXBean
Reviewed-by: acorn, dholmes, mchung

! make/java/management/Makefile
! make/java/management/mapfile-vers
! src/share/classes/com/sun/management/OperatingSystemMXBean.java
! src/solaris/classes/com/sun/management/UnixOperatingSystem.java
+ src/solaris/native/com/sun/management/LinuxOperatingSystem.c
+ src/solaris/native/com/sun/management/SolarisOperatingSystem.c
! src/windows/classes/com/sun/management/OperatingSystem.java
! src/windows/native/com/sun/management/OperatingSystem_md.c
+ test/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java
+ test/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java

Changeset: 0f4a9ce78cf9
Author:    trims
Date:      2011-05-10 18:31 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/0f4a9ce78cf9

Merge


Changeset: 7d36a6a37251
Author:    ohair
Date:      2011-05-05 15:23 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/7d36a6a37251

Merge


Changeset: 7bb810bddddd
Author:    ohair
Date:      2011-05-06 10:41 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/7bb810bddddd

Merge


Changeset: 62e8094052eb
Author:    ohair
Date:      2011-05-06 15:49 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/62e8094052eb

Merge


Changeset: 69a4dd09ba46
Author:    ohair
Date:      2011-05-10 17:42 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/69a4dd09ba46

Merge


Changeset: a8e0571232c4
Author:    mfang
Date:      2011-05-06 10:07 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/a8e0571232c4

7021691: Most log level words are not translated in java logging
Reviewed-by: yhuang

! src/share/classes/sun/util/logging/resources/logging_de.properties
! src/share/classes/sun/util/logging/resources/logging_es.properties
! src/share/classes/sun/util/logging/resources/logging_fr.properties
! src/share/classes/sun/util/logging/resources/logging_it.properties
! src/share/classes/sun/util/logging/resources/logging_ja.properties
! src/share/classes/sun/util/logging/resources/logging_ko.properties
! src/share/classes/sun/util/logging/resources/logging_pt_BR.properties
! src/share/classes/sun/util/logging/resources/logging_sv.properties
! src/share/classes/sun/util/logging/resources/logging_zh_CN.properties
! src/share/classes/sun/util/logging/resources/logging_zh_TW.properties

Changeset: 481e358abc98
Author:    mfang
Date:      2011-05-10 12:31 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/481e358abc98

7043580: integrate man page translation drop 2 into jdk7
Reviewed-by: yhuang

! src/linux/doc/man/ja/appletviewer.1
! src/linux/doc/man/ja/apt.1
! src/linux/doc/man/ja/extcheck.1
! src/linux/doc/man/ja/idlj.1
! src/linux/doc/man/ja/jar.1
! src/linux/doc/man/ja/jarsigner.1
! src/linux/doc/man/ja/java.1
! src/linux/doc/man/ja/javac.1
! src/linux/doc/man/ja/javadoc.1
! src/linux/doc/man/ja/javah.1
! src/linux/doc/man/ja/javap.1
! src/linux/doc/man/ja/javaws.1
! src/linux/doc/man/ja/jconsole.1
! src/linux/doc/man/ja/jdb.1
! src/linux/doc/man/ja/jhat.1
! src/linux/doc/man/ja/jinfo.1
! src/linux/doc/man/ja/jmap.1
! src/linux/doc/man/ja/jps.1
! src/linux/doc/man/ja/jrunscript.1
! src/linux/doc/man/ja/jsadebugd.1
! src/linux/doc/man/ja/jstack.1
! src/linux/doc/man/ja/jstat.1
! src/linux/doc/man/ja/jstatd.1
! src/linux/doc/man/ja/jvisualvm.1
! src/linux/doc/man/ja/keytool.1
! src/linux/doc/man/ja/native2ascii.1
! src/linux/doc/man/ja/orbd.1
! src/linux/doc/man/ja/pack200.1
! src/linux/doc/man/ja/policytool.1
! src/linux/doc/man/ja/rmic.1
! src/linux/doc/man/ja/rmid.1
! src/linux/doc/man/ja/rmiregistry.1
! src/linux/doc/man/ja/schemagen.1
! src/linux/doc/man/ja/serialver.1
! src/linux/doc/man/ja/servertool.1
! src/linux/doc/man/ja/tnameserv.1
! src/linux/doc/man/ja/unpack200.1
! src/linux/doc/man/ja/wsgen.1
! src/linux/doc/man/ja/wsimport.1
! src/linux/doc/man/ja/xjc.1
! src/solaris/doc/sun/man/man1/ja/appletviewer.1
! src/solaris/doc/sun/man/man1/ja/apt.1
! src/solaris/doc/sun/man/man1/ja/extcheck.1
! src/solaris/doc/sun/man/man1/ja/idlj.1
! src/solaris/doc/sun/man/man1/ja/jar.1
! src/solaris/doc/sun/man/man1/ja/jarsigner.1
! src/solaris/doc/sun/man/man1/ja/java.1
! src/solaris/doc/sun/man/man1/ja/javac.1
! src/solaris/doc/sun/man/man1/ja/javadoc.1
! src/solaris/doc/sun/man/man1/ja/javah.1
! src/solaris/doc/sun/man/man1/ja/javap.1
! src/solaris/doc/sun/man/man1/ja/javaws.1
! src/solaris/doc/sun/man/man1/ja/jconsole.1
! src/solaris/doc/sun/man/man1/ja/jdb.1
! src/solaris/doc/sun/man/man1/ja/jhat.1
! src/solaris/doc/sun/man/man1/ja/jinfo.1
! src/solaris/doc/sun/man/man1/ja/jmap.1
! src/solaris/doc/sun/man/man1/ja/jps.1
! src/solaris/doc/sun/man/man1/ja/jrunscript.1
! src/solaris/doc/sun/man/man1/ja/jsadebugd.1
! src/solaris/doc/sun/man/man1/ja/jstack.1
! src/solaris/doc/sun/man/man1/ja/jstat.1
! src/solaris/doc/sun/man/man1/ja/jstatd.1
! src/solaris/doc/sun/man/man1/ja/jvisualvm.1
! src/solaris/doc/sun/man/man1/ja/keytool.1
! src/solaris/doc/sun/man/man1/ja/native2ascii.1
! src/solaris/doc/sun/man/man1/ja/orbd.1
! src/solaris/doc/sun/man/man1/ja/pack200.1
! src/solaris/doc/sun/man/man1/ja/policytool.1
! src/solaris/doc/sun/man/man1/ja/rmic.1
! src/solaris/doc/sun/man/man1/ja/rmid.1
! src/solaris/doc/sun/man/man1/ja/rmiregistry.1
! src/solaris/doc/sun/man/man1/ja/schemagen.1
! src/solaris/doc/sun/man/man1/ja/serialver.1
! src/solaris/doc/sun/man/man1/ja/servertool.1
! src/solaris/doc/sun/man/man1/ja/tnameserv.1
! src/solaris/doc/sun/man/man1/ja/unpack200.1
! src/solaris/doc/sun/man/man1/ja/wsgen.1
! src/solaris/doc/sun/man/man1/ja/wsimport.1
! src/solaris/doc/sun/man/man1/ja/xjc.1

Changeset: 357395bc17ab
Author:    mfang
Date:      2011-05-10 13:08 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/357395bc17ab

7042323: [sv, de, es, it] Print dialog has duplicate mnemonic key
Reviewed-by: yhuang

! src/share/classes/sun/print/resources/serviceui_de.properties
! src/share/classes/sun/print/resources/serviceui_es.properties
! src/share/classes/sun/print/resources/serviceui_it.properties
! src/share/classes/sun/print/resources/serviceui_sv.properties

Changeset: 98292f06cd7e
Author:    mfang
Date:      2011-05-10 14:47 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/98292f06cd7e

7028447: security-related resources Chinese translation errors
Reviewed-by: weijun

! src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java
! src/share/classes/sun/security/util/Resources_zh_CN.java

Changeset: 2dd7fb82f40e
Author:    mfang
Date:      2011-05-10 14:53 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/2dd7fb82f40e

7042475: [ja,zh_CN] extra mnemonic key in jconsole
Reviewed-by: yhuang

! src/share/classes/sun/tools/jconsole/resources/JConsoleResources_ja.java
! src/share/classes/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java

Changeset: 3d39f994d6ff
Author:    mfang
Date:      2011-05-10 14:56 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/3d39f994d6ff

7038807: [CCJK] OK button on message dialog of JOptionpane is not translated
Reviewed-by: yhuang

! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties
! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties
! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties
! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties

Changeset: be418afb1b2e
Author:    mfang
Date:      2011-05-10 16:19 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/be418afb1b2e

7043548: message drop 3 translation integration
Reviewed-by: yhuang

! src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties
! src/share/classes/sun/awt/resources/awt_es.properties
! src/share/classes/sun/launcher/resources/launcher_de.properties
! src/share/classes/sun/launcher/resources/launcher_es.properties
! src/share/classes/sun/launcher/resources/launcher_fr.properties
! src/share/classes/sun/launcher/resources/launcher_it.properties
! src/share/classes/sun/launcher/resources/launcher_ja.properties
! src/share/classes/sun/launcher/resources/launcher_ko.properties
! src/share/classes/sun/launcher/resources/launcher_pt_BR.properties
! src/share/classes/sun/launcher/resources/launcher_sv.properties
! src/share/classes/sun/launcher/resources/launcher_zh_CN.properties
! src/share/classes/sun/launcher/resources/launcher_zh_TW.properties
! src/share/classes/sun/rmi/server/resources/rmid_es.properties
! src/share/classes/sun/security/tools/JarSignerResources_ja.java
! src/share/classes/sun/security/util/AuthResources_de.java
! src/share/classes/sun/security/util/AuthResources_es.java
! src/share/classes/sun/security/util/AuthResources_fr.java
! src/share/classes/sun/security/util/AuthResources_it.java
! src/share/classes/sun/security/util/AuthResources_ja.java
! src/share/classes/sun/security/util/AuthResources_ko.java
! src/share/classes/sun/security/util/AuthResources_pt_BR.java
! src/share/classes/sun/security/util/AuthResources_sv.java
! src/share/classes/sun/security/util/AuthResources_zh_CN.java
! src/share/classes/sun/security/util/AuthResources_zh_TW.java
! src/share/classes/sun/security/util/Resources_de.java
! src/share/classes/sun/security/util/Resources_es.java
! src/share/classes/sun/security/util/Resources_fr.java
! src/share/classes/sun/security/util/Resources_it.java
! src/share/classes/sun/security/util/Resources_ja.java
! src/share/classes/sun/security/util/Resources_ko.java
! src/share/classes/sun/security/util/Resources_pt_BR.java
! src/share/classes/sun/security/util/Resources_sv.java
! src/share/classes/sun/security/util/Resources_zh_TW.java

Changeset: 78f2f50bca1f
Author:    mfang
Date:      2011-05-10 19:57 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/78f2f50bca1f

Merge


Changeset: 42c22d5a2cd0
Author:    bpatel
Date:      2011-05-11 08:30 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/42c22d5a2cd0

7043684: Update man pages for JDK 7 tools
Reviewed-by: skannan

! src/linux/doc/man/appletviewer.1
! src/linux/doc/man/apt.1
! src/linux/doc/man/extcheck.1
! src/linux/doc/man/idlj.1
! src/linux/doc/man/jar.1
! src/linux/doc/man/jarsigner.1
! src/linux/doc/man/java.1
! src/linux/doc/man/javac.1
! src/linux/doc/man/javadoc.1
! src/linux/doc/man/javah.1
! src/linux/doc/man/javap.1
! src/linux/doc/man/javaws.1
! src/linux/doc/man/jconsole.1
! src/linux/doc/man/jdb.1
! src/linux/doc/man/jhat.1
! src/linux/doc/man/jinfo.1
! src/linux/doc/man/jmap.1
! src/linux/doc/man/jps.1
! src/linux/doc/man/jrunscript.1
! src/linux/doc/man/jsadebugd.1
! src/linux/doc/man/jstack.1
! src/linux/doc/man/jstat.1
! src/linux/doc/man/jstatd.1
+ src/linux/doc/man/jvisualvm.1
! src/linux/doc/man/keytool.1
! src/linux/doc/man/native2ascii.1
! src/linux/doc/man/orbd.1
! src/linux/doc/man/pack200.1
! src/linux/doc/man/policytool.1
! src/linux/doc/man/rmic.1
! src/linux/doc/man/rmid.1
! src/linux/doc/man/rmiregistry.1
! src/linux/doc/man/schemagen.1
! src/linux/doc/man/serialver.1
! src/linux/doc/man/servertool.1
! src/linux/doc/man/tnameserv.1
! src/linux/doc/man/unpack200.1
! src/linux/doc/man/wsgen.1
! src/linux/doc/man/wsimport.1
! src/linux/doc/man/xjc.1
! src/solaris/doc/sun/man/man1/appletviewer.1
! src/solaris/doc/sun/man/man1/apt.1
! src/solaris/doc/sun/man/man1/extcheck.1
! src/solaris/doc/sun/man/man1/idlj.1
! src/solaris/doc/sun/man/man1/jar.1
! src/solaris/doc/sun/man/man1/jarsigner.1
! src/solaris/doc/sun/man/man1/java.1
! src/solaris/doc/sun/man/man1/javac.1
! src/solaris/doc/sun/man/man1/javadoc.1
! src/solaris/doc/sun/man/man1/javah.1
! src/solaris/doc/sun/man/man1/javap.1
! src/solaris/doc/sun/man/man1/javaws.1
! src/solaris/doc/sun/man/man1/jconsole.1
! src/solaris/doc/sun/man/man1/jdb.1
! src/solaris/doc/sun/man/man1/jhat.1
! src/solaris/doc/sun/man/man1/jinfo.1
! src/solaris/doc/sun/man/man1/jmap.1
! src/solaris/doc/sun/man/man1/jps.1
! src/solaris/doc/sun/man/man1/jrunscript.1
! src/solaris/doc/sun/man/man1/jsadebugd.1
! src/solaris/doc/sun/man/man1/jstack.1
! src/solaris/doc/sun/man/man1/jstat.1
! src/solaris/doc/sun/man/man1/jstatd.1
+ src/solaris/doc/sun/man/man1/jvisualvm.1
! src/solaris/doc/sun/man/man1/keytool.1
! src/solaris/doc/sun/man/man1/native2ascii.1
! src/solaris/doc/sun/man/man1/orbd.1
! src/solaris/doc/sun/man/man1/pack200.1
! src/solaris/doc/sun/man/man1/policytool.1
! src/solaris/doc/sun/man/man1/rmic.1
! src/solaris/doc/sun/man/man1/rmid.1
! src/solaris/doc/sun/man/man1/rmiregistry.1
! src/solaris/doc/sun/man/man1/schemagen.1
! src/solaris/doc/sun/man/man1/serialver.1
! src/solaris/doc/sun/man/man1/servertool.1
! src/solaris/doc/sun/man/man1/tnameserv.1
! src/solaris/doc/sun/man/man1/unpack200.1
! src/solaris/doc/sun/man/man1/wsgen.1
! src/solaris/doc/sun/man/man1/wsimport.1
! src/solaris/doc/sun/man/man1/xjc.1

Changeset: 245d9754f487
Author:    mfang
Date:      2011-05-11 12:53 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/245d9754f487

7004603: L10n needed for newly added codes in LocaleNames
Reviewed-by: naoto

! src/share/classes/sun/util/resources/LocaleNames_de.properties
! src/share/classes/sun/util/resources/LocaleNames_es.properties
! src/share/classes/sun/util/resources/LocaleNames_fr.properties
! src/share/classes/sun/util/resources/LocaleNames_it.properties
! src/share/classes/sun/util/resources/LocaleNames_ja.properties
! src/share/classes/sun/util/resources/LocaleNames_ko.properties
! src/share/classes/sun/util/resources/LocaleNames_sv.properties
! src/share/classes/sun/util/resources/LocaleNames_zh.properties
! src/share/classes/sun/util/resources/LocaleNames_zh_TW.properties

Changeset: 2bbb5d2b419f
Author:    mfang
Date:      2011-05-11 12:55 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/2bbb5d2b419f

Merge


Changeset: caed82420c5d
Author:    mfang
Date:      2011-05-11 14:12 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/caed82420c5d

7044019: LocaleEnhanceTest.java needs to be updated for 7004603
Reviewed-by: naoto

! test/java/util/Locale/LocaleEnhanceTest.java

Changeset: 312612e89ece
Author:    schien
Date:      2011-05-11 18:52 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/312612e89ece

Merge


Changeset: 2e430b88b949
Author:    schien
Date:      2011-05-12 17:17 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/2e430b88b949

Added tag jdk7-b142 for changeset 312612e89ece

! .hgtags

Changeset: 07b5cc7d4c84
Author:    lana
Date:      2011-05-14 11:24 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/07b5cc7d4c84

Merge


Changeset: 55339371da15
Author:    lana
Date:      2011-05-14 14:55 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/55339371da15

Merge

More information about the security-dev mailing list