Mercurial > hg > openjdk > jdk8 > jdk
changeset 8999:71ce5e56ca60
Merge
| author | lana |
|---|---|
| date | Wed, 25 Dec 2013 10:34:40 -0800 |
| parents | f3c714eeef6c (current diff) 2f31ddf65e74 (diff) |
| children | 1a3de3cdc684 |
| files | |
| diffstat | 24 files changed, 989 insertions(+), 697 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Dec 23 14:05:20 2013 -0500 +++ b/.hgtags Wed Dec 25 10:34:40 2013 -0800 @@ -242,3 +242,4 @@ 28ca338366ff2774ac9002f9f6eaff4101a3ea3b jdk8-b118 e4499a6529e8c3e762ba86f45cdd774c92a8e7bc jdk8-b119 d31cd980e1da31fa496a359caaf1a165aeb5791a jdk8-b120 +ce05e132b1370fe8a66ab9373014d12328c591c4 jdk8-b121
--- a/make/CompileJavaClasses.gmk Mon Dec 23 14:05:20 2013 -0500 +++ b/make/CompileJavaClasses.gmk Wed Dec 25 10:34:40 2013 -0800 @@ -402,7 +402,8 @@ SETUP := GENERATE_JDKBYTECODE, \ JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \ SRC := $(JDK_OUTPUTDIR)/gensrc_ab/32bit, \ - BIN := $(JDK_OUTPUTDIR)/classes_ab/32bit)) + BIN := $(JDK_OUTPUTDIR)/classes_ab/32bit, \ + HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers)) $(BUILD_ACCESSBRIDGE_32): $(BUILD_JDK) @@ -410,7 +411,8 @@ SETUP := GENERATE_JDKBYTECODE, \ JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \ SRC := $(JDK_OUTPUTDIR)/gensrc_ab/legacy, \ - BIN := $(JDK_OUTPUTDIR)/classes_ab/legacy)) + BIN := $(JDK_OUTPUTDIR)/classes_ab/legacy, \ + HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers)) $(BUILD_ACCESSBRIDGE_LEGACY): $(BUILD_JDK) @@ -420,7 +422,8 @@ SETUP := GENERATE_JDKBYTECODE, \ JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \ SRC := $(JDK_OUTPUTDIR)/gensrc_ab/64bit, \ - BIN := $(JDK_OUTPUTDIR)/classes_ab/64bit)) + BIN := $(JDK_OUTPUTDIR)/classes_ab/64bit, \ + HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers)) $(BUILD_ACCESSBRIDGE_64): $(BUILD_JDK)
--- a/src/bsd/doc/man/jarsigner.1 Mon Dec 23 14:05:20 2013 -0500 +++ b/src/bsd/doc/man/jarsigner.1 Wed Dec 25 10:34:40 2013 -0800 @@ -308,11 +308,7 @@ .nf \f3KEVIN\&.DSA\fP .fi -.nf -\f3\fR -.fi .sp -\fINote:\fR It is also possible for a JAR file to have mixed signatures, some generated by the JDK 1\&.1 by the \f3javakey\fR command and others by \f3jarsigner\fR\&. The \f3jarsigner\fR command can be used to sign JAR files that are already signed with the \f3javakey\fR command\&. .SH OPTIONS The following sections describe the various \f3jarsigner\fR options\&. Be aware of the following standards: .TP 0.2i @@ -443,7 +439,7 @@ .br If the \f3-certs\fR option appears on the command line with the \f3-verify\fR and \f3-verbose\fR options, then the output includes certificate information for each signer of the JAR file\&. This information includes the name of the type of certificate (stored in the \f3\&.DSA\fR file) that certifies the signer\&'s public key, and if the certificate is an X\&.509 certificate (an instance of the \f3java\&.security\&.cert\&.X509Certificate\fR), then the distinguished name of the signer\&. -The keystore is also examined\&. If no keystore value is specified on the command line, then the default keystore file (if any) is checked\&. If the public key certificate for a signer matches an entry in the keystore, then the alias name for the keystore entry for that signer is displayed in parentheses\&. If the signer comes from a JDK 1\&.1 identity database instead of from a keystore, then the alias name displays in brackets instead of parentheses\&. +The keystore is also examined\&. If no keystore value is specified on the command line, then the default keystore file (if any) is checked\&. If the public key certificate for a signer matches an entry in the keystore, then the alias name for the keystore entry for that signer is displayed in parentheses\&. .TP -certchain \fIfile\fR .br @@ -797,178 +793,6 @@ .fi .sp If the certificate for a signer is not an X\&.509 certificate, then there is no distinguished name information\&. In that case, just the certificate type and the alias are shown\&. For example, if the certificate is a PGP certificate, and the alias is \f3bob\fR, then you would get: \f3PGP, (bob)\fR\&. -.SS VERIFICATION\ THAT\ INCLUDES\ IDENTITY\ DATABASE\ SIGNERS -If a JAR file was signed with the JDK 1\&.1 \f3javakey\fR tool, and the signer is an alias in an identity database, then the verification output includes an \f3i\fR\&. If the JAR file was signed by both an alias in an identity database and an alias in a keystore, then both \f3k\fR and \f3i\fR appear\&. -.PP -When the \f3-certs\fR option is used, any identity database aliases are shown in brackets rather than the parentheses used for keystore aliases, for example: -.sp -.nf -\f3 jarsigner \-keystore /working/mystore \-verify \-verbose \-certs writeFile\&.jar\fP -.fi -.nf -\f3\fR -.fi -.nf -\f3 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST\&.MF\fP -.fi -.nf -\f3 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.SF\fP -.fi -.nf -\f3 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.DSA\fP -.fi -.nf -\f3 199 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE\&.SF\fP -.fi -.nf -\f3 1013 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE\&.DSA\fP -.fi -.nf -\f3 smki 2752 Fri Sep 26 16:12:30 PDT 1997 writeFile\&.html\fP -.fi -.nf -\f3\fR -.fi -.nf -\f3 X\&.509, CN=Jane Smith, OU=Java Software, O=Oracle, L=cup, S=ca, C=us (jane)\fP -.fi -.nf -\f3 X\&.509, CN=Duke, OU=Java Software, O=Oracle, L=cup, S=ca, C=us [duke]\fP -.fi -.nf -\f3\fR -.fi -.nf -\f3 s = signature was verified\fP -.fi -.nf -\f3 m = entry is listed in manifest\fP -.fi -.nf -\f3 k = at least one certificate was found in keystore\fP -.fi -.nf -\f3 i = at least one certificate was found in identity scope\fP -.fi -.nf -\f3\fR -.fi -.nf -\f3 jar verified\&.\fP -.fi -.nf -\f3\fR -.fi -.sp -\fINote:\fR The alias \f3duke\fR is in brackets to denote that it is an identity database alias, and not a keystore alias\&. -.SH JDK\ 1\&.1\ COMPATIBILITY -The \f3keytool\fR and \f3jarsigner\fR tools replace the \f3javakey\fR tool in JDK 1\&.1\&. These new tools provide more features than \f3javakey\fR, including the ability to protect the keystore and private keys with passwords, and the ability to verify signatures in addition to generating them\&. -.PP -The new keystore architecture replaces the identity database that \f3javakey\fR created and managed\&. There is no backward compatibility between the keystore format and the database format used by \f3javakey\fR in JDK 1\&.1\&. However, be aware of the following: -.TP 0.2i -\(bu -It is possible to import the information from an identity database into a keystore through the \f3keytool -identitydb\fR command\&. -.TP 0.2i -\(bu -The \f3jarsigner\fR command can sign JAR files that were signed with the \f3javakey\fR command\&. -.TP 0.2i -\(bu -The \f3jarsigner\fR command can verify JAR files signed with \f3javakey\fR\&. The \f3jarsigner\fR command recognizes and can work with signer aliases that are from a JDK 1\&.1 identity database rather than a JDK keystore\&. -.SS UNSIGNED\ JARS -Unsigned JARs have the default privileges that are granted to all code\&. -.SS SIGNED\ JARS -Signed JARs have the privilege configurations based on their JDK 1\&.1\&.\fIn\fR identity and policy file status as described\&. Only trusted identities can be imported into the JDK keystore\&. -.PP -Default Privileges Granted to All Code - -Identity in 1\&.1 database: \fINo\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR -.br -Policy file grants privileges to identity/alias: \fINo\fR -.PP - -.PP -Identity in 1\&.1 database: \fINo\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR -.br -Policy file grants privileges to identity/alias: \fINo\fR -.PP - -.PP -Identity in 1\&.1 database: Yes/Untrusted -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR -.br -Policy file grants privileges to identity/alias: \fINo\fR -.br -See 3 in Notes Regarding Privileges of Signed JARs\&. -.PP - -.PP -Identity in 1\&.1 database: Yes/Untrusted -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR -.br -Policy file grants privileges to identity/alias: \fIYes\fR -.br -See 1 and 3 in Notes Regarding Privileges of Signed JARs\&. -.PP -Default Privileges and Policy File Privileges Granted - -Identity in 1\&.1 database: \fINo\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR -.br -Policy file grants privileges to identity/alias: \fIYes\fR -.PP - -.PP -Identity in 1\&.1 database: \fIYes/Trusted\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR -.br -Policy file grants privileges to identity/alias: \fIYes\fR -.br -See 2 in Notes Regarding Privileges of Signed JARs\&. -.PP -All Privileges Granted - -Identity in 1\&.1 database: \fIYes/Trusted\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR -.br -Policy file grants privileges to identity/alias: \fINo\fR -.PP - -.PP -Identity in 1\&.1 database: \fIYes/Trusted\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR -.br -Policy file grants privileges to identity/alias: \fINo\fR -.br -See 1 in Notes Regarding Privileges of Signed JARs\&. -.PP -Identity in 1\&.1 database: \fIYes/Trusted\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR -.br -Policy file grants privileges to identity/alias: \fIYes\fR -.br -See 1 in Notes Regarding Privileges of Signed JARs\&. -.PP -Notes Regarding Privileges of Signed JARs -.TP 0.4i -1\&. -If an identity or alias is mentioned in the policy file, then it must be imported into the keystore for the policy file to have any effect on privileges granted\&. -.TP 0.4i -2\&. -The policy file/keystore combination has precedence over a trusted identity in the identity database\&. -.TP 0.4i -3\&. -Untrusted identities are ignored in the Java platform\&. .SH SEE\ ALSO .TP 0.2i \(bu
--- a/src/bsd/doc/man/java.1 Mon Dec 23 14:05:20 2013 -0500 +++ b/src/bsd/doc/man/java.1 Wed Dec 25 10:34:40 2013 -0800 @@ -373,7 +373,7 @@ .TP -Xcomp .br -Disables interpretation of Java code and compile methods on first invocation\&. By default, the JIT compiler performs 10,000 interpreted method invocations to gather information for efficient compilation\&. To increase compilation performance at the expense of efficiency, use the \f3-Xcomp\fR flag to disable interpreted method invocations\&. +Forces compilation of methods on first invocation\&. By default, the Client VM (\f3-client\fR) performs 1,000 interpreted method invocations and the Server VM (\f3-server\fR) performs 10,000 interpreted method invocations to gather information for efficient compilation\&. Specifying the \f3-Xcomp\fR option disables interpreted method invocations to increase compilation performance at the expense of efficiency\&. You can also change the number of interpreted method invocations before compilation using the \f3-XX:CompileThreshold\fR option\&. .TP @@ -937,11 +937,9 @@ .sp .TP -.nf --XX:CompileCommand=\fIcommand\fR,\fIclass\fR\&.\fImethod\fR[,\fIoption\fR] +-XX:CompileCommand=\fIcommand\fR,\fImethod\fR[,\fIoption\fR] .br -.fi -Attaches a line to the \f3\&.hotspot_compiler\fR file with the command for the specific method of the class\&. For example, to exclude the \f3indexOf()\fR method of the \f3String\fR class from being compiled, use the following: +Specifies a command to perform on a method\&. For example, to exclude the \f3indexOf()\fR method of the \f3String\fR class from being compiled, use the following: .sp .nf \f3\-XX:CompileCommand=exclude,java/lang/String\&.indexOf\fP @@ -952,9 +950,40 @@ .sp -Note that you must specify the full class name, including all packages and subpackages separated by a slash (\f3/\fR)\&. +Note that the full class name is specified, including all packages and subpackages separated by a slash (\f3/\fR)\&. For easier cut and paste operations, it is also possible to use the method name format produced by the \f3-XX:+PrintCompilation\fR and \f3-XX:+LogCompilation\fR options: +.sp +.nf +\f3\-XX:CompileCommand=exclude,java\&.lang\&.String::indexOf\fP +.fi +.nf +\f3\fP +.fi +.sp + -To add several commands, either specify this option multiple times, or separate each argument with the newline separator (\f3\en\fR)\&. To better understand the syntax of the JVM compiler commands, refer to the description of the \f3-XX:CompileCommandFile\fR option, which enables you to specify the file from which to read compiler commands\&. Notice how the syntax of the command file differs rom the syntax of the argument for the \f3-XX:CompileCommand\fR option\&. The commas and periods in the argument are aliases for spaces in the command file, making it easier to pass compiler commands through a shell\&. To pass arguments to \f3-XX:CompileCommand\fR with the same syntax as that used in the command file, you can enclose the argument in quotation marks: +If the method is specified without the signature, the command will be applied to all methods with the specified name\&. However, you can also specify the signature of the method in the class file format\&. In this case, you should enclose the arguments in quotation marks, because otherwise the shell treats the semicolon as command end\&. For example, if you want to exclude only the \f3indexOf(String)\fR method of the \f3String\fR class from being compiled, use the following: +.sp +.nf +\f3\-XX:CompileCommand="exclude,java/lang/String\&.indexOf,(Ljava/lang/String;)I"\fP +.fi +.nf +\f3\fP +.fi +.sp + + +You can also use the asterisk (*) as a wildcard for class and method names\&. For example, to exclude all \f3indexOf()\fR methods in all classes from being compiled, use the following: +.sp +.nf +\f3\-XX:CompileCommand=exclude,*\&.indexOf\fP +.fi +.nf +\f3\fP +.fi +.sp + + +The commas and periods are aliases for spaces, making it easier to pass compiler commands through a shell\&. You can pass arguments to \f3-XX:CompileCommand\fR using spaces as separators by enclosing the argument in quotation marks: .sp .nf \f3\-XX:CompileCommand="exclude java/lang/String indexOf"\fP @@ -965,25 +994,16 @@ .sp -For easier cut and paste operations, it is also possible to use the method name format produced by the \f3-XX:+PrintCompilation\fR and \f3-XX:+LogCompilation\fR options: -.sp -.nf -\f3\-XX:CompileCommand="exclude java\&.lang\&.String::indexOf"\fP -.fi -.nf -\f3\fP -.fi -.sp +Note that after parsing the commands passed on the command line using the \f3-XX:CompileCommand\fR options, the JIT compiler then reads commands from the \f3\&.hotspot_compiler\fR file\&. You can add commands to this file or specify a different file using the \f3-XX:CompileCommandFile\fR option\&. - -The following commands are available: +To add several commands, either specify the \f3-XX:CompileCommand\fR option multiple times, or separate each argument with the newline separator (\f3\en\fR)\&. The following commands are available: .RS .TP break Set a breakpoint when debugging the JVM to stop at the beginning of compilation of the specified method\&. .TP compileonly -Exclude all methods from compilation except for the specified method\&. +Exclude all methods from compilation except for the specified method\&. As an alternative, you can use the \f3-XX:CompileOnly\fR option, which allows to specify several methods\&. .TP dontinline Prevent inlining of the specified method\&. @@ -1000,6 +1020,20 @@ log Exclude compilation logging (with the \f3-XX:+LogCompilation\fR option) for all methods except for the specified method\&. By default, logging is performed for all compiled methods\&. .TP +option +This command can be used to pass a JIT compilation option to the specified method in place of the last argument (\fIoption\fR)\&. The compilation option is set at the end, after the method name\&. For example, to enable the \f3BlockLayoutByFrequency\fR option for the \f3append()\fR method of the \f3StringBuffer\fR class, use the following: +.sp +.nf +\f3\-XX:CompileCommand=option,java/lang/StringBuffer\&.append,BlockLayoutByFrequency\fP +.fi +.nf +\f3\fP +.fi +.sp + + +You can specify multiple compilation options, separated by commas or spaces\&. +.TP print Print generated assembler code after compilation of the specified method\&. .TP @@ -1018,26 +1052,12 @@ You can suppress this by specifying the \f3-XX:CompileCommand=quiet\fR option before other \f3-XX:CompileCommand\fR options\&. .RE - -.RS -The optional last argument (\fIoption\fR) can be used to pass a JIT compilation option to the specified method\&. The compilation option is set at the end, after the method name\&. For example, to enable the \f3BlockLayoutByFrequency\fR option for the \f3append()\fR method of the \f3StringBuffer\fR class, use the following: -.sp -.nf -\f3\-XX:CompileCommand=option,java/lang/StringBuffer\&.append,BlockLayoutByFrequency\fP -.fi -.nf -\f3\fP -.fi -.sp - - -.RE .TP -XX:CompileCommandFile=\fIfilename\fR .br -Sets the file from which compiler commands are read\&. By default, the \f3\&.hotspot_compiler\fR file is used to store commands performed by the JVM compiler\&. +Sets the file from which JIT compiler commands are read\&. By default, the \f3\&.hotspot_compiler\fR file is used to store commands performed by the JIT compiler\&. -Each line in the command file represents a command, a class name, and a method name for which the command is used (all three parts are separated by spaces)\&. For example, this line prints assembly code for the \f3toString()\fR method of the \f3String\fR class: +Each line in the command file represents a command, a class name, and a method name for which the command is used\&. For example, this line prints assembly code for the \f3toString()\fR method of the \f3String\fR class: .sp .nf \f3print java/lang/String toString\fP @@ -1048,7 +1068,7 @@ .sp -To add commands to the beginning of the \f3\&.hotspot_compiler\fR file, use the \f3-XX:CompileCommand\fR option\&. Note how the syntax of the command file is different from the syntax of the argument for the \f3-XX:CompileCommand\fR option\&. The commas and periods in the argument are aliases for spaces in the command file, making it easier to pass compiler commands through a shell\&. Although it is possible to pass arguments to \f3-XX:CompileCommand\fR with the same syntax as that used in the command file, you would have to enclose the string argument in quotation marks\&. +For more information about specifying the commands for the JIT compiler to perform on methods, see the \f3-XX:CompileCommand\fR option\&. .TP -XX:CompileOnly=\fImethods\fR .br @@ -1062,6 +1082,34 @@ .fi .sp + +Note that the full class name is specified, including all packages and subpackages separated by a slash (\f3/\fR)\&. For easier cut and paste operations, it is also possible to use the method name format produced by the \f3-XX:+PrintCompilation\fR and \f3-XX:+LogCompilation\fR options: +.sp +.nf +\f3\-XX:CompileOnly=java\&.lang\&.String::length,java\&.util\&.List::size\fP +.fi +.nf +\f3\fP +.fi +.sp + + +Although wildcards are not supported, you can specify only the class or package name to compile all methods in that class or package, as well as specify just the method to compile methods with this name in any class: +.sp +.nf +\f3\-XX:CompileOnly=java/lang/String\fP +.fi +.nf +\f3\-XX:CompileOnly=java/lang\fP +.fi +.nf +\f3\-XX:CompileOnly=\&.length\fP +.fi +.nf +\f3\fP +.fi +.sp + .TP -XX:CompileThreshold=\fIinvocations\fR .br
--- a/src/linux/doc/man/jarsigner.1 Mon Dec 23 14:05:20 2013 -0500 +++ b/src/linux/doc/man/jarsigner.1 Wed Dec 25 10:34:40 2013 -0800 @@ -308,11 +308,7 @@ .nf \f3KEVIN\&.DSA\fP .fi -.nf -\f3\fR -.fi .sp -\fINote:\fR It is also possible for a JAR file to have mixed signatures, some generated by the JDK 1\&.1 by the \f3javakey\fR command and others by \f3jarsigner\fR\&. The \f3jarsigner\fR command can be used to sign JAR files that are already signed with the \f3javakey\fR command\&. .SH OPTIONS The following sections describe the various \f3jarsigner\fR options\&. Be aware of the following standards: .TP 0.2i @@ -443,7 +439,7 @@ .br If the \f3-certs\fR option appears on the command line with the \f3-verify\fR and \f3-verbose\fR options, then the output includes certificate information for each signer of the JAR file\&. This information includes the name of the type of certificate (stored in the \f3\&.DSA\fR file) that certifies the signer\&'s public key, and if the certificate is an X\&.509 certificate (an instance of the \f3java\&.security\&.cert\&.X509Certificate\fR), then the distinguished name of the signer\&. -The keystore is also examined\&. If no keystore value is specified on the command line, then the default keystore file (if any) is checked\&. If the public key certificate for a signer matches an entry in the keystore, then the alias name for the keystore entry for that signer is displayed in parentheses\&. If the signer comes from a JDK 1\&.1 identity database instead of from a keystore, then the alias name displays in brackets instead of parentheses\&. +The keystore is also examined\&. If no keystore value is specified on the command line, then the default keystore file (if any) is checked\&. If the public key certificate for a signer matches an entry in the keystore, then the alias name for the keystore entry for that signer is displayed in parentheses\&. .TP -certchain \fIfile\fR .br @@ -797,178 +793,6 @@ .fi .sp If the certificate for a signer is not an X\&.509 certificate, then there is no distinguished name information\&. In that case, just the certificate type and the alias are shown\&. For example, if the certificate is a PGP certificate, and the alias is \f3bob\fR, then you would get: \f3PGP, (bob)\fR\&. -.SS VERIFICATION\ THAT\ INCLUDES\ IDENTITY\ DATABASE\ SIGNERS -If a JAR file was signed with the JDK 1\&.1 \f3javakey\fR tool, and the signer is an alias in an identity database, then the verification output includes an \f3i\fR\&. If the JAR file was signed by both an alias in an identity database and an alias in a keystore, then both \f3k\fR and \f3i\fR appear\&. -.PP -When the \f3-certs\fR option is used, any identity database aliases are shown in brackets rather than the parentheses used for keystore aliases, for example: -.sp -.nf -\f3 jarsigner \-keystore /working/mystore \-verify \-verbose \-certs writeFile\&.jar\fP -.fi -.nf -\f3\fR -.fi -.nf -\f3 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST\&.MF\fP -.fi -.nf -\f3 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.SF\fP -.fi -.nf -\f3 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.DSA\fP -.fi -.nf -\f3 199 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE\&.SF\fP -.fi -.nf -\f3 1013 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE\&.DSA\fP -.fi -.nf -\f3 smki 2752 Fri Sep 26 16:12:30 PDT 1997 writeFile\&.html\fP -.fi -.nf -\f3\fR -.fi -.nf -\f3 X\&.509, CN=Jane Smith, OU=Java Software, O=Oracle, L=cup, S=ca, C=us (jane)\fP -.fi -.nf -\f3 X\&.509, CN=Duke, OU=Java Software, O=Oracle, L=cup, S=ca, C=us [duke]\fP -.fi -.nf -\f3\fR -.fi -.nf -\f3 s = signature was verified\fP -.fi -.nf -\f3 m = entry is listed in manifest\fP -.fi -.nf -\f3 k = at least one certificate was found in keystore\fP -.fi -.nf -\f3 i = at least one certificate was found in identity scope\fP -.fi -.nf -\f3\fR -.fi -.nf -\f3 jar verified\&.\fP -.fi -.nf -\f3\fR -.fi -.sp -\fINote:\fR The alias \f3duke\fR is in brackets to denote that it is an identity database alias, and not a keystore alias\&. -.SH JDK\ 1\&.1\ COMPATIBILITY -The \f3keytool\fR and \f3jarsigner\fR tools replace the \f3javakey\fR tool in JDK 1\&.1\&. These new tools provide more features than \f3javakey\fR, including the ability to protect the keystore and private keys with passwords, and the ability to verify signatures in addition to generating them\&. -.PP -The new keystore architecture replaces the identity database that \f3javakey\fR created and managed\&. There is no backward compatibility between the keystore format and the database format used by \f3javakey\fR in JDK 1\&.1\&. However, be aware of the following: -.TP 0.2i -\(bu -It is possible to import the information from an identity database into a keystore through the \f3keytool -identitydb\fR command\&. -.TP 0.2i -\(bu -The \f3jarsigner\fR command can sign JAR files that were signed with the \f3javakey\fR command\&. -.TP 0.2i -\(bu -The \f3jarsigner\fR command can verify JAR files signed with \f3javakey\fR\&. The \f3jarsigner\fR command recognizes and can work with signer aliases that are from a JDK 1\&.1 identity database rather than a JDK keystore\&. -.SS UNSIGNED\ JARS -Unsigned JARs have the default privileges that are granted to all code\&. -.SS SIGNED\ JARS -Signed JARs have the privilege configurations based on their JDK 1\&.1\&.\fIn\fR identity and policy file status as described\&. Only trusted identities can be imported into the JDK keystore\&. -.PP -Default Privileges Granted to All Code - -Identity in 1\&.1 database: \fINo\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR -.br -Policy file grants privileges to identity/alias: \fINo\fR -.PP - -.PP -Identity in 1\&.1 database: \fINo\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR -.br -Policy file grants privileges to identity/alias: \fINo\fR -.PP - -.PP -Identity in 1\&.1 database: Yes/Untrusted -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR -.br -Policy file grants privileges to identity/alias: \fINo\fR -.br -See 3 in Notes Regarding Privileges of Signed JARs\&. -.PP - -.PP -Identity in 1\&.1 database: Yes/Untrusted -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR -.br -Policy file grants privileges to identity/alias: \fIYes\fR -.br -See 1 and 3 in Notes Regarding Privileges of Signed JARs\&. -.PP -Default Privileges and Policy File Privileges Granted - -Identity in 1\&.1 database: \fINo\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR -.br -Policy file grants privileges to identity/alias: \fIYes\fR -.PP - -.PP -Identity in 1\&.1 database: \fIYes/Trusted\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR -.br -Policy file grants privileges to identity/alias: \fIYes\fR -.br -See 2 in Notes Regarding Privileges of Signed JARs\&. -.PP -All Privileges Granted - -Identity in 1\&.1 database: \fIYes/Trusted\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR -.br -Policy file grants privileges to identity/alias: \fINo\fR -.PP - -.PP -Identity in 1\&.1 database: \fIYes/Trusted\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR -.br -Policy file grants privileges to identity/alias: \fINo\fR -.br -See 1 in Notes Regarding Privileges of Signed JARs\&. -.PP -Identity in 1\&.1 database: \fIYes/Trusted\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR -.br -Policy file grants privileges to identity/alias: \fIYes\fR -.br -See 1 in Notes Regarding Privileges of Signed JARs\&. -.PP -Notes Regarding Privileges of Signed JARs -.TP 0.4i -1\&. -If an identity or alias is mentioned in the policy file, then it must be imported into the keystore for the policy file to have any effect on privileges granted\&. -.TP 0.4i -2\&. -The policy file/keystore combination has precedence over a trusted identity in the identity database\&. -.TP 0.4i -3\&. -Untrusted identities are ignored in the Java platform\&. .SH SEE\ ALSO .TP 0.2i \(bu
--- a/src/linux/doc/man/java.1 Mon Dec 23 14:05:20 2013 -0500 +++ b/src/linux/doc/man/java.1 Wed Dec 25 10:34:40 2013 -0800 @@ -373,7 +373,7 @@ .TP -Xcomp .br -Disables interpretation of Java code and compile methods on first invocation\&. By default, the JIT compiler performs 10,000 interpreted method invocations to gather information for efficient compilation\&. To increase compilation performance at the expense of efficiency, use the \f3-Xcomp\fR flag to disable interpreted method invocations\&. +Forces compilation of methods on first invocation\&. By default, the Client VM (\f3-client\fR) performs 1,000 interpreted method invocations and the Server VM (\f3-server\fR) performs 10,000 interpreted method invocations to gather information for efficient compilation\&. Specifying the \f3-Xcomp\fR option disables interpreted method invocations to increase compilation performance at the expense of efficiency\&. You can also change the number of interpreted method invocations before compilation using the \f3-XX:CompileThreshold\fR option\&. .TP @@ -937,11 +937,9 @@ .sp .TP -.nf --XX:CompileCommand=\fIcommand\fR,\fIclass\fR\&.\fImethod\fR[,\fIoption\fR] +-XX:CompileCommand=\fIcommand\fR,\fImethod\fR[,\fIoption\fR] .br -.fi -Attaches a line to the \f3\&.hotspot_compiler\fR file with the command for the specific method of the class\&. For example, to exclude the \f3indexOf()\fR method of the \f3String\fR class from being compiled, use the following: +Specifies a command to perform on a method\&. For example, to exclude the \f3indexOf()\fR method of the \f3String\fR class from being compiled, use the following: .sp .nf \f3\-XX:CompileCommand=exclude,java/lang/String\&.indexOf\fP @@ -952,9 +950,40 @@ .sp -Note that you must specify the full class name, including all packages and subpackages separated by a slash (\f3/\fR)\&. +Note that the full class name is specified, including all packages and subpackages separated by a slash (\f3/\fR)\&. For easier cut and paste operations, it is also possible to use the method name format produced by the \f3-XX:+PrintCompilation\fR and \f3-XX:+LogCompilation\fR options: +.sp +.nf +\f3\-XX:CompileCommand=exclude,java\&.lang\&.String::indexOf\fP +.fi +.nf +\f3\fP +.fi +.sp + -To add several commands, either specify this option multiple times, or separate each argument with the newline separator (\f3\en\fR)\&. To better understand the syntax of the JVM compiler commands, refer to the description of the \f3-XX:CompileCommandFile\fR option, which enables you to specify the file from which to read compiler commands\&. Notice how the syntax of the command file differs rom the syntax of the argument for the \f3-XX:CompileCommand\fR option\&. The commas and periods in the argument are aliases for spaces in the command file, making it easier to pass compiler commands through a shell\&. To pass arguments to \f3-XX:CompileCommand\fR with the same syntax as that used in the command file, you can enclose the argument in quotation marks: +If the method is specified without the signature, the command will be applied to all methods with the specified name\&. However, you can also specify the signature of the method in the class file format\&. In this case, you should enclose the arguments in quotation marks, because otherwise the shell treats the semicolon as command end\&. For example, if you want to exclude only the \f3indexOf(String)\fR method of the \f3String\fR class from being compiled, use the following: +.sp +.nf +\f3\-XX:CompileCommand="exclude,java/lang/String\&.indexOf,(Ljava/lang/String;)I"\fP +.fi +.nf +\f3\fP +.fi +.sp + + +You can also use the asterisk (*) as a wildcard for class and method names\&. For example, to exclude all \f3indexOf()\fR methods in all classes from being compiled, use the following: +.sp +.nf +\f3\-XX:CompileCommand=exclude,*\&.indexOf\fP +.fi +.nf +\f3\fP +.fi +.sp + + +The commas and periods are aliases for spaces, making it easier to pass compiler commands through a shell\&. You can pass arguments to \f3-XX:CompileCommand\fR using spaces as separators by enclosing the argument in quotation marks: .sp .nf \f3\-XX:CompileCommand="exclude java/lang/String indexOf"\fP @@ -965,25 +994,16 @@ .sp -For easier cut and paste operations, it is also possible to use the method name format produced by the \f3-XX:+PrintCompilation\fR and \f3-XX:+LogCompilation\fR options: -.sp -.nf -\f3\-XX:CompileCommand="exclude java\&.lang\&.String::indexOf"\fP -.fi -.nf -\f3\fP -.fi -.sp +Note that after parsing the commands passed on the command line using the \f3-XX:CompileCommand\fR options, the JIT compiler then reads commands from the \f3\&.hotspot_compiler\fR file\&. You can add commands to this file or specify a different file using the \f3-XX:CompileCommandFile\fR option\&. - -The following commands are available: +To add several commands, either specify the \f3-XX:CompileCommand\fR option multiple times, or separate each argument with the newline separator (\f3\en\fR)\&. The following commands are available: .RS .TP break Set a breakpoint when debugging the JVM to stop at the beginning of compilation of the specified method\&. .TP compileonly -Exclude all methods from compilation except for the specified method\&. +Exclude all methods from compilation except for the specified method\&. As an alternative, you can use the \f3-XX:CompileOnly\fR option, which allows to specify several methods\&. .TP dontinline Prevent inlining of the specified method\&. @@ -1000,6 +1020,20 @@ log Exclude compilation logging (with the \f3-XX:+LogCompilation\fR option) for all methods except for the specified method\&. By default, logging is performed for all compiled methods\&. .TP +option +This command can be used to pass a JIT compilation option to the specified method in place of the last argument (\fIoption\fR)\&. The compilation option is set at the end, after the method name\&. For example, to enable the \f3BlockLayoutByFrequency\fR option for the \f3append()\fR method of the \f3StringBuffer\fR class, use the following: +.sp +.nf +\f3\-XX:CompileCommand=option,java/lang/StringBuffer\&.append,BlockLayoutByFrequency\fP +.fi +.nf +\f3\fP +.fi +.sp + + +You can specify multiple compilation options, separated by commas or spaces\&. +.TP print Print generated assembler code after compilation of the specified method\&. .TP @@ -1018,26 +1052,12 @@ You can suppress this by specifying the \f3-XX:CompileCommand=quiet\fR option before other \f3-XX:CompileCommand\fR options\&. .RE - -.RS -The optional last argument (\fIoption\fR) can be used to pass a JIT compilation option to the specified method\&. The compilation option is set at the end, after the method name\&. For example, to enable the \f3BlockLayoutByFrequency\fR option for the \f3append()\fR method of the \f3StringBuffer\fR class, use the following: -.sp -.nf -\f3\-XX:CompileCommand=option,java/lang/StringBuffer\&.append,BlockLayoutByFrequency\fP -.fi -.nf -\f3\fP -.fi -.sp - - -.RE .TP -XX:CompileCommandFile=\fIfilename\fR .br -Sets the file from which compiler commands are read\&. By default, the \f3\&.hotspot_compiler\fR file is used to store commands performed by the JVM compiler\&. +Sets the file from which JIT compiler commands are read\&. By default, the \f3\&.hotspot_compiler\fR file is used to store commands performed by the JIT compiler\&. -Each line in the command file represents a command, a class name, and a method name for which the command is used (all three parts are separated by spaces)\&. For example, this line prints assembly code for the \f3toString()\fR method of the \f3String\fR class: +Each line in the command file represents a command, a class name, and a method name for which the command is used\&. For example, this line prints assembly code for the \f3toString()\fR method of the \f3String\fR class: .sp .nf \f3print java/lang/String toString\fP @@ -1048,7 +1068,7 @@ .sp -To add commands to the beginning of the \f3\&.hotspot_compiler\fR file, use the \f3-XX:CompileCommand\fR option\&. Note how the syntax of the command file is different from the syntax of the argument for the \f3-XX:CompileCommand\fR option\&. The commas and periods in the argument are aliases for spaces in the command file, making it easier to pass compiler commands through a shell\&. Although it is possible to pass arguments to \f3-XX:CompileCommand\fR with the same syntax as that used in the command file, you would have to enclose the string argument in quotation marks\&. +For more information about specifying the commands for the JIT compiler to perform on methods, see the \f3-XX:CompileCommand\fR option\&. .TP -XX:CompileOnly=\fImethods\fR .br @@ -1062,6 +1082,34 @@ .fi .sp + +Note that the full class name is specified, including all packages and subpackages separated by a slash (\f3/\fR)\&. For easier cut and paste operations, it is also possible to use the method name format produced by the \f3-XX:+PrintCompilation\fR and \f3-XX:+LogCompilation\fR options: +.sp +.nf +\f3\-XX:CompileOnly=java\&.lang\&.String::length,java\&.util\&.List::size\fP +.fi +.nf +\f3\fP +.fi +.sp + + +Although wildcards are not supported, you can specify only the class or package name to compile all methods in that class or package, as well as specify just the method to compile methods with this name in any class: +.sp +.nf +\f3\-XX:CompileOnly=java/lang/String\fP +.fi +.nf +\f3\-XX:CompileOnly=java/lang\fP +.fi +.nf +\f3\-XX:CompileOnly=\&.length\fP +.fi +.nf +\f3\fP +.fi +.sp + .TP -XX:CompileThreshold=\fIinvocations\fR .br
--- a/src/share/classes/sun/awt/datatransfer/DataTransferer.java Mon Dec 23 14:05:20 2013 -0500 +++ b/src/share/classes/sun/awt/datatransfer/DataTransferer.java Wed Dec 25 10:34:40 2013 -0800 @@ -1598,6 +1598,30 @@ // Turn the list of Files into a List and return theObject = Arrays.asList(files); + // Source data is a URI list. Convert to DataFlavor.javaFileListFlavor + // where possible. + } else if (isURIListFormat(format) + && DataFlavor.javaFileListFlavor.equals(flavor)) { + + try (ByteArrayInputStream str = new ByteArrayInputStream(bytes)) { + + URI uris[] = dragQueryURIs(str, format, localeTransferable); + if (uris == null) { + return null; + } + List<File> files = new ArrayList<>(); + for (URI uri : uris) { + try { + files.add(new File(uri)); + } catch (IllegalArgumentException illegalArg) { + // When converting from URIs to less generic files, + // common practice (Wine, SWT) seems to be to + // silently drop the URIs that aren't local files. + } + } + theObject = files; + } + // Target data is a String. Strip terminating NUL bytes. Decode bytes // into characters. Search-and-replace EOLN. } else if (String.class.equals(flavor.getRepresentationClass()) &&
--- a/src/solaris/classes/sun/awt/X11/XDataTransferer.java Mon Dec 23 14:05:20 2013 -0500 +++ b/src/solaris/classes/sun/awt/X11/XDataTransferer.java Wed Dec 25 10:34:40 2013 -0800 @@ -242,6 +242,7 @@ } } + @Override protected String[] dragQueryFile(byte[] bytes) { XToolkit.awtLock(); try { @@ -252,8 +253,8 @@ } } + @Override protected URI[] dragQueryURIs(InputStream stream, - byte[] bytes, long format, Transferable localeTransferable) throws IOException {
--- a/src/solaris/classes/sun/awt/X11/XDesktopPeer.java Mon Dec 23 14:05:20 2013 -0500 +++ b/src/solaris/classes/sun/awt/X11/XDesktopPeer.java Wed Dec 25 10:34:40 2013 -0800 @@ -33,6 +33,9 @@ import java.awt.Desktop.Action; import java.awt.peer.DesktopPeer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; /** @@ -43,6 +46,10 @@ */ public class XDesktopPeer implements DesktopPeer { + // supportedActions may be changed from native within an init() call + private static final List<Action> supportedActions + = new ArrayList<>(Arrays.asList(Action.OPEN, Action.MAIL, Action.BROWSE)); + private static boolean nativeLibraryLoaded = false; private static boolean initExecuted = false; @@ -65,11 +72,11 @@ static boolean isDesktopSupported() { initWithLock(); - return nativeLibraryLoaded; + return nativeLibraryLoaded && !supportedActions.isEmpty(); } public boolean isSupported(Action type) { - return type != Action.PRINT && type != Action.EDIT; + return supportedActions.contains(type); } public void open(File file) throws IOException {
--- a/src/solaris/classes/sun/awt/X11/XWindow.java Mon Dec 23 14:05:20 2013 -0500 +++ b/src/solaris/classes/sun/awt/X11/XWindow.java Wed Dec 25 10:34:40 2013 -0800 @@ -456,6 +456,7 @@ ColorModel cm = getColorModel(); int pixel = PixelConverter.instance.rgbToPixel(c.getRGB(), cm); XlibWrapper.XSetWindowBackground(XToolkit.getDisplay(), getContentWindow(), pixel); + XlibWrapper.XClearWindow(XToolkit.getDisplay(), getContentWindow()); } finally { XToolkit.awtUnlock();
--- a/src/solaris/doc/sun/man/man1/jarsigner.1 Mon Dec 23 14:05:20 2013 -0500 +++ b/src/solaris/doc/sun/man/man1/jarsigner.1 Wed Dec 25 10:34:40 2013 -0800 @@ -308,11 +308,7 @@ .nf \f3KEVIN\&.DSA\fP .fi -.nf -\f3\fR -.fi .sp -\fINote:\fR It is also possible for a JAR file to have mixed signatures, some generated by the JDK 1\&.1 by the \f3javakey\fR command and others by \f3jarsigner\fR\&. The \f3jarsigner\fR command can be used to sign JAR files that are already signed with the \f3javakey\fR command\&. .SH OPTIONS The following sections describe the various \f3jarsigner\fR options\&. Be aware of the following standards: .TP 0.2i @@ -443,7 +439,7 @@ .br If the \f3-certs\fR option appears on the command line with the \f3-verify\fR and \f3-verbose\fR options, then the output includes certificate information for each signer of the JAR file\&. This information includes the name of the type of certificate (stored in the \f3\&.DSA\fR file) that certifies the signer\&'s public key, and if the certificate is an X\&.509 certificate (an instance of the \f3java\&.security\&.cert\&.X509Certificate\fR), then the distinguished name of the signer\&. -The keystore is also examined\&. If no keystore value is specified on the command line, then the default keystore file (if any) is checked\&. If the public key certificate for a signer matches an entry in the keystore, then the alias name for the keystore entry for that signer is displayed in parentheses\&. If the signer comes from a JDK 1\&.1 identity database instead of from a keystore, then the alias name displays in brackets instead of parentheses\&. +The keystore is also examined\&. If no keystore value is specified on the command line, then the default keystore file (if any) is checked\&. If the public key certificate for a signer matches an entry in the keystore, then the alias name for the keystore entry for that signer is displayed in parentheses\&. .TP -certchain \fIfile\fR .br @@ -797,178 +793,6 @@ .fi .sp If the certificate for a signer is not an X\&.509 certificate, then there is no distinguished name information\&. In that case, just the certificate type and the alias are shown\&. For example, if the certificate is a PGP certificate, and the alias is \f3bob\fR, then you would get: \f3PGP, (bob)\fR\&. -.SS VERIFICATION\ THAT\ INCLUDES\ IDENTITY\ DATABASE\ SIGNERS -If a JAR file was signed with the JDK 1\&.1 \f3javakey\fR tool, and the signer is an alias in an identity database, then the verification output includes an \f3i\fR\&. If the JAR file was signed by both an alias in an identity database and an alias in a keystore, then both \f3k\fR and \f3i\fR appear\&. -.PP -When the \f3-certs\fR option is used, any identity database aliases are shown in brackets rather than the parentheses used for keystore aliases, for example: -.sp -.nf -\f3 jarsigner \-keystore /working/mystore \-verify \-verbose \-certs writeFile\&.jar\fP -.fi -.nf -\f3\fR -.fi -.nf -\f3 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST\&.MF\fP -.fi -.nf -\f3 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.SF\fP -.fi -.nf -\f3 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.DSA\fP -.fi -.nf -\f3 199 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE\&.SF\fP -.fi -.nf -\f3 1013 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE\&.DSA\fP -.fi -.nf -\f3 smki 2752 Fri Sep 26 16:12:30 PDT 1997 writeFile\&.html\fP -.fi -.nf -\f3\fR -.fi -.nf -\f3 X\&.509, CN=Jane Smith, OU=Java Software, O=Oracle, L=cup, S=ca, C=us (jane)\fP -.fi -.nf -\f3 X\&.509, CN=Duke, OU=Java Software, O=Oracle, L=cup, S=ca, C=us [duke]\fP -.fi -.nf -\f3\fR -.fi -.nf -\f3 s = signature was verified\fP -.fi -.nf -\f3 m = entry is listed in manifest\fP -.fi -.nf -\f3 k = at least one certificate was found in keystore\fP -.fi -.nf -\f3 i = at least one certificate was found in identity scope\fP -.fi -.nf -\f3\fR -.fi -.nf -\f3 jar verified\&.\fP -.fi -.nf -\f3\fR -.fi -.sp -\fINote:\fR The alias \f3duke\fR is in brackets to denote that it is an identity database alias, and not a keystore alias\&. -.SH JDK\ 1\&.1\ COMPATIBILITY -The \f3keytool\fR and \f3jarsigner\fR tools replace the \f3javakey\fR tool in JDK 1\&.1\&. These new tools provide more features than \f3javakey\fR, including the ability to protect the keystore and private keys with passwords, and the ability to verify signatures in addition to generating them\&. -.PP -The new keystore architecture replaces the identity database that \f3javakey\fR created and managed\&. There is no backward compatibility between the keystore format and the database format used by \f3javakey\fR in JDK 1\&.1\&. However, be aware of the following: -.TP 0.2i -\(bu -It is possible to import the information from an identity database into a keystore through the \f3keytool -identitydb\fR command\&. -.TP 0.2i -\(bu -The \f3jarsigner\fR command can sign JAR files that were signed with the \f3javakey\fR command\&. -.TP 0.2i -\(bu -The \f3jarsigner\fR command can verify JAR files signed with \f3javakey\fR\&. The \f3jarsigner\fR command recognizes and can work with signer aliases that are from a JDK 1\&.1 identity database rather than a JDK keystore\&. -.SS UNSIGNED\ JARS -Unsigned JARs have the default privileges that are granted to all code\&. -.SS SIGNED\ JARS -Signed JARs have the privilege configurations based on their JDK 1\&.1\&.\fIn\fR identity and policy file status as described\&. Only trusted identities can be imported into the JDK keystore\&. -.PP -Default Privileges Granted to All Code - -Identity in 1\&.1 database: \fINo\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR -.br -Policy file grants privileges to identity/alias: \fINo\fR -.PP - -.PP -Identity in 1\&.1 database: \fINo\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR -.br -Policy file grants privileges to identity/alias: \fINo\fR -.PP - -.PP -Identity in 1\&.1 database: Yes/Untrusted -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR -.br -Policy file grants privileges to identity/alias: \fINo\fR -.br -See 3 in Notes Regarding Privileges of Signed JARs\&. -.PP - -.PP -Identity in 1\&.1 database: Yes/Untrusted -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR -.br -Policy file grants privileges to identity/alias: \fIYes\fR -.br -See 1 and 3 in Notes Regarding Privileges of Signed JARs\&. -.PP -Default Privileges and Policy File Privileges Granted - -Identity in 1\&.1 database: \fINo\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR -.br -Policy file grants privileges to identity/alias: \fIYes\fR -.PP - -.PP -Identity in 1\&.1 database: \fIYes/Trusted\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR -.br -Policy file grants privileges to identity/alias: \fIYes\fR -.br -See 2 in Notes Regarding Privileges of Signed JARs\&. -.PP -All Privileges Granted - -Identity in 1\&.1 database: \fIYes/Trusted\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR -.br -Policy file grants privileges to identity/alias: \fINo\fR -.PP - -.PP -Identity in 1\&.1 database: \fIYes/Trusted\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR -.br -Policy file grants privileges to identity/alias: \fINo\fR -.br -See 1 in Notes Regarding Privileges of Signed JARs\&. -.PP -Identity in 1\&.1 database: \fIYes/Trusted\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR -.br -Policy file grants privileges to identity/alias: \fIYes\fR -.br -See 1 in Notes Regarding Privileges of Signed JARs\&. -.PP -Notes Regarding Privileges of Signed JARs -.TP 0.4i -1\&. -If an identity or alias is mentioned in the policy file, then it must be imported into the keystore for the policy file to have any effect on privileges granted\&. -.TP 0.4i -2\&. -The policy file/keystore combination has precedence over a trusted identity in the identity database\&. -.TP 0.4i -3\&. -Untrusted identities are ignored in the Java platform\&. .SH SEE\ ALSO .TP 0.2i \(bu
--- a/src/solaris/doc/sun/man/man1/java.1 Mon Dec 23 14:05:20 2013 -0500 +++ b/src/solaris/doc/sun/man/man1/java.1 Wed Dec 25 10:34:40 2013 -0800 @@ -373,7 +373,7 @@ .TP -Xcomp .br -Disables interpretation of Java code and compile methods on first invocation\&. By default, the JIT compiler performs 10,000 interpreted method invocations to gather information for efficient compilation\&. To increase compilation performance at the expense of efficiency, use the \f3-Xcomp\fR flag to disable interpreted method invocations\&. +Forces compilation of methods on first invocation\&. By default, the Client VM (\f3-client\fR) performs 1,000 interpreted method invocations and the Server VM (\f3-server\fR) performs 10,000 interpreted method invocations to gather information for efficient compilation\&. Specifying the \f3-Xcomp\fR option disables interpreted method invocations to increase compilation performance at the expense of efficiency\&. You can also change the number of interpreted method invocations before compilation using the \f3-XX:CompileThreshold\fR option\&. .TP @@ -937,11 +937,9 @@ .sp .TP -.nf --XX:CompileCommand=\fIcommand\fR,\fIclass\fR\&.\fImethod\fR[,\fIoption\fR] +-XX:CompileCommand=\fIcommand\fR,\fImethod\fR[,\fIoption\fR] .br -.fi -Attaches a line to the \f3\&.hotspot_compiler\fR file with the command for the specific method of the class\&. For example, to exclude the \f3indexOf()\fR method of the \f3String\fR class from being compiled, use the following: +Specifies a command to perform on a method\&. For example, to exclude the \f3indexOf()\fR method of the \f3String\fR class from being compiled, use the following: .sp .nf \f3\-XX:CompileCommand=exclude,java/lang/String\&.indexOf\fP @@ -952,9 +950,40 @@ .sp -Note that you must specify the full class name, including all packages and subpackages separated by a slash (\f3/\fR)\&. +Note that the full class name is specified, including all packages and subpackages separated by a slash (\f3/\fR)\&. For easier cut and paste operations, it is also possible to use the method name format produced by the \f3-XX:+PrintCompilation\fR and \f3-XX:+LogCompilation\fR options: +.sp +.nf +\f3\-XX:CompileCommand=exclude,java\&.lang\&.String::indexOf\fP +.fi +.nf +\f3\fP +.fi +.sp + -To add several commands, either specify this option multiple times, or separate each argument with the newline separator (\f3\en\fR)\&. To better understand the syntax of the JVM compiler commands, refer to the description of the \f3-XX:CompileCommandFile\fR option, which enables you to specify the file from which to read compiler commands\&. Notice how the syntax of the command file differs rom the syntax of the argument for the \f3-XX:CompileCommand\fR option\&. The commas and periods in the argument are aliases for spaces in the command file, making it easier to pass compiler commands through a shell\&. To pass arguments to \f3-XX:CompileCommand\fR with the same syntax as that used in the command file, you can enclose the argument in quotation marks: +If the method is specified without the signature, the command will be applied to all methods with the specified name\&. However, you can also specify the signature of the method in the class file format\&. In this case, you should enclose the arguments in quotation marks, because otherwise the shell treats the semicolon as command end\&. For example, if you want to exclude only the \f3indexOf(String)\fR method of the \f3String\fR class from being compiled, use the following: +.sp +.nf +\f3\-XX:CompileCommand="exclude,java/lang/String\&.indexOf,(Ljava/lang/String;)I"\fP +.fi +.nf +\f3\fP +.fi +.sp + + +You can also use the asterisk (*) as a wildcard for class and method names\&. For example, to exclude all \f3indexOf()\fR methods in all classes from being compiled, use the following: +.sp +.nf +\f3\-XX:CompileCommand=exclude,*\&.indexOf\fP +.fi +.nf +\f3\fP +.fi +.sp + + +The commas and periods are aliases for spaces, making it easier to pass compiler commands through a shell\&. You can pass arguments to \f3-XX:CompileCommand\fR using spaces as separators by enclosing the argument in quotation marks: .sp .nf \f3\-XX:CompileCommand="exclude java/lang/String indexOf"\fP @@ -965,25 +994,16 @@ .sp -For easier cut and paste operations, it is also possible to use the method name format produced by the \f3-XX:+PrintCompilation\fR and \f3-XX:+LogCompilation\fR options: -.sp -.nf -\f3\-XX:CompileCommand="exclude java\&.lang\&.String::indexOf"\fP -.fi -.nf -\f3\fP -.fi -.sp +Note that after parsing the commands passed on the command line using the \f3-XX:CompileCommand\fR options, the JIT compiler then reads commands from the \f3\&.hotspot_compiler\fR file\&. You can add commands to this file or specify a different file using the \f3-XX:CompileCommandFile\fR option\&. - -The following commands are available: +To add several commands, either specify the \f3-XX:CompileCommand\fR option multiple times, or separate each argument with the newline separator (\f3\en\fR)\&. The following commands are available: .RS .TP break Set a breakpoint when debugging the JVM to stop at the beginning of compilation of the specified method\&. .TP compileonly -Exclude all methods from compilation except for the specified method\&. +Exclude all methods from compilation except for the specified method\&. As an alternative, you can use the \f3-XX:CompileOnly\fR option, which allows to specify several methods\&. .TP dontinline Prevent inlining of the specified method\&. @@ -1000,6 +1020,20 @@ log Exclude compilation logging (with the \f3-XX:+LogCompilation\fR option) for all methods except for the specified method\&. By default, logging is performed for all compiled methods\&. .TP +option +This command can be used to pass a JIT compilation option to the specified method in place of the last argument (\fIoption\fR)\&. The compilation option is set at the end, after the method name\&. For example, to enable the \f3BlockLayoutByFrequency\fR option for the \f3append()\fR method of the \f3StringBuffer\fR class, use the following: +.sp +.nf +\f3\-XX:CompileCommand=option,java/lang/StringBuffer\&.append,BlockLayoutByFrequency\fP +.fi +.nf +\f3\fP +.fi +.sp + + +You can specify multiple compilation options, separated by commas or spaces\&. +.TP print Print generated assembler code after compilation of the specified method\&. .TP @@ -1018,26 +1052,12 @@ You can suppress this by specifying the \f3-XX:CompileCommand=quiet\fR option before other \f3-XX:CompileCommand\fR options\&. .RE - -.RS -The optional last argument (\fIoption\fR) can be used to pass a JIT compilation option to the specified method\&. The compilation option is set at the end, after the method name\&. For example, to enable the \f3BlockLayoutByFrequency\fR option for the \f3append()\fR method of the \f3StringBuffer\fR class, use the following: -.sp -.nf -\f3\-XX:CompileCommand=option,java/lang/StringBuffer\&.append,BlockLayoutByFrequency\fP -.fi -.nf -\f3\fP -.fi -.sp - - -.RE .TP -XX:CompileCommandFile=\fIfilename\fR .br -Sets the file from which compiler commands are read\&. By default, the \f3\&.hotspot_compiler\fR file is used to store commands performed by the JVM compiler\&. +Sets the file from which JIT compiler commands are read\&. By default, the \f3\&.hotspot_compiler\fR file is used to store commands performed by the JIT compiler\&. -Each line in the command file represents a command, a class name, and a method name for which the command is used (all three parts are separated by spaces)\&. For example, this line prints assembly code for the \f3toString()\fR method of the \f3String\fR class: +Each line in the command file represents a command, a class name, and a method name for which the command is used\&. For example, this line prints assembly code for the \f3toString()\fR method of the \f3String\fR class: .sp .nf \f3print java/lang/String toString\fP @@ -1048,7 +1068,7 @@ .sp -To add commands to the beginning of the \f3\&.hotspot_compiler\fR file, use the \f3-XX:CompileCommand\fR option\&. Note how the syntax of the command file is different from the syntax of the argument for the \f3-XX:CompileCommand\fR option\&. The commas and periods in the argument are aliases for spaces in the command file, making it easier to pass compiler commands through a shell\&. Although it is possible to pass arguments to \f3-XX:CompileCommand\fR with the same syntax as that used in the command file, you would have to enclose the string argument in quotation marks\&. +For more information about specifying the commands for the JIT compiler to perform on methods, see the \f3-XX:CompileCommand\fR option\&. .TP -XX:CompileOnly=\fImethods\fR .br @@ -1062,6 +1082,34 @@ .fi .sp + +Note that the full class name is specified, including all packages and subpackages separated by a slash (\f3/\fR)\&. For easier cut and paste operations, it is also possible to use the method name format produced by the \f3-XX:+PrintCompilation\fR and \f3-XX:+LogCompilation\fR options: +.sp +.nf +\f3\-XX:CompileOnly=java\&.lang\&.String::length,java\&.util\&.List::size\fP +.fi +.nf +\f3\fP +.fi +.sp + + +Although wildcards are not supported, you can specify only the class or package name to compile all methods in that class or package, as well as specify just the method to compile methods with this name in any class: +.sp +.nf +\f3\-XX:CompileOnly=java/lang/String\fP +.fi +.nf +\f3\-XX:CompileOnly=java/lang\fP +.fi +.nf +\f3\-XX:CompileOnly=\&.length\fP +.fi +.nf +\f3\fP +.fi +.sp + .TP -XX:CompileThreshold=\fIinvocations\fR .br
--- a/src/solaris/native/sun/awt/gtk2_interface.c Mon Dec 23 14:05:20 2013 -0500 +++ b/src/solaris/native/sun/awt/gtk2_interface.c Wed Dec 25 10:34:40 2013 -0800 @@ -438,10 +438,76 @@ } } +#define ADD_SUPPORTED_ACTION(actionStr) \ +do { \ + jfieldID fld_action = (*env)->GetStaticFieldID(env, cls_action, actionStr, "Ljava/awt/Desktop$Action;"); \ + if (!(*env)->ExceptionCheck(env)) { \ + jobject action = (*env)->GetStaticObjectField(env, cls_action, fld_action); \ + (*env)->CallBooleanMethod(env, supportedActions, mid_arrayListAdd, action); \ + } else { \ + (*env)->ExceptionClear(env); \ + } \ +} while(0); + + +void update_supported_actions(JNIEnv *env) { + GVfs * (*fp_g_vfs_get_default) (void); + const gchar * const * (*fp_g_vfs_get_supported_uri_schemes) (GVfs * vfs); + const gchar * const * schemes = NULL; + + jclass cls_action = (*env)->FindClass(env, "java/awt/Desktop$Action"); + jclass cls_xDesktopPeer = (*env)->FindClass(env, "sun/awt/X11/XDesktopPeer"); + jfieldID fld_supportedActions = (*env)->GetStaticFieldID(env, cls_xDesktopPeer, "supportedActions", "Ljava/util/List;"); + jobject supportedActions = (*env)->GetStaticObjectField(env, cls_xDesktopPeer, fld_supportedActions); + + jclass cls_arrayList = (*env)->FindClass(env, "java/util/ArrayList"); + jmethodID mid_arrayListAdd = (*env)->GetMethodID(env, cls_arrayList, "add", "(Ljava/lang/Object;)Z"); + jmethodID mid_arrayListClear = (*env)->GetMethodID(env, cls_arrayList, "clear", "()V"); + + (*env)->CallVoidMethod(env, supportedActions, mid_arrayListClear); + + ADD_SUPPORTED_ACTION("OPEN"); + + /** + * gtk_show_uri() documentation says: + * + * > you need to install gvfs to get support for uri schemes such as http:// + * > or ftp://, as only local files are handled by GIO itself. + * + * So OPEN action was safely added here. + * However, it looks like Solaris 11 have gvfs support only for 32-bit + * applications only by default. + */ + + fp_g_vfs_get_default = dl_symbol("g_vfs_get_default"); + fp_g_vfs_get_supported_uri_schemes = dl_symbol("g_vfs_get_supported_uri_schemes"); + dlerror(); + + if (fp_g_vfs_get_default && fp_g_vfs_get_supported_uri_schemes) { + GVfs * vfs = fp_g_vfs_get_default(); + schemes = vfs ? fp_g_vfs_get_supported_uri_schemes(vfs) : NULL; + if (schemes) { + int i = 0; + while (schemes[i]) { + if (strcmp(schemes[i], "http") == 0) { + ADD_SUPPORTED_ACTION("BROWSE"); + ADD_SUPPORTED_ACTION("MAIL"); + break; + } + i++; + } + } + } else { +#ifdef INTERNAL_BUILD + fprintf(stderr, "Cannot load g_vfs_get_supported_uri_schemes\n"); +#endif /* INTERNAL_BUILD */ + } + +} /** * Functions for awt_Desktop.c */ -gboolean gtk2_show_uri_load() { +gboolean gtk2_show_uri_load(JNIEnv *env) { gboolean success = FALSE; dlerror(); const char *gtk_version = fp_gtk_check_version(2, 14, 0); @@ -464,9 +530,12 @@ #ifdef INTERNAL_BUILD fprintf(stderr, "dlsym(gtk_show_uri) returned NULL\n"); #endif /* INTERNAL_BUILD */ - } else { - success = TRUE; - } + } else { +#ifdef __solaris__ + update_supported_actions(env); +#endif + success = TRUE; + } } return success; } @@ -533,7 +602,10 @@ } /* GLib */ - fp_glib_check_version = dl_symbol("glib_check_version"); + fp_glib_check_version = dlsym(gtk2_libhandle, "glib_check_version"); + if (!fp_glib_check_version) { + dlerror(); + } fp_g_free = dl_symbol("g_free"); fp_g_object_unref = dl_symbol("g_object_unref"); @@ -709,7 +781,7 @@ /** * GLib thread system */ - if (fp_glib_check_version(2, 20, 0) == NULL) { + if (GLIB_CHECK_VERSION(2, 20, 0)) { fp_g_thread_get_initialized = dl_symbol_gthread("g_thread_get_initialized"); } fp_g_thread_init = dl_symbol_gthread("g_thread_init"); @@ -827,7 +899,7 @@ // We can use g_thread_get_initialized () but it is available only for // GLib >= 2.20. We rely on GThreadHelper for GLib < 2.20. gboolean is_g_thread_get_initialized = FALSE; - if (fp_glib_check_version(2, 20, 0) == NULL) { + if (GLIB_CHECK_VERSION(2, 20, 0)) { is_g_thread_get_initialized = fp_g_thread_get_initialized(); }
--- a/src/solaris/native/sun/awt/gtk2_interface.h Mon Dec 23 14:05:20 2013 -0500 +++ b/src/solaris/native/sun/awt/gtk2_interface.h Wed Dec 25 10:34:40 2013 -0800 @@ -270,6 +270,7 @@ /* We define all structure pointers to be void* */ typedef void GError; typedef void GMainContext; +typedef void GVfs; typedef struct _GSList GSList; struct _GSList @@ -647,10 +648,19 @@ * Returns : * NULL if the GLib library is compatible with the given version, or a string * describing the version mismatch. + * Please note that the glib_check_version() is available since 2.6, + * so you should use GLIB_CHECK_VERSION macro instead. */ gchar* (*fp_glib_check_version)(guint required_major, guint required_minor, guint required_micro); +/** + * Returns : + * TRUE if the GLib library is compatible with the given version + */ +#define GLIB_CHECK_VERSION(major, minor, micro) \ + (fp_glib_check_version && fp_glib_check_version(major, minor, micro) == NULL) + /* * Check whether the gtk2 library is available and meets the minimum * version requirement. If the library is already loaded this method has no @@ -680,7 +690,7 @@ * gtk2_load, so it must be invoked only after a successful gtk2_load * invocation */ -gboolean gtk2_show_uri_load(); +gboolean gtk2_show_uri_load(JNIEnv *env); /* * Unload the gtk2 library. If the library is already unloaded this method has @@ -811,7 +821,7 @@ /** * This function is available for GLIB > 2.20, so it MUST be - * called within (fp_glib_check_version(2, 20, 0) == NULL) check. + * called within GLIB_CHECK_VERSION(2, 20, 0) check. */ gboolean (*fp_g_thread_get_initialized)(void);
--- a/src/solaris/native/sun/xawt/awt_Desktop.c Mon Dec 23 14:05:20 2013 -0500 +++ b/src/solaris/native/sun/xawt/awt_Desktop.c Wed Dec 25 10:34:40 2013 -0800 @@ -42,7 +42,7 @@ return JNI_TRUE; } - if (gtk2_load(env) && gtk2_show_uri_load()) { + if (gtk2_load(env) && gtk2_show_uri_load(env)) { gtk_has_been_loaded = TRUE; return JNI_TRUE; } else if (gnome_load()) {
--- a/src/windows/native/sun/java2d/d3d/D3DBadHardware.h Mon Dec 23 14:05:20 2013 -0500 +++ b/src/windows/native/sun/java2d/d3d/D3DBadHardware.h Wed Dec 25 10:34:40 2013 -0800 @@ -53,27 +53,18 @@ // Intel HD // Clarkdale (Desktop) GMA HD Lines - { 0x8086, 0x0042, D_VERSION(6,14,10,5394), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x0042, D_VERSION(8,15,10,2993), OS_VISTA | OS_WINDOWS7 }, + { 0x8086, 0x0042, NO_VERSION, OS_ALL }, // Arrandale (Mobile) GMA HD Lines - { 0x8086, 0x0046, D_VERSION(6,14,10,5394), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x0046, D_VERSION(8,15,10,2993), OS_VISTA | OS_WINDOWS7 }, + { 0x8086, 0x0046, NO_VERSION, OS_ALL }, // Sandy Bridge HD Graphics 3000/2000 - { 0x8086, 0x0102, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x0102, D_VERSION(9,17,10,3223), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x0106, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x0106, D_VERSION(9,17,10,3223), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x0112, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x0112, D_VERSION(9,17,10,3223), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x0116, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x0116, D_VERSION(9,17,10,3223), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x0122, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x0122, D_VERSION(9,17,10,3223), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x0126, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x0126, D_VERSION(9,17,10,3223), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x010A, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x010A, D_VERSION(9,17,10,3223), OS_VISTA | OS_WINDOWS7 }, + { 0x8086, 0x0102, NO_VERSION, OS_ALL }, + { 0x8086, 0x0106, NO_VERSION, OS_ALL }, + { 0x8086, 0x0112, NO_VERSION, OS_ALL }, + { 0x8086, 0x0116, NO_VERSION, OS_ALL }, + { 0x8086, 0x0122, NO_VERSION, OS_ALL }, + { 0x8086, 0x0126, NO_VERSION, OS_ALL }, + { 0x8086, 0x010A, NO_VERSION, OS_ALL }, // Ivy Bridge { 0x8086, 0x0162, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, @@ -170,33 +161,21 @@ { 0x8086, 0x2A13, NO_VERSION, OS_ALL }, // Eaglelake (Desktop) GMA 4500 Lines - { 0x8086, 0x2E42, D_VERSION(6,14,10,5420), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x2E42, D_VERSION(8,15,10,2869), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x2E43, D_VERSION(6,14,10,5420), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x2E43, D_VERSION(8,15,10,2869), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x2E92, D_VERSION(6,14,10,5420), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x2E92, D_VERSION(8,15,10,2869), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x2E93, D_VERSION(6,14,10,5420), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x2E93, D_VERSION(8,15,10,2869), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x2E12, D_VERSION(6,14,10,5420), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x2E12, D_VERSION(8,15,10,2869), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x2E13, D_VERSION(6,14,10,5420), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x2E13, D_VERSION(8,15,10,2869), OS_VISTA | OS_WINDOWS7 }, + { 0x8086, 0x2E42, NO_VERSION, OS_ALL }, + { 0x8086, 0x2E43, NO_VERSION, OS_ALL }, + { 0x8086, 0x2E92, NO_VERSION, OS_ALL }, + { 0x8086, 0x2E93, NO_VERSION, OS_ALL }, + { 0x8086, 0x2E12, NO_VERSION, OS_ALL }, + { 0x8086, 0x2E13, NO_VERSION, OS_ALL }, // Eaglelake (Desktop) GMA X4500 Lines - { 0x8086, 0x2E32, D_VERSION(6,14,10,5420), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x2E32, D_VERSION(8,15,10,2869), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x2E33, D_VERSION(6,14,10,5420), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x2E33, D_VERSION(8,15,10,2869), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x2E22, D_VERSION(6,14,10,5420), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x2E22, D_VERSION(8,15,10,2869), OS_VISTA | OS_WINDOWS7 }, + { 0x8086, 0x2E32, NO_VERSION, OS_ALL }, + { 0x8086, 0x2E33, NO_VERSION, OS_ALL }, + { 0x8086, 0x2E22, NO_VERSION, OS_ALL }, // Eaglelake (Desktop) GMA X4500HD Lines - { 0x8086, 0x2E23, D_VERSION(6,14,10,5420), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x2E23, D_VERSION(8,15,10,2869), OS_VISTA | OS_WINDOWS7 }, + { 0x8086, 0x2E23, NO_VERSION, OS_ALL }, // Cantiga (Mobile) GMA 4500MHD Lines - { 0x8086, 0x2A42, D_VERSION(6,14,10,5420), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x2A42, D_VERSION(8,15,10,2869), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x2A43, D_VERSION(6,14,10,5420), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x2A43, D_VERSION(8,15,10,2869), OS_VISTA | OS_WINDOWS7 }, + { 0x8086, 0x2A42, NO_VERSION, OS_ALL }, + { 0x8086, 0x2A43, NO_VERSION, OS_ALL }, // ATI Mobility Radeon X1600, X1400, X1450, X1300, X1350 // Reason: workaround for 6613066, 6687166
--- a/test/java/awt/Desktop/OpenByUNCPathNameTest/OpenByUNCPathNameTest.java Mon Dec 23 14:05:20 2013 -0500 +++ b/test/java/awt/Desktop/OpenByUNCPathNameTest/OpenByUNCPathNameTest.java Wed Dec 25 10:34:40 2013 -0800 @@ -45,6 +45,10 @@ System.out.println("java.awt.Desktop is not supported on this platform."); } else { Desktop desktop = Desktop.getDesktop(); + if (!desktop.isSupported(Desktop.Action.OPEN)) { + System.out.println("Action.OPEN is not supported on this platform."); + return; + } File file = File.createTempFile("Read Me File", ".txt"); try { // Test opening of the file with Windows local file path.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/awt/Window/BackgroundIsNotUpdated/BackgroundIsNotUpdated.java Wed Dec 25 10:34:40 2013 -0800 @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.AWTException; +import java.awt.Color; +import java.awt.Frame; +import java.awt.Graphics; +import java.awt.Point; +import java.awt.Robot; +import java.awt.Toolkit; +import java.awt.Window; + +import sun.awt.SunToolkit; + +/** + * @test + * @bug 8001472 + * @summary Background of the window should not depend from the paint()/update() + * @author Sergey Bylokhov + */ +public final class BackgroundIsNotUpdated extends Window { + + public BackgroundIsNotUpdated(final Frame owner) { + super(owner); + } + + @Override + public void paint(final Graphics ignored) { + // Intentionally left blank + } + + @Override + public void update(final Graphics ignored) { + // Intentionally left blank + } + + public static void main(final String[] args) throws AWTException { + final Window window = new BackgroundIsNotUpdated(null); + window.setSize(300, 300); + window.setLocationRelativeTo(null); + window.setVisible(true); + sleep(); + window.setBackground(Color.GREEN); + sleep(); + final Robot robot = new Robot(); + robot.setAutoDelay(200); + Point point = window.getLocationOnScreen(); + Color color = robot.getPixelColor(point.x + window.getWidth() / 2, + point.y + window.getHeight() / 2); + window.dispose(); + if (!color.equals(Color.GREEN)) { + throw new RuntimeException( + "Expected: " + Color.GREEN + " , Actual: " + color); + } + } + + private static void sleep() { + try { + ((SunToolkit) Toolkit.getDefaultToolkit()).realSync(); + Thread.sleep(1000); + } catch (InterruptedException ignored) { + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/awt/dnd/URIListToFileListBetweenJVMsTest/InterprocessMessages.java Wed Dec 25 10:34:40 2013 -0800 @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +public interface InterprocessMessages { + final static int EXECUTION_IS_SUCCESSFULL = 0; + final static int WRONG_FILES_NUMBER_ON_TARGET = 212; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/awt/dnd/URIListToFileListBetweenJVMsTest/SourceFileListFrame.java Wed Dec 25 10:34:40 2013 -0800 @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import test.java.awt.regtesthelpers.Util; + +import java.awt.*; +import java.awt.dnd.DnDConstants; +import java.awt.dnd.DragGestureEvent; +import java.awt.dnd.DragGestureListener; +import java.awt.dnd.DragSource; +import java.io.File; +import java.net.URI; +import java.util.Arrays; +import java.util.stream.Collectors; +import java.util.stream.Stream; + + +class SourceFileListFrame extends Frame implements DragGestureListener { + + private final static int SOURCE_POINT_SHIFT = 3; + + private List list = new List(URIListToFileListBetweenJVMsTest.VISIBLE_RAWS_IN_LIST); + private File[] files; + + SourceFileListFrame() { + super("Source File List Frame"); + extractFilesFromTheWorkingDirectory(); + initList(); + initGUI(); + new DragSource().createDefaultDragGestureRecognizer(list, + DnDConstants.ACTION_COPY,this); + } + + private void extractFilesFromTheWorkingDirectory() { + files = new File(System.getProperty("java.home", "")).listFiles(); + } + + private void initList() { + for (File currFile:files) { + list.add(currFile.getName()); + } + } + + private void initGUI() { + this.addWindowListener(Util.getClosingWindowAdapter()); + this.setLocation(300,250); + this.add(new Panel().add(list)); + this.pack(); + this.setVisible(true); + } + + int getNextLocationX() { + return getX()+getWidth(); + } + + int getNextLocationY() { + return getY(); + } + + int getDragSourcePointX() { + return (int)list.getLocationOnScreen().getX()+(list.getWidth()/2); + } + + int getDragSourcePointY() { + return (int)list.getLocationOnScreen().getY()+ SOURCE_POINT_SHIFT; + } + + int getSourceFilesNumber() { + return files.length; + } + + public void dragGestureRecognized(DragGestureEvent dge) { + java.util.List<URI> uriList = Stream.of(list.getItems()) + .map(File::new) + .map(File::toURI) + .collect(Collectors.toList()); + + dge.startDrag(null, new URIListTransferable(uriList)); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/awt/dnd/URIListToFileListBetweenJVMsTest/TargetFileListFrame.java Wed Dec 25 10:34:40 2013 -0800 @@ -0,0 +1,112 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.*; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.UnsupportedFlavorException; +import java.awt.dnd.*; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.io.File; +import java.io.IOException; + +class TargetFileListFrame extends Frame implements DropTargetListener { + + private List list = new List(URIListToFileListBetweenJVMsTest.VISIBLE_RAWS_IN_LIST); + private int expectationTransferredFilesNumber; + + TargetFileListFrame(Point location, int expectationTransferredFilesNumber) { + this.expectationTransferredFilesNumber = expectationTransferredFilesNumber; + initGUI(location); + setDropTarget(new DropTarget(list, DnDConstants.ACTION_COPY, this)); + } + + private void initGUI(Point location) { + this.setLocation(location); + this.addWindowListener(new WindowAdapter() { + public void windowClosing(WindowEvent e) { + TargetFileListFrame.this.dispose(); + } + }); + this.add(new Panel().add(list)); + this.pack(); + this.setVisible(true); + } + + public void dragEnter(DropTargetDragEvent dtde) { + if (dtde.getCurrentDataFlavorsAsList().contains(DataFlavor.javaFileListFlavor)) { + dtde.acceptDrag(DnDConstants.ACTION_COPY); + } + } + + public void dragOver(DropTargetDragEvent dtde) { + if (dtde.getCurrentDataFlavorsAsList().contains(DataFlavor.javaFileListFlavor)) { + dtde.acceptDrag(DnDConstants.ACTION_COPY); + } + } + + public void dropActionChanged(DropTargetDragEvent dtde) { + if (dtde.getCurrentDataFlavorsAsList().contains(DataFlavor.javaFileListFlavor)) { + dtde.acceptDrag(DnDConstants.ACTION_COPY); + } + } + + public void dragExit(DropTargetEvent dte) {} + + public void drop(DropTargetDropEvent dtde) { + list.removeAll(); + dtde.acceptDrop(DnDConstants.ACTION_COPY); + java.util.List<File> fileList = extractListOfFiles(dtde); + for (File file:fileList) { + list.add(file.getName()); + } + + if (fileList.size() != expectationTransferredFilesNumber) + { + System.err.println("ERROR: Expected file number:" + + expectationTransferredFilesNumber + + "; Received file number: " + + fileList.size()); + TargetFileListFrame.this.dispose(); + System.exit(InterprocessMessages.WRONG_FILES_NUMBER_ON_TARGET); + } + + TargetFileListFrame.this.dispose(); + + } + + private java.util.List<File> extractListOfFiles(DropTargetDropEvent dtde) { + java.util.List<File> fileList = null; + try { + fileList = (java.util.List<File>)dtde.getTransferable().getTransferData(DataFlavor.javaFileListFlavor); + } catch (UnsupportedFlavorException | IOException e) { + e.printStackTrace(); + } + return fileList; + } + + Point getDropTargetPoint() { + return new Point((int)list.getLocationOnScreen().getX()+(list.getWidth()/2), + (int)list.getLocationOnScreen().getY()+(list.getHeight()/2)); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.html Wed Dec 25 10:34:40 2013 -0800 @@ -0,0 +1,48 @@ +<!-- + Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + + This code is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License version 2 only, as + published by the Free Software Foundation. + + This code is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + version 2 for more details (a copy is included in the LICENSE file that + accompanied this code). + + You should have received a copy of the GNU General Public License version + 2 along with this work; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + or visit www.oracle.com if you need additional information or have any + questions. +--> + +<html> +<!-- + @test + @bug 8029565 + @summary Conversion of a URI list to File list fails + @author Petr Pchelko <petr.pchelko@oracle.com> + @library ../../regtesthelpers + @library ../../regtesthelpers/process + @build Util + @build ProcessResults ProcessCommunicator + @run applet/othervm URIListToFileListBetweenJVMsTest.html + +--> +<head> +<title> DnD of File-List across JVM </title> +</head> +<body> + +<h1>URIListToFileListBetweenJVMsTest<br>Bug ID: 5079469</h1> + +<p> This is an AUTOMATIC test, simply wait for completion </p> + +<APPLET CODE="URIListToFileListBetweenJVMsTest.class" WIDTH=200 HEIGHT=200></APPLET> +</body> +</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.java Wed Dec 25 10:34:40 2013 -0800 @@ -0,0 +1,139 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + test + @bug 8029565 + @summary Conversion of a URI list to File list fails + @author Petr Pchelko <petr.pchelko@oracle.com> + @library ../../regtesthelpers + @library ../../regtesthelpers/process + @build Util + @build ProcessResults ProcessCommunicator + @run applet/othervm URIListToFileListBetweenJVMsTest.html + */ + +/** + * URIListToFileListBetweenJVMsTest.java + * + * summary: DnD of File-List across JVM adds two empty items to the list + */ + +import test.java.awt.regtesthelpers.Util; +import test.java.awt.regtesthelpers.process.ProcessCommunicator; +import test.java.awt.regtesthelpers.process.ProcessResults; + +import java.applet.Applet; +import java.awt.*; +import java.awt.event.InputEvent; + +import static java.lang.Thread.sleep; + +public class URIListToFileListBetweenJVMsTest extends Applet { + + // information related to the test in common + static int VISIBLE_RAWS_IN_LIST=15; + + public void init() { + setLayout(new BorderLayout()); + } + + public void start() { + + SourceFileListFrame sourceFrame = new SourceFileListFrame(); + + Util.waitForIdle(null); + + String [] args = new String [] { + String.valueOf(sourceFrame.getNextLocationX()), + String.valueOf(sourceFrame.getNextLocationY()), + String.valueOf(sourceFrame.getDragSourcePointX()), + String.valueOf(sourceFrame.getDragSourcePointY()), + String.valueOf(sourceFrame.getSourceFilesNumber()) + }; + + ProcessResults processResults = ProcessCommunicator.executeChildProcess(this.getClass(), args); + + verifyTestResults(processResults); + + } + + private static void verifyTestResults(ProcessResults processResults) { + if ( InterprocessMessages.WRONG_FILES_NUMBER_ON_TARGET == processResults.getExitValue()) { + processResults.printProcessErrorOutput(System.err); + throw new RuntimeException("TEST IS FAILED: Target has recieved wrong number of files."); + } + processResults.verifyStdErr(System.err); + processResults.verifyProcessExitValue(System.err); + processResults.printProcessStandartOutput(System.out); + } + + //We cannot make an instance of the applet without the default constructor + public URIListToFileListBetweenJVMsTest() { + super(); + } + + //We need in this constructor to pass frame position between JVMs + public URIListToFileListBetweenJVMsTest(Point targetFrameLocation, + Point dragSourcePoint, + int transferredFilesNumber) throws InterruptedException + { + TargetFileListFrame targetFrame = new TargetFileListFrame(targetFrameLocation, transferredFilesNumber); + + Util.waitForIdle(null); + + final Robot robot = Util.createRobot(); + + robot.mouseMove((int)dragSourcePoint.getX(),(int)dragSourcePoint.getY()); + sleep(100); + robot.mousePress(InputEvent.BUTTON1_MASK); + sleep(100); + robot.mouseRelease(InputEvent.BUTTON1_MASK); + sleep(100); + + Util.drag(robot, dragSourcePoint, targetFrame.getDropTargetPoint(), InputEvent.BUTTON1_MASK); + + } + + enum InterprocessArguments { + TARGET_FRAME_X_POSITION_ARGUMENT, + TARGET_FRAME_Y_POSITION_ARGUMENT, + DRAG_SOURCE_POINT_X_ARGUMENT, + DRAG_SOURCE_POINT_Y_ARGUMENT, + FILES_IN_THE_LIST_NUMBER_ARGUMENT; + + int extract (String [] args) { + return Integer.parseInt(args[this.ordinal()]); + } + } + + public static void main (String [] args) throws Exception { + Point dragSourcePoint = new Point(InterprocessArguments.DRAG_SOURCE_POINT_X_ARGUMENT.extract(args), + InterprocessArguments.DRAG_SOURCE_POINT_Y_ARGUMENT.extract(args)); + Point targetFrameLocation = new Point(InterprocessArguments.TARGET_FRAME_X_POSITION_ARGUMENT.extract(args), + InterprocessArguments.TARGET_FRAME_Y_POSITION_ARGUMENT.extract(args)); + int transferredFilesNumber = InterprocessArguments.FILES_IN_THE_LIST_NUMBER_ARGUMENT.extract(args); + + new URIListToFileListBetweenJVMsTest(targetFrameLocation, dragSourcePoint, transferredFilesNumber); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListTransferable.java Wed Dec 25 10:34:40 2013 -0800 @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.UnsupportedFlavorException; +import java.io.IOException; +import java.net.URI; +import java.util.List; + +class URIListTransferable implements Transferable { + + private final DataFlavor supportedFlavor; + + private List<URI> list; + + public URIListTransferable(List<URI> list) { + try { + this.supportedFlavor = new DataFlavor("text/uri-list;class=java.lang.String"); + } catch (ClassNotFoundException e) { + throw new RuntimeException("FAILED: could not create a DataFlavor"); + } + this.list = list; + } + + public DataFlavor[] getTransferDataFlavors() { + return new DataFlavor[] { supportedFlavor }; + } + + public boolean isDataFlavorSupported(DataFlavor flavor) { + return supportedFlavor.equals(flavor); + } + + public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException { + if (supportedFlavor.equals(flavor)) { + return list.stream() + .map(URI::toASCIIString) + .collect(StringBuilder::new, + (builder, uri)-> { builder.append(uri).append("\r\n"); }, + StringBuilder::append).toString(); + } + throw new UnsupportedFlavorException(flavor); + } +}